groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cchamp...@apache.org
Subject groovy git commit: Fix missing `jar` extension in `indy` directory
Date Mon, 08 Jan 2018 16:33:14 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X 353f38739 -> aa90e4633


Fix missing `jar` extension in `indy` directory

This was caused by a faulty regular expression, which caused the file
name to be truncated when the version is `SNAPSHOT`.


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

Branch: refs/heads/GROOVY_2_5_X
Commit: aa90e4633f0b1cbee5b9679c23081607fb8dd97b
Parents: 353f387
Author: Cedric Champeau <cchampeau@apache.org>
Authored: Mon Jan 8 17:25:13 2018 +0100
Committer: Cedric Champeau <cchampeau@apache.org>
Committed: Mon Jan 8 17:32:51 2018 +0100

----------------------------------------------------------------------
 build.gradle           |  1 +
 gradle/assemble.gradle | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/aa90e463/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ecee460..3e2eeca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -406,6 +406,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
+        options.incremental = true
     }
 
     if (rootProject.indyCapable()) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/aa90e463/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 875e66d..520239f 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.codehaus.groovy.gradle.JarJarTask
-import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 
 apply plugin: 'osgi'
 
@@ -180,7 +180,7 @@ allprojects {
             }
             from("$projectDir/notices/NOTICE-JARJAR")
             from(generateReleaseInfo)
-            rename '([A-Z]+)-(.*)', '$1'
+            rename '^([A-Z]+)-([^.]*)', '$1'
         }
         arch.exclude '**/package-info.class'
 
@@ -300,7 +300,7 @@ subprojects { sp ->
             } else {
                 from "${rootProject.projectDir}/notices/NOTICE-BASE"
             }
-            rename '([A-Z]+)-(.*)', '$1'
+            rename '^([A-Z]+)-([^.]*)', '$1'
         }
         exclude '**/package-info.class'
     }
@@ -342,7 +342,7 @@ ext.distSpec = copySpec {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from("$projectDir/licenses/LICENSE-BINZIP")
     from("$projectDir/notices/NOTICE-BINZIP")
-    rename '([A-Z]+)-BINZIP', '$1'
+    rename '^([A-Z]+)-([^.]*)', '$1'
     exclude { it.file.name =~ /-raw/ }
     into('lib') {
         from jarjar
@@ -478,8 +478,6 @@ task checkNoSnapshotVersions {
 }
 distBin.dependsOn checkNoSnapshotVersions
 
-import org.gradle.api.file.DuplicatesStrategy
-
 task dist(type: Zip, dependsOn: [checkCompatibility, distBin, distSrc, distDoc, syncDoc])
{
     description = 'Generates the binary, sources, documentation and full distributions'
     baseName = 'apache-groovy'
@@ -488,7 +486,7 @@ task dist(type: Zip, dependsOn: [checkCompatibility, distBin, distSrc,
distDoc,
     into "groovy-$version"
     from("$projectDir/licenses/LICENSE-SDK")
     from("$projectDir/notices/NOTICE-SDK")
-    rename '([A-Z]+)-(.*)', '$1'
+    rename '^([A-Z]+)-([^.]*)', '$1'
     with distSpec
     into('doc') {
         with docSpec


Mime
View raw message