You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/11/20 11:37:52 UTC
[1/2] zest-java git commit: build: refine dependencies.gradle
Repository: zest-java
Updated Branches:
refs/heads/develop d1029354d -> 9d3f380d7
build: refine dependencies.gradle
Remove unused non-https repository
Remove not needed default test runtime dependencies
Clarify dependency substitutions
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/04ac851d
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/04ac851d
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/04ac851d
Branch: refs/heads/develop
Commit: 04ac851d244926f7fa6f529292422b33953117ec
Parents: d102935
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 20 12:10:02 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 20 12:10:02 2016 +0100
----------------------------------------------------------------------
dependencies.gradle | 41 ++++++++++++++++++-----------------------
1 file changed, 18 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/04ac851d/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index c57b3b1..b0c67d4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,6 @@ def dependencies = extensions.getByType( DependenciesDeclarationExtension )
// Remote repositories
dependencies.repositoriesUrls << [
mavenCentral: "https://repo1.maven.org/maven2/",
- ops4j : "http://repository.ops4j.org/maven2/",
restlet : 'https://maven.restlet.com/',
clojars : "https://clojars.org/repo/",
]
@@ -202,54 +201,50 @@ dependencies.defaultDependencies << [
testCompile: [ dependencies.libraries.junit,
dependencies.libraries.hamcrest,
dependencies.libraries.ant,
- dependencies.libraries.ant_junit ],
- testRuntime: [ dependencies.libraries.asm,
- dependencies.libraries.asm_commons,
- dependencies.libraries.asm_util ]
+ dependencies.libraries.ant_junit ]
]
// Resolution rules
-dependencies.dependencySubstitutionSpec = { DependencySubstitution dep, ModuleComponentSelector requested ->
+dependencies.dependencySubstitutionSpec = { DependencySubstitution substitution, ModuleComponentSelector dep ->
// Always resolve ASM to the same version
- if( requested.group == 'org.ow2.asm' )
+ if( dep.group == 'org.ow2.asm' )
{
- dep.useTarget group: requested.group, name: requested.module, version: asmVersion
+ substitution.useTarget group: dep.group, name: dep.module, version: asmVersion
}
// Always resolve OSGi to the same version
- if( requested.group == 'org.osgi' )
+ else if( dep.group == 'org.osgi' )
{
- dep.useTarget group: requested.group, name: requested.module, version: osgiVersion
+ substitution.useTarget group: dep.group, name: dep.module, version: osgiVersion
}
// Always resolve SLF4J to the same version
- if( requested.group == 'org.slf4j' )
+ else if( dep.group == 'org.slf4j' )
{
- dep.useTarget group: requested.group, name: requested.module, version: slf4jVersion
+ substitution.useTarget group: dep.group, name: dep.module, version: slf4jVersion
}
// Always resolve Jackson to the same version
- if( requested.group.startsWith( 'com.fasterxml.jackson' ) && requested.module != 'jackson-parent' )
+ else if( dep.group.startsWith( 'com.fasterxml.jackson' ) && dep.module != 'jackson-parent' )
{
- dep.useTarget group: requested.group, name: requested.module, version: jacksonVersion
+ substitution.useTarget group: dep.group, name: dep.module, version: jacksonVersion
}
// woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead
- if( requested.group == 'woodstox' && requested.module == 'wstx-asl' )
+ else if( dep.group == 'woodstox' && dep.module == 'wstx-asl' )
{
- dep.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: requested.version
+ substitution.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: dep.version
}
// some bad citizens have SNAPSHOT parents ...
- if( requested.module == 'commons-sandbox-parent' && requested.version == '3-SNAPSHOT' )
+ else if( dep.module == 'commons-sandbox-parent' && dep.version == '3-SNAPSHOT' )
{
- dep.useTarget group: requested.group, name: requested.module, version: '3'
+ substitution.useTarget group: dep.group, name: dep.module, version: '3'
}
// GSON 2.3 POM is invalid, use 2.3.1 instead .. see https://github.com/google/gson/issues/588
- if( requested.group == 'com.google.code.gson' && requested.module == 'gson' && requested.version ==
- '2.3' )
+ else if( dep.group == 'com.google.code.gson' && dep.module == 'gson' && dep.version == '2.3' )
{
- dep.useTarget group: requested.group, name: requested.module, version: '2.3.1'
+ substitution.useTarget group: dep.group, name: dep.module, version: '2.3.1'
}
// Findbugs Annotation is LGPL, use https://github.com/stephenc/findbugs-annotations which is
// Apache 2 licensed instead
- if( requested.group == 'net.sourceforge.findbugs' && requested.module == 'annotations' )
+ else if( dep.group == 'net.sourceforge.findbugs' && dep.module == 'annotations' )
{
- dep.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
+ substitution.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
}
}
[2/2] zest-java git commit: build: fix bin dist rat
Posted by pa...@apache.org.
build: fix bin dist rat
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/9d3f380d
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/9d3f380d
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/9d3f380d
Branch: refs/heads/develop
Commit: 9d3f380d7693b310430dd9c1b9e5b2e812e543f7
Parents: 04ac851
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 20 12:37:39 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 20 12:37:39 2016 +0100
----------------------------------------------------------------------
.../groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9d3f380d/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy
index 8611825..6d45427 100644
--- a/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/DistributionPlugin.groovy
@@ -24,7 +24,6 @@ import org.apache.tools.ant.filters.ReplaceTokens
import org.apache.zest.gradle.RootProjectPlugin
import org.apache.zest.gradle.TaskGroups
import org.apache.zest.gradle.dependencies.DependenciesDeclarationExtension
-import org.apache.zest.gradle.dependencies.DependenciesPlugin
import org.apache.zest.gradle.release.ReleaseSpecExtension
import org.apache.zest.gradle.release.ReleaseSpecPlugin
import org.gradle.api.Action
@@ -332,6 +331,7 @@ class DistributionPlugin implements Plugin<Project>
task.excludes = [
'.gradle/**',
'docs/reports/**',
+ 'docs/javadocs/**',
'etc/templates/**',
'libs/**'
]