diff --git a/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy b/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy index 1e2dbd76..f841119d 100644 --- a/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy +++ b/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy @@ -130,8 +130,12 @@ class Resolver { copy.setCanBeResolved(true) } + // Resolve using the latest version of explicitly declaired dependencies and retains those + // inherited from the super configurations (which may be required for variant resolution). + Set inherited = (configuration.allDependencies - configuration.dependencies) copy.dependencies.clear() copy.dependencies.addAll(latest) + copy.dependencies.addAll(inherited) addRevisionFilter(copy, revision) addCustomResolutionStrategy(copy, currentCoordinates) diff --git a/src/test/resources/maven/com/google/inject/guice-parent/2.0/guice-parent-2.0.pom b/src/test/resources/maven/com/google/inject/guice-parent/2.0/guice-parent-2.0.pom new file mode 100644 index 00000000..7f1fc854 --- /dev/null +++ b/src/test/resources/maven/com/google/inject/guice-parent/2.0/guice-parent-2.0.pom @@ -0,0 +1,386 @@ + + + + + + + 4.0.0 + + + com.google + google + 5 + + + pom + + com.google.inject + guice-parent + 2.0 + + Google Guice + + + Guice is a lightweight dependency injection framework for Java 5 and above + + + http://code.google.com/p/google-guice/ + 2006 + + + Google, Inc. + http://www.google.com + + + + + Guice Users List + http://groups.google.com/group/google-guice/topics + http://groups.google.com/group/google-guice/subscribe + http://groups.google.com/group/google-guice/subscribe + http://groups.google.com/group/google-guice/post + + + Guice Developers List + http://groups.google.com/group/google-guice-dev/topics + http://groups.google.com/group/google-guice-dev/subscribe + http://groups.google.com/group/google-guice-dev/subscribe + http://groups.google.com/group/google-guice-dev/post + + + + + scm:svn:http://google-guice.googlecode.com/svn/trunk + scm:svn:https://google-guice.googlecode.com/svn/trunk + http://code.google.com/p/google-guice/source/browse + + + + Google Code + http://code.google.com/p/google-guice/issues/ + + + + Hudson + https://grid.sonatype.org/ci/job/Google-Guice/ + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + core + extensions + + + + 3.0 + + + + + 1.3 + UTF-8 + + true + + true + + + + + + org.testng + testng + 5.11 + jdk15 + test + + + + + + ${project.basedir}/src + + + false + ${project.basedir}/src + + **/*.java + + + + ${project.basedir}/test + + + false + ${project.basedir}/test + + **/*.java + + + + + + + + maven-remote-resources-plugin + 1.1 + + + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + + + + + + + maven-compiler-plugin + 2.3.2 + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.6 + + + org.codehaus.mojo.signature + java15 + 1.0 + + + + + check-java-1.5-compat + process-classes + + check + + + + + + + org.sonatype.plugins + jarjar-maven-plugin + 1.3 + + + + net.sf.cglib.* + com.google.inject.internal.cglib.$@1 + + + net.sf.cglib.**.* + com.google.inject.internal.cglib.@1.$@2 + + + org.objectweb.asm.* + com.google.inject.internal.asm.$@1 + + + org.objectweb.asm.**.* + com.google.inject.internal.asm.@1.$@2 + + + com.google.inject.internal.util.* + com.google.inject.internal.util.$@1 + + + com.google.inject.internal.util.**.* + com.google.inject.internal.util.@1.$@2 + + + com.google.inject.** + + + com.googlecode.** + + + + + + + jarjar-classes + process-test-classes + + jarjar + + + {classes} + + + + jarjar-test-classes + process-test-classes + + jarjar + + + {test-classes} + + + + + + maven-surefire-plugin + 2.5 + + true + + + + + org.apache.felix + maven-bundle-plugin + 2.1.0 + + + com.google.inject + <_include>-${project.basedir}/build.properties + Copyright (C) 2006 Google Inc. + http://code.google.com/p/google-guice/ + ${project.artifactId} + $(module) + + J2SE-1.5,JavaSE-1.6 + + !com.google.inject.*,* + <_exportcontents>!*.internal.*,$(module).*;version=${guice.api.version} + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + <_nouses>true + <_removeheaders> + Embed-Dependency,Embed-Transitive, + Built-By,Tool,Created-By,Build-Jdk, + Originally-Created-By,Archiver-Version, + Include-Resource,Private-Package, + Ignore-Package,Bnd-LastModified + + + + + + prepare-package + + manifest + + + + + + + maven-jar-plugin + 2.3.1 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + false + + + + + package + + test-jar + + + + + + maven-javadoc-plugin + 2.7 + + + maven-source-plugin + 2.1.2 + + + maven-gpg-plugin + 1.1 + + + maven-release-plugin + 2.1 + + true + + + + maven-deploy-plugin + 2.5 + + + + + + + + + sonatype-grid + + forge-releases + http://repository.sonatype.org:8081/service/local/staging/deploy/maven2 + forge-snapshots + http://repository.sonatype.org/content/repositories/snapshots + + + + ${forgeReleaseId} + ${forgeReleaseUrl} + + + ${forgeSnapshotId} + ${forgeSnapshotUrl} + + + + + + diff --git a/src/test/resources/maven/com/google/inject/guice/2.0/guice-2.0.pom b/src/test/resources/maven/com/google/inject/guice/2.0/guice-2.0.pom new file mode 100644 index 00000000..9f018e84 --- /dev/null +++ b/src/test/resources/maven/com/google/inject/guice/2.0/guice-2.0.pom @@ -0,0 +1,240 @@ + + + + 4.0.0 + + + com.google.inject + guice-parent + 2.0 + + + guice + + Google Guice - Core Library + + + 2.2.1-v20090111 + + + + + javax.inject + javax.inject + 1 + + + aopalliance + aopalliance + 1.0 + + + + org.sonatype.sisu.inject + cglib + ${cglib.version} + + + javax.inject + javax.inject-tck + 1 + test + + + org.springframework + spring-beans + 3.0.5.RELEASE + test + + + biz.aQute + bnd + 0.0.384 + test + + + org.apache.felix + org.apache.felix.framework + 3.0.5 + test + + + + + + + + maven-remote-resources-plugin + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + maven-surefire-plugin + + + + **/OSGiContainerTest* + **/ScopesTest* + **/TypeConversionTest* + + + + + + org.apache.felix + maven-bundle-plugin + + + + maven-jar-plugin + + + LICENSE + NOTICE + + + + + + + + + + guice.with.no_aop + + + guice.with.no_aop + !false + + + + + + org.sonatype.plugins + munge-maven-plugin + 1.0 + + + prepare-package + + munge-fork + + + NO_AOP + + **/InterceptorBinding.java, + **/InterceptorBindingProcessor.java, + **/InterceptorStackCallback.java, + **/LineNumbers.java, + **/MethodAspect.java, + **/ProxyFactory.java, + **/BytecodeGenTest.java, + **/IntegrationTest.java, + **/MethodInterceptionTest.java, + **/ProxyFactoryTest.java + + + + + + + + maven-jar-plugin + + + no_aop + package + + jar + + + ${project.build.directory}/munged/classes + no_aop + + ${project.build.directory}/munged/classes/META-INF/MANIFEST.MF + + + + + + + + + + + guice.with.jarjar + + + guice.with.jarjar + !false + + + + + + org.sonatype.sisu.inject + cglib + ${cglib.version} + true + + + + + + org.sonatype.plugins + jarjar-maven-plugin + + + *:asm + *:cglib + + + + + + maven-jar-plugin + + + no_deps + package + + jar + + + ${project.build.directory}/original-classes + no_deps + + + + + + + + + +