Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 0f10cb962 -> 3dc49b0ee
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/3dc49b0e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3dc49b0e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3dc49b0e Branch: refs/heads/GROOVY_2_6_X Commit: 3dc49b0ee46cd818c2db3c6294e56aa558ec5b99 Parents: 0f10cb9 Author: Cedric Champeau <[email protected]> Authored: Mon Jan 8 17:25:13 2018 +0100 Committer: Cedric Champeau <[email protected]> Committed: Mon Jan 8 17:32:15 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/3dc49b0e/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index aae466d..65a4041 100644 --- a/build.gradle +++ b/build.gradle @@ -408,6 +408,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/3dc49b0e/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 69a13f9..06462b2 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 @@ -480,8 +480,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' @@ -490,7 +488,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
