groovy git commit: Fix artifact path

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

groovy git commit: Fix artifact path

Daniel.Sun
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X f69b61cd7 -> 6a5632dcc


Fix artifact path

(cherry picked from commit 8d730e1)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6a5632dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6a5632dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6a5632dc

Branch: refs/heads/GROOVY_2_6_X
Commit: 6a5632dcc9d00dca3bd7ef7225364b30a1317a89
Parents: f69b61c
Author: sunlan <[hidden email]>
Authored: Thu Jun 7 10:51:15 2018 +0800
Committer: sunlan <[hidden email]>
Committed: Thu Jun 7 10:56:22 2018 +0800

----------------------------------------------------------------------
 gradle/assemble.gradle                                           | 2 +-
 gradle/docs.gradle                                               | 3 ++-
 subprojects/groovy-groovydoc/build.gradle                        | 1 +
 .../tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java  | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/6a5632dc/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 9d67768..eba06b7 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -398,7 +398,7 @@ ext.distSpec = copySpec {
             fileMode = 0755
             exclude 'groovy.icns'
         }
-        from('src/tools/org/codehaus/groovy/tools/groovy.ico')
+        from('subprojects/groovy-docgenerator/src/main/resources/org/apache/groovy/docgenerator/groovy.ico')
     }
     into('licenses') {
         from 'licenses'

http://git-wip-us.apache.org/repos/asf/groovy/blob/6a5632dc/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index ebb9e2d..c302216 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -174,7 +174,8 @@ task docGDK {
         }
         copy {
             into task.destinationDir
-            from 'src/tools/org/codehaus/groovy/tools/groovy.ico', 'src/tools/org/codehaus/groovy/tools/stylesheet.css'
+            from 'subprojects/groovy-docgenerator/src/main/resources/org/apache/groovy/docgenerator/groovy.ico',
+                    'subprojects/groovy-docgenerator/src/main/resources/org/apache/groovy/docgenerator/stylesheet.css'
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/6a5632dc/subprojects/groovy-groovydoc/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
index 886b3f6..309009f 100644
--- a/subprojects/groovy-groovydoc/build.gradle
+++ b/subprojects/groovy-groovydoc/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     compile project(':groovy-cli-picocli')
     compile project(':groovy-templates')
     runtime project(':groovy-dateutil')
+    runtime project(':groovy-docgenerator')
     testCompile project(':groovy-test')
     testCompile "org.apache.ant:ant-testutil:$antVersion"
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/6a5632dc/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
index 2b16745..7fefef2 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.tools.groovydoc.gstringTemplates;
 
 public class GroovyDocTemplateInfo {
     private static final String TEMPLATE_BASEDIR = "org/codehaus/groovy/tools/groovydoc/gstringTemplates/";
-    private static final String DOCGEN_BASEDIR = "org/codehaus/groovy/tools/";
+    private static final String DOCGEN_BASEDIR = "org/apache/groovy/docgenerator/";
     public static final String[] DEFAULT_DOC_TEMPLATES = new String[]{ // top level templates
             TEMPLATE_BASEDIR + "topLevel/index.html",
             TEMPLATE_BASEDIR + "topLevel/overview-frame.html", // needs all package names
@@ -31,7 +31,7 @@ public class GroovyDocTemplateInfo {
             TEMPLATE_BASEDIR + "topLevel/deprecated-list.html",
             TEMPLATE_BASEDIR + "topLevel/stylesheet.css", // copy default one, may override later
             TEMPLATE_BASEDIR + "topLevel/inherit.gif",
-            DOCGEN_BASEDIR + "groovy.ico",
+            DOCGEN_BASEDIR   + "groovy.ico",
     };
     public static final String[] DEFAULT_PACKAGE_TEMPLATES = new String[]{ // package level templates
             TEMPLATE_BASEDIR + "packageLevel/package-frame.html",

Daniel Sun
Apache Groovy committer

Blog: http://blog.sunlan.me
Twitter: @daniel_sun