diff --git a/.gitignore b/.gitignore index f92c160..dea8f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /apache-maven-3.0.5-src.tar.gz /apache-maven-3.1.0-src.tar.gz /apache-maven-3.1.1-src.tar.gz +/apache-maven-3.2.0-src.tar.gz diff --git a/0001-MNG-5503-Fix-for-the-issue-where-Maven-3.1.0-fails-t.patch b/0001-MNG-5503-Fix-for-the-issue-where-Maven-3.1.0-fails-t.patch deleted file mode 100644 index 870bb10..0000000 --- a/0001-MNG-5503-Fix-for-the-issue-where-Maven-3.1.0-fails-t.patch +++ /dev/null @@ -1,361 +0,0 @@ -From 4c0c5f3edc45ffbf273ed7096340161def8515e4 Mon Sep 17 00:00:00 2001 -From: Jason van Zyl -Date: Tue, 20 Aug 2013 05:54:28 -0700 -Subject: [PATCH] MNG-5503: Fix for the issue where Maven 3.1.0 fails to - resolve artifacts produced by reactor build - -The general strategy is to fall back to Aether artifact type and use its notion of identity as much as possible. I have -a simple IT taken from the sample project that I will also push. ---- - .../main/java/org/apache/maven/ReactorReader.java | 244 +++++++-------------- - .../java/org/apache/maven/RepositoryUtils.java | 10 + - 2 files changed, 93 insertions(+), 161 deletions(-) - -diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java -index 90d102f..9b19e27 100644 ---- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java -+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java -@@ -19,12 +19,6 @@ - * under the License. - */ - --import org.apache.maven.artifact.ArtifactUtils; --import org.apache.maven.project.MavenProject; --import org.eclipse.aether.artifact.Artifact; --import org.eclipse.aether.repository.WorkspaceReader; --import org.eclipse.aether.repository.WorkspaceRepository; -- - import java.io.File; - import java.util.ArrayList; - import java.util.Arrays; -@@ -35,6 +29,13 @@ - import java.util.List; - import java.util.Map; - -+import org.apache.maven.artifact.ArtifactUtils; -+import org.apache.maven.project.MavenProject; -+import org.eclipse.aether.artifact.Artifact; -+import org.eclipse.aether.repository.WorkspaceReader; -+import org.eclipse.aether.repository.WorkspaceRepository; -+import org.eclipse.aether.util.artifact.ArtifactIdUtils; -+ - /** - * An implementation of a workspace reader that knows how to search the Maven reactor for artifacts. - * -@@ -43,8 +44,6 @@ - class ReactorReader - implements WorkspaceReader - { -- private static final Collection JAR_LIKE_TYPES = Arrays.asList( "jar", "test-jar", "ejb-client" ); -- - private static final Collection COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); - - private Map projectsByGAV; -@@ -52,7 +51,7 @@ - private Map> projectsByGA; - - private WorkspaceRepository repository; -- -+ - public ReactorReader( Map reactorProjects ) - { - projectsByGAV = reactorProjects; -@@ -73,9 +72,64 @@ public ReactorReader( Map reactorProjects ) - projects.add( project ); - } - -- repository = new WorkspaceRepository( "reactor", new HashSet( projectsByGAV.keySet() ) ); -+ repository = new WorkspaceRepository( "reactor", new HashSet( projectsByGAV.keySet() ) ); -+ } -+ -+ // -+ // Public API -+ // -+ -+ public WorkspaceRepository getRepository() -+ { -+ return repository; -+ } -+ -+ public File findArtifact( Artifact artifact ) -+ { -+ String projectKey = ArtifactUtils.key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ); -+ -+ MavenProject project = projectsByGAV.get( projectKey ); -+ -+ if ( project != null ) -+ { -+ File file = find( project, artifact ); -+ if ( file == null && project != project.getExecutionProject() ) -+ { -+ file = find( project.getExecutionProject(), artifact ); -+ } -+ return file; -+ } -+ -+ return null; - } - -+ public List findVersions( Artifact artifact ) -+ { -+ String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() ); -+ -+ List projects = projectsByGA.get( key ); -+ if ( projects == null || projects.isEmpty() ) -+ { -+ return Collections.emptyList(); -+ } -+ -+ List versions = new ArrayList(); -+ -+ for ( MavenProject project : projects ) -+ { -+ if ( find( project, artifact ) != null ) -+ { -+ versions.add( project.getVersion() ); -+ } -+ } -+ -+ return Collections.unmodifiableList( versions ); -+ } -+ -+ // -+ // Implementation -+ // -+ - private File find( MavenProject project, Artifact artifact ) - { - if ( "pom".equals( artifact.getExtension() ) ) -@@ -83,7 +137,7 @@ private File find( MavenProject project, Artifact artifact ) - return project.getFile(); - } - -- org.apache.maven.artifact.Artifact projectArtifact = findMatchingArtifact( project, artifact ); -+ Artifact projectArtifact = findMatchingArtifact( project, artifact ); - - if ( hasArtifactFileFromPackagePhase( projectArtifact ) ) - { -@@ -116,7 +170,7 @@ else if ( !hasBeenPackaged( project ) ) - return null; - } - -- private boolean hasArtifactFileFromPackagePhase( org.apache.maven.artifact.Artifact projectArtifact ) -+ private boolean hasArtifactFileFromPackagePhase( Artifact projectArtifact ) - { - return projectArtifact != null && projectArtifact.getFile() != null && projectArtifact.getFile().exists(); - } -@@ -136,122 +190,38 @@ private boolean hasBeenPackaged( MavenProject project ) - * - * Note that this - */ -- private org.apache.maven.artifact.Artifact findMatchingArtifact( MavenProject project, Artifact requestedArtifact ) -+ private Artifact findMatchingArtifact( MavenProject project, Artifact requestedArtifact ) - { -- String requestedRepositoryConflictId = getConflictId( requestedArtifact ); -+ String requestedRepositoryConflictId = ArtifactIdUtils.toVersionlessId( requestedArtifact ); - -- org.apache.maven.artifact.Artifact mainArtifact = project.getArtifact(); -- if ( requestedRepositoryConflictId.equals( getConflictId( mainArtifact ) ) ) -+ Artifact mainArtifact = RepositoryUtils.toArtifact( project.getArtifact() ); -+ if ( requestedRepositoryConflictId.equals( ArtifactIdUtils.toVersionlessId( mainArtifact ) ) ) - { - return mainArtifact; - } - -- Collection attachedArtifacts = project.getAttachedArtifacts(); -- if ( attachedArtifacts != null && !attachedArtifacts.isEmpty() ) -+ for ( Artifact attachedArtifact : RepositoryUtils.toArtifacts( project.getAttachedArtifacts() ) ) - { -- for ( org.apache.maven.artifact.Artifact attachedArtifact : attachedArtifacts ) -+ if ( attachedArtifactComparison ( requestedArtifact, attachedArtifact ) ) - { -- /* -- * Don't use the conflict ids, use a customized comparison that takes various ideas into account. -- */ -- if ( attachedArtifactComparison ( requestedArtifact, attachedArtifact ) ) -- { -- return attachedArtifact; -- } -+ return attachedArtifact; - } - } - - return null; - } -- -- /** -- * Try to satisfy both MNG-4065 and MNG-5214. Consider jar and test-jar equivalent. -- * @param requestedType -- * @param artifactType -- * @return -- */ -- private boolean attachedArtifactComparison ( Artifact requestedArtifact, org.apache.maven.artifact.Artifact attachedArtifact ) -- { -- if ( ! requestedArtifact.getGroupId().equals ( attachedArtifact.getGroupId() ) ) -- { -- return false; -- } -- if ( ! requestedArtifact.getArtifactId().equals ( attachedArtifact.getArtifactId() ) ) -- { -- return false; -- } -- String requestedExtension = requestedArtifact.getExtension(); -- String attachedExtension = null; -- if ( attachedArtifact.getArtifactHandler() != null ) -- { -- attachedExtension = attachedArtifact.getArtifactHandler().getExtension(); -- } -- String requestedType = requestedArtifact.getProperty ( "type", "" ); -- String attachedType = attachedArtifact.getType(); -- boolean typeOk = false; -- -- if ( requestedExtension.equals ( attachedExtension ) ) -- { -- // the ideal case. -- typeOk = true; -- } -- else if ( requestedType.equals( attachedType ) ) -- { -- typeOk = true; -- } -- else if ( JAR_LIKE_TYPES.contains( requestedType ) && JAR_LIKE_TYPES.contains( attachedType ) ) -- { -- typeOk = true; -- } - -- if ( !typeOk ) -- { -- return false; -- } -- return requestedArtifact.getClassifier().equals ( attachedArtifact.getClassifier() ); -- } -- -- /** -- * Gets the repository conflict id of the specified artifact. Unlike the dependency conflict id, the repository -- * conflict id uses the artifact file extension instead of the artifact type. Hence, the repository conflict id more -- * closely reflects the identity of artifacts as perceived by a repository. -- * -- * @param artifact The artifact, must not be null. -- * @return The repository conflict id, never null. -- */ -- private String getConflictId( org.apache.maven.artifact.Artifact artifact ) -+ private boolean attachedArtifactComparison( Artifact requested, Artifact attached ) - { -- StringBuilder buffer = new StringBuilder( 128 ); -- buffer.append( artifact.getGroupId() ); -- buffer.append( ':' ).append( artifact.getArtifactId() ); -- if ( artifact.getArtifactHandler() != null ) -- { -- buffer.append( ':' ).append( artifact.getArtifactHandler().getExtension() ); -- } -- else -- { -- buffer.append( ':' ).append( artifact.getType() ); -- } -- if ( artifact.hasClassifier() ) -- { -- buffer.append( ':' ).append( artifact.getClassifier() ); -- } -- return buffer.toString(); -- } -- -- private String getConflictId( Artifact artifact ) -- { -- StringBuilder buffer = new StringBuilder( 128 ); -- buffer.append( artifact.getGroupId() ); -- buffer.append( ':' ).append( artifact.getArtifactId() ); -- buffer.append( ':' ).append( artifact.getExtension() ); -- if ( artifact.getClassifier().length() > 0 ) -- { -- buffer.append( ':' ).append( artifact.getClassifier() ); -- } -- return buffer.toString(); -- } -- -+ // -+ // We are taking as much as we can from the DefaultArtifact.equals(). The requested artifact has no file so -+ // we want to remove that from the comparision. -+ // -+ return requested.getArtifactId().equals( attached.getArtifactId() ) && requested.getGroupId().equals( attached.getGroupId() ) -+ && requested.getVersion().equals( attached.getVersion() ) && requested.getExtension().equals( attached.getExtension() ) -+ && requested.getClassifier().equals( attached.getClassifier() ); -+ } -+ - /** - * Determines whether the specified artifact refers to test classes. - * -@@ -263,52 +233,4 @@ private static boolean isTestArtifact( Artifact artifact ) - return ( "test-jar".equals( artifact.getProperty( "type", "" ) ) ) - || ( "jar".equals( artifact.getExtension() ) && "tests".equals( artifact.getClassifier() ) ); - } -- -- public File findArtifact( Artifact artifact ) -- { -- String projectKey = ArtifactUtils.key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ); -- -- MavenProject project = projectsByGAV.get( projectKey ); -- -- if ( project != null ) -- { -- File file = find( project, artifact ); -- if ( file == null && project != project.getExecutionProject() ) -- { -- file = find( project.getExecutionProject(), artifact ); -- } -- return file; -- } -- -- return null; -- } -- -- public List findVersions( Artifact artifact ) -- { -- String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() ); -- -- List projects = projectsByGA.get( key ); -- if ( projects == null || projects.isEmpty() ) -- { -- return Collections.emptyList(); -- } -- -- List versions = new ArrayList(); -- -- for ( MavenProject project : projects ) -- { -- if ( find( project, artifact ) != null ) -- { -- versions.add( project.getVersion() ); -- } -- } -- -- return Collections.unmodifiableList( versions ); -- } -- -- public WorkspaceRepository getRepository() -- { -- return repository; -- } -- - } -diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java -index 9b68a2e..c966e9a 100644 ---- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java -+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java -@@ -350,4 +350,14 @@ public ArtifactType get( String stereotypeId ) - - } - -+ public static Collection toArtifacts(Collection artifactsToConvert ) -+ { -+ List artifacts = new ArrayList(); -+ for( org.apache.maven.artifact.Artifact a : artifactsToConvert ) -+ { -+ artifacts.add(toArtifact(a)); -+ } -+ return artifacts; -+ } -+ - } --- -1.8.1.4 - diff --git a/0001-Migrate-from-easymock-1-to-easymock-3.patch b/0001-Migrate-from-easymock-1-to-easymock-3.patch index 5a6a706..438e5b6 100644 --- a/0001-Migrate-from-easymock-1-to-easymock-3.patch +++ b/0001-Migrate-from-easymock-1-to-easymock-3.patch @@ -1,7 +1,7 @@ -From 13b48a2b020ced6858e90c4d596f6804989844b9 Mon Sep 17 00:00:00 2001 +From 466eafe55aef76159d60036130f9c6740bdc803e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Aug 2013 10:11:48 +0200 -Subject: [PATCH 2/3] Migrate from easymock 1 to easymock 3 +Subject: [PATCH 2/4] Migrate from easymock 1 to easymock 3 --- maven-compat/pom.xml | 2 +- @@ -12,7 +12,7 @@ Subject: [PATCH 2/3] Migrate from easymock 1 to easymock 3 delete mode 100644 maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index dbb4155..f4cd5a9 100644 +index 5f8be50..a296c86 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -83,7 +83,7 @@ @@ -120,7 +120,7 @@ index bcda50a..37a281c 100644 private Artifact createTestPomArtifact( String directory ) diff --git a/pom.xml b/pom.xml -index 701e727..71e6d5a 100644 +index 5e16bd6..808924a 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ @@ -132,7 +132,7 @@ index 701e727..71e6d5a 100644 3.8.2 1.5.5 1.19 -@@ -320,7 +320,7 @@ +@@ -324,7 +324,7 @@ @@ -142,5 +142,5 @@ index 701e727..71e6d5a 100644 ${easyMockVersion} test -- -1.8.1.4 +1.8.4.2 diff --git a/0001-Update-Aether-to-0.9.0.M3.patch b/0001-Update-Aether-to-0.9.0.M3.patch index f39e1fc..1eb2880 100644 --- a/0001-Update-Aether-to-0.9.0.M3.patch +++ b/0001-Update-Aether-to-0.9.0.M3.patch @@ -1,7 +1,7 @@ -From 9874d5c9fb80c779682ffc5f8dd45435a17546ce Mon Sep 17 00:00:00 2001 +From c9859a031e75d41fb8199ab6dc7f3019f510fc83 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Aug 2013 08:49:19 +0200 -Subject: [PATCH 3/3] Update Aether to 0.9.0.M3 +Subject: [PATCH 3/4] Update Aether to 0.9.0.M3 --- apache-maven/pom.xml | 6 +++++- @@ -11,7 +11,7 @@ Subject: [PATCH 3/3] Update Aether to 0.9.0.M3 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 4a53643..0b56fa8 100644 +index e79b5a5..7504e24 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -87,7 +87,11 @@ @@ -28,7 +28,7 @@ index 4a53643..0b56fa8 100644 org.slf4j diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index a5c460a..62ce127 100644 +index 8a5fc78..7ae72f2 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -91,7 +91,12 @@ under the License. @@ -46,7 +46,7 @@ index a5c460a..62ce127 100644 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index f4cd5a9..ee6ace7 100644 +index a296c86..a2277b7 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -79,7 +79,12 @@ @@ -64,7 +64,7 @@ index f4cd5a9..ee6ace7 100644 diff --git a/pom.xml b/pom.xml -index 71e6d5a..889ba1d 100644 +index 808924a..366c557 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ @@ -76,7 +76,7 @@ index 71e6d5a..889ba1d 100644 1.7.5 true -@@ -284,7 +284,12 @@ +@@ -288,7 +288,12 @@ org.eclipse.aether @@ -91,5 +91,5 @@ index 71e6d5a..889ba1d 100644 -- -1.8.1.4 +1.8.4.2 diff --git a/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch b/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch index 801b287..c8c28f9 100644 --- a/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch +++ b/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch @@ -1,7 +1,7 @@ -From 2247f2e0b045c4b7a99e830ee0c032c787560cbc Mon Sep 17 00:00:00 2001 +From 93bf8c4e671da0015de6a7269980d35f4a1c77ea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 13 Nov 2013 14:32:23 +0100 -Subject: [PATCH] Update to Sisu 0.1.0 and Guice 3.1.6 +Subject: [PATCH 4/4] Update to Sisu 0.1.0 and Guice 3.1.6 Sisu depends on Guice, but dependency scope changed from "compile" to "provided" in Sisu 0.1.0. As a Sisu user, Maven needs to have runtime @@ -18,7 +18,7 @@ dependency on Guice. 8 files changed, 77 insertions(+), 3 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 0b56fa8..f7b1267 100644 +index 7504e24..57f75cc 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -57,6 +57,18 @@ @@ -41,7 +41,7 @@ index 0b56fa8..f7b1267 100644 commons-cli diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index 62ce127..a71fa47 100644 +index 7ae72f2..c6988ee 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -80,7 +80,6 @@ under the License. @@ -65,7 +65,7 @@ index 62ce127..a71fa47 100644 org.eclipse.aether diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index ee6ace7..cf690b8 100644 +index a2277b7..0c8e9e9 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -64,6 +64,18 @@ @@ -88,7 +88,7 @@ index ee6ace7..cf690b8 100644 plexus-component-annotations diff --git a/maven-core/pom.xml b/maven-core/pom.xml -index 713ffcc..b873e0b 100644 +index 400ec02..09bfd0a 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -82,6 +82,17 @@ @@ -110,7 +110,7 @@ index 713ffcc..b873e0b 100644 plexus-interpolation diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml -index 01f6179..0b464ca 100644 +index 1264eea..11ae441 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -65,6 +65,17 @@ @@ -132,7 +132,7 @@ index 01f6179..0b464ca 100644 plexus-component-annotations diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml -index 9150460..a7317c0 100644 +index d694534..c7111b5 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -54,6 +54,18 @@ @@ -155,7 +155,7 @@ index 9150460..a7317c0 100644 xmlunit 1.3 diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml -index d899721..5a41bcd 100644 +index 24e3101..8096b15 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -58,6 +58,18 @@ under the License. @@ -178,20 +178,20 @@ index d899721..5a41bcd 100644 diff --git a/pom.xml b/pom.xml -index 889ba1d..f6c3246 100644 +index 366c557..5414c23 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ - 3.0.15 - - 11.0.2 + 3.0.17 + + 14.0.1 - 3.1.3 - 0.0.0.M5 + 3.1.6 + 0.1.0 - 2.4 + 2.6 1.3 1.7 -- -1.8.1.4 +1.8.4.2 diff --git a/0005-Use-generics-in-modello-generated-code.patch b/0005-Use-generics-in-modello-generated-code.patch index abf1519..d0c75e4 100644 --- a/0005-Use-generics-in-modello-generated-code.patch +++ b/0005-Use-generics-in-modello-generated-code.patch @@ -1,7 +1,7 @@ -From a19f7488a64486c5d9ace8c681a963da92b9e269 Mon Sep 17 00:00:00 2001 +From 6969f54c7a4e1e280ea44b3a82caf8302f8e05f7 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 31 Jan 2012 13:12:32 +0100 -Subject: [PATCH 1/3] Use generics in modello generated code +Subject: [PATCH 1/4] Use generics in modello generated code --- maven-model/pom.xml | 2 ++ @@ -9,7 +9,7 @@ Subject: [PATCH 1/3] Use generics in modello generated code 2 files changed, 5 insertions(+) diff --git a/maven-model/pom.xml b/maven-model/pom.xml -index 7fd718f..b8781b6 100644 +index 0e594dd..f4d7402 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -56,6 +56,7 @@ under the License. @@ -29,10 +29,10 @@ index 7fd718f..b8781b6 100644 diff --git a/pom.xml b/pom.xml -index 922976f..701e727 100644 +index 782b3c4..5e16bd6 100644 --- a/pom.xml +++ b/pom.xml -@@ -382,6 +382,9 @@ +@@ -389,6 +389,9 @@ org.codehaus.modello modello-maven-plugin ${modelloVersion} @@ -43,5 +43,5 @@ index 922976f..701e727 100644 site-docs -- -1.8.1.4 +1.8.4.2 diff --git a/maven.spec b/maven.spec index 74d127a..035cf05 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven -Version: 3.1.1 -Release: 15%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -74,6 +74,7 @@ BuildRequires: plexus-sec-dispatcher BuildRequires: plexus-utils >= 3.0.10 BuildRequires: sisu-inject >= 1:0.1 BuildRequires: sisu-plexus >= 1:0.1 +BuildRequires: sisu-mojos BuildRequires: slf4j BuildRequires: xmlunit BuildRequires: mvn(ch.qos.logback:logback-classic) @@ -150,8 +151,8 @@ Group: Documentation # not really used during build, but a precaution rm maven-ant-tasks-*.jar -# fix line endings -sed -i 's:\r::' *.txt +# Use Eclipse Sisu plugin +sed -i s/org.sonatype.plugins/org.eclipse.sisu/ maven-core/pom.xml # fix for animal-sniffer (we don't generate 1.5 signatures) sed -i 's:check-java-1.5-compat:check-java-1.6-compat:' pom.xml @@ -251,7 +252,7 @@ ln -sf $(build-classpath plexus/classworlds) \ %files -f .mfiles -%doc LICENSE NOTICE README.txt +%doc LICENSE NOTICE README.md %{_datadir}/%{name} %{_bindir}/mvn %dir %{_javadir}/%{name} @@ -268,6 +269,9 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Tue Feb 11 2014 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + * Mon Dec 23 2013 Mikolaj Izdebski - 3.1.1-15 - Read user and system config files in maven-script diff --git a/sources b/sources index 2517a95..1667139 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46e0b798750df60aa157d7b38a10265c apache-maven-3.1.1-src.tar.gz +847149b2e0dc824fc6a535a2c4a0e0bc apache-maven-3.2.0-src.tar.gz