This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-plugin-testing.
commit 7a61a1b1f0304a0f5576e6dbb26cdf3fc85cb579 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 18 01:29:44 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 5 +- debian/maven.rules | 7 +- debian/patches/0003-maven-compatibility.patch | 186 ++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 195 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a181259..3844b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ maven-plugin-testing (2.1-1) UNRELEASED; urgency=medium - Build depend on junit4 instead of junit - Build depend on libplexus-component-metadata-java instead of libplexus-maven-plugin-java + - Depend on libmaven3-core-java instead of libmaven2-core-java * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.0.0 diff --git a/debian/control b/debian/control index b2fbabb..87bd894 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,8 @@ Build-Depends-Indep: default-jdk-doc, libeasymock-java, libmaven-invoker-java, libmaven-javadoc-plugin-java, - libmaven2-core-java, - libmaven2-core-java-doc, + libmaven3-core-java, libplexus-archiver-java, - libplexus-container-default-java, - libplexus-container-default-java-doc, libplexus-component-metadata-java, libplexus-utils-java, libplexus-utils-java-doc diff --git a/debian/maven.rules b/debian/maven.rules index b9bca13..c862956 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,9 +17,14 @@ # junit junit jar s/3\\..*/3.x/ junit junit jar s/.*/4.x/ * * -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * s/easymock/org.easymock/ easymock * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * + +org.apache.maven maven-core * s/.*/3.x/ * * +org.apache.maven maven-compat * s/.*/3.x/ * * +org.apache.maven maven-model * s/.*/3.x/ * * +org.apache.maven maven-plugin-api * s/.*/3.x/ * * +org.apache.maven maven-aether-provider * s/.*/3.x/ * * diff --git a/debian/patches/0003-maven-compatibility.patch b/debian/patches/0003-maven-compatibility.patch new file mode 100644 index 0000000..81c0994 --- /dev/null +++ b/debian/patches/0003-maven-compatibility.patch @@ -0,0 +1,186 @@ +Description: Fixes the compatibility with the latest version of Maven +Origin: backport, https://svn.apache.org/r1505991 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java +@@ -49,10 +49,12 @@ + import org.apache.maven.plugin.logging.Log; + import org.apache.maven.project.MavenProject; + import org.apache.maven.repository.RepositorySystem; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenAetherModule; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.codehaus.plexus.ContainerConfiguration; + import org.codehaus.plexus.DefaultContainerConfiguration; + import org.codehaus.plexus.DefaultPlexusContainer; ++import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.PlexusContainerException; + import org.codehaus.plexus.PlexusTestCase; +@@ -169,7 +171,13 @@ + { + ClassWorld classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() ); + +- return new DefaultContainerConfiguration().setClassWorld( classWorld ).setName( "embedder" ); ++ ContainerConfiguration cc = new DefaultContainerConfiguration() ++ .setClassWorld( classWorld ) ++ .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) ++ .setAutoWiring( true ) ++ .setName( "maven" ); ++ ++ return cc; + } + + protected PlexusContainer getContainer() +@@ -373,7 +381,7 @@ + MavenExecutionRequest request = new DefaultMavenExecutionRequest(); + MavenExecutionResult result = new DefaultMavenExecutionResult(); + +- MavenSession session = new MavenSession( container, new MavenRepositorySystemSession(), request, result ); ++ MavenSession session = new MavenSession( container, MavenRepositorySystemUtils.newSession(), request, result ); + session.setCurrentProject( project ); + session.setProjects( Arrays.asList( project ) ); + return session; +--- a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java ++++ b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java +@@ -50,7 +50,7 @@ + import org.apache.maven.project.ProjectBuildingException; + import org.apache.maven.project.ProjectBuildingRequest; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; + import org.codehaus.plexus.util.FileUtils; +@@ -241,7 +241,7 @@ + { + ProjectBuildingRequest request = new DefaultProjectBuildingRequest(); + request.setLocalRepository( artifactRepositoryFactory.createArtifactRepository( "local", new File( "target/localrepo" ).getCanonicalFile().toURL().toExternalForm(), "default", null, null ) ); +- request.setRepositorySession( new MavenRepositorySystemSession() ); ++ request.setRepositorySession( MavenRepositorySystemUtils.newSession() ); + MavenProject project = projectBuilder.build( pomInfo.getPomFile(), request ).getProject(); + + Artifact artifact = artifactFactory.createArtifact( project.getGroupId(), project.getArtifactId(), project +--- a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java ++++ b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java +@@ -40,7 +40,7 @@ + import org.apache.maven.plugin.LegacySupport; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.apache.maven.settings.MavenSettingsBuilder; + import org.apache.maven.settings.Settings; + import org.codehaus.plexus.PlexusConstants; +@@ -218,7 +218,7 @@ + destination.getParentFile().mkdirs(); + } + +- legacySupport.setSession( new MavenSession( container, new MavenRepositorySystemSession(), ++ legacySupport.setSession( new MavenSession( container, MavenRepositorySystemUtils.newSession(), + new DefaultMavenExecutionRequest(), + new DefaultMavenExecutionResult() ) ); + try +--- a/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java ++++ b/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java +@@ -29,6 +29,8 @@ + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; + import org.apache.maven.shared.test.plugin.ProjectTool.PomInfo; ++import org.codehaus.plexus.ContainerConfiguration; ++import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusTestCase; + import org.codehaus.plexus.util.FileUtils; + import org.codehaus.plexus.util.StringUtils; +@@ -110,4 +112,11 @@ + + assertTrue( foundPomMetadata ); + } ++ ++ @Override ++ protected void customizeContainerConfiguration(ContainerConfiguration configuration) ++ { ++ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); ++ configuration.setAutoWiring( true ); ++ } + } +--- a/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java ++++ b/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java +@@ -26,6 +26,8 @@ + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; + import org.apache.maven.shared.tools.easymock.TestFileManager; ++import org.codehaus.plexus.ContainerConfiguration; ++import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusTestCase; + + /** +@@ -84,4 +86,11 @@ + fileManager.assertFileContents( targetLocalRepoBasedir, "group/artifact/test/artifact-test.jar", jarContent ); + + } ++ ++ @Override ++ protected void customizeContainerConfiguration(ContainerConfiguration configuration) ++ { ++ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); ++ configuration.setAutoWiring( true ); ++ } + } +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java +@@ -141,7 +141,7 @@ + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource) + */ + public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map<String, Artifact> managedVersions, ArtifactRepository localRepository, + List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source ) + throws ArtifactResolutionException, ArtifactNotFoundException + { +@@ -153,7 +153,7 @@ + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter) + */ + public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map<String, Artifact> managedVersions, ArtifactRepository localRepository, + List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, + ArtifactFilter filter ) + throws ArtifactResolutionException, ArtifactNotFoundException +@@ -166,7 +166,7 @@ + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter, java.util.List) + */ + public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map<String, Artifact> managedVersions, ArtifactRepository localRepository, + List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, + ArtifactFilter filter, List<ResolutionListener> listeners ) + throws ArtifactResolutionException, ArtifactNotFoundException +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java +@@ -51,7 +51,7 @@ + } + + public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactResolutionRequest repositoryRequest, ++ Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest, + ArtifactMetadataSource source, ArtifactFilter filter, + List<ResolutionListener> listeners, + List<ConflictResolver> conflictResolvers ) +@@ -60,7 +60,7 @@ + } + + public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map<String, Artifact> managedVersions, ArtifactRepository localRepository, + List<ArtifactRepository> remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List<ResolutionListener> listeners, +@@ -70,7 +70,7 @@ + } + + public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map<String, Artifact> managedVersions, ArtifactRepository localRepository, + List<ArtifactRepository> remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List<ResolutionListener> listeners ) diff --git a/debian/patches/series b/debian/patches/series index 8b71572..4026985 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-easymock-upgrade.patch +0003-maven-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-testing.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
