You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/02/03 23:42:03 UTC
[groovy] branch master updated: minor refactoring
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 5f05b8e minor refactoring
5f05b8e is described below
commit 5f05b8ebf6dc8a61ecb45e01ebab03adbd05ec17
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Feb 4 09:41:49 2020 +1000
minor refactoring
---
gradle/publish.gradle | 50 +++++++++++++++++++++++++-------------------------
gradle/upload.gradle | 7 ++++---
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index bba6b23..27fbba2 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -47,30 +47,30 @@ allprojects {
}
publish {
excludePatterns = [
-// 'org/codehaus/groovy/groovy/**',
-// 'org/codehaus/groovy/groovy-ant/**',
-// 'org/codehaus/groovy/groovy-backports-compat23/**',
-// 'org/codehaus/groovy/groovy-binary/**',
-// 'org/codehaus/groovy/groovy-bsf/**',
-// 'org/codehaus/groovy/groovy-console/**',
-// 'org/codehaus/groovy/groovy-docgenerator/**',
-// 'org/codehaus/groovy/groovy-groovydoc/**',
-// 'org/codehaus/groovy/groovy-groovysh/**',
-// 'org/codehaus/groovy/groovy-jmx/**',
-// 'org/codehaus/groovy/groovy-json/**',
-// 'org/codehaus/groovy/groovy-jsr223/**',
-// 'org/codehaus/groovy/groovy-macro/**',
-// 'org/codehaus/groovy/groovy-nio/**',
-// 'org/codehaus/groovy/groovy-servlet/**',
-// 'org/codehaus/groovy/groovy-sql/**',
-// 'org/codehaus/groovy/groovy-swing/**',
-// 'org/codehaus/groovy/groovy-templates/**',
-// 'org/codehaus/groovy/groovy-test/**',
-// 'org/codehaus/groovy/groovy-testng/**',
-// 'org/codehaus/groovy/groovy-xml/**',
- 'org/codehaus/groovy/groovy/*/groovy-all-*',
- 'org/codehaus/groovy/groovy/*/groovy-backports-*',
- 'org/codehaus/groovy/groovy/*/groovy-binary-*'
+// 'org/apache/groovy/groovy/**',
+// 'org/apache/groovy/groovy-ant/**',
+// 'org/apache/groovy/groovy-backports-compat23/**',
+// 'org/apache/groovy/groovy-binary/**',
+// 'org/apache/groovy/groovy-bsf/**',
+// 'org/apache/groovy/groovy-console/**',
+// 'org/apache/groovy/groovy-docgenerator/**',
+// 'org/apache/groovy/groovy-groovydoc/**',
+// 'org/apache/groovy/groovy-groovysh/**',
+// 'org/apache/groovy/groovy-jmx/**',
+// 'org/apache/groovy/groovy-json/**',
+// 'org/apache/groovy/groovy-jsr223/**',
+// 'org/apache/groovy/groovy-macro/**',
+// 'org/apache/groovy/groovy-nio/**',
+// 'org/apache/groovy/groovy-servlet/**',
+// 'org/apache/groovy/groovy-sql/**',
+// 'org/apache/groovy/groovy-swing/**',
+// 'org/apache/groovy/groovy-templates/**',
+// 'org/apache/groovy/groovy-test/**',
+// 'org/apache/groovy/groovy-testng/**',
+// 'org/apache/groovy/groovy-xml/**',
+ 'org/apache/groovy/groovy/*/groovy-all-*',
+ 'org/apache/groovy/groovy/*/groovy-backports-*',
+ 'org/apache/groovy/groovy/*/groovy-binary-*'
].join(',')
repository {
repoKey = project.hasProperty('artifactoryRepoKey') ? project.artifactoryRepoKey : 'oss-snapshot-local'
@@ -88,7 +88,7 @@ allprojects {
artifactoryPublish {
def curDate = new Date()
def pomSource = { a -> "$projectDir/target/poms/pom-${a.name - 'groovy-'}.xml" }
- def destBase = { a -> "org/codehaus/groovy/${a.name}/${version}/${a.name}-${version}${a.classifier ? '-' + a.classifier : ''}" }
+ def destBase = { a -> "org/apache/groovy/${a.name}/${version}/${a.name}-${version}${a.classifier ? '-' + a.classifier : ''}" }
def newDetails = { orig, newFile, newExt, newType -> gradleDeployDetails(new DefaultPublishArtifact(
orig.name, newExt, newType, orig.classifier, curDate, newFile), 'artifacts', destBase(orig) + '.' + newExt) }
def makeTransformedDetails = { orig -> newDetails(orig, orig.file, orig.extension, orig.extension) }
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index 3bee9b2..5408e67 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -27,7 +27,7 @@ if (isUsingArtifactory) {
def embedded = ['asm', 'asm-util', 'asm-analysis', 'asm-tree', 'asm-commons', 'antlr', 'commons-cli', 'openbeans']
def removeJarjaredDependencies = { p ->
p.dependencies.removeAll(p.dependencies.findAll {
- it.groupId == 'org.codehaus.groovy' || embedded.contains(it.artifactId)
+ it.groupId == 'org.apache.groovy' || embedded.contains(it.artifactId)
})
}
@@ -259,10 +259,11 @@ def pomAll = {
p.dependencies.clear()
// defer setting packaging until here otherwise gets overwritten
p.packaging = 'pom'
+ String groupId = project.group
allprojects {
if (it.name.startsWith('groovy') && !optionalModules.contains(it.name)) {
- def dep = dependencyClass.newInstance()
- dep.groupId = 'org.codehaus.groovy'
+ def dep = dependencyClass.getDeclaredConstructor().newInstance()
+ dep.groupId = groupId
dep.artifactId = it.name
dep.version = version
p.dependencies.add(dep)