From 9667d78a30457d533e7bb106a4819428143bb24e Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 1 Mar 2011 15:06:46 +0100 Subject: [PATCH] Update to 3.0.3rc1 - Enable tests again --- .gitignore | 1 + ...ep.patch => 0001-Add-plugin-api-deps.patch | 23 +- 0002-Use-custom-resolver.patch | 203 ++++++++---------- maven.spec | 54 ++--- sources | 2 +- 5 files changed, 131 insertions(+), 152 deletions(-) rename 0001-Add-plexus-default-container-dep.patch => 0001-Add-plugin-api-deps.patch (62%) diff --git a/.gitignore b/.gitignore index 38baa99..2ae537f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apache-maven-3.0-src.tar.gz /apache-maven-3.0.2-src.tar.gz +/apache-maven-3.0.3-RC1-src.tar.gz diff --git a/0001-Add-plexus-default-container-dep.patch b/0001-Add-plugin-api-deps.patch similarity index 62% rename from 0001-Add-plexus-default-container-dep.patch rename to 0001-Add-plugin-api-deps.patch index 7f2db81..69ebec4 100644 --- a/0001-Add-plexus-default-container-dep.patch +++ b/0001-Add-plugin-api-deps.patch @@ -1,27 +1,28 @@ -From 5a04c433c126ae0945bb4a18d708cfc7dc5df29e Mon Sep 17 00:00:00 2001 +From 8ded699d85fd30717fbdd09a9238f309386747db Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 12 Oct 2010 16:56:50 +0200 -Subject: [PATCH 1/2] Add plexus-default-container dep +Subject: [PATCH 1/2] Add plugin-api deps --- - maven-plugin-api/pom.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + maven-plugin-api/pom.xml | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml -index 2e99b7b..cffc6d2 100644 +index 621f8d6..ca98242 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml -@@ -51,6 +51,10 @@ under the License. +@@ -51,6 +51,11 @@ under the License. org.sonatype.sisu sisu-inject-plexus -+ -+ org.codehaus.plexus -+ plexus-container-default -+ ++ ++ org.codehaus.plexus ++ plexus-container-default ++ latest ++ -- -1.7.3.4 +1.7.4 diff --git a/0002-Use-custom-resolver.patch b/0002-Use-custom-resolver.patch index eec152c..a846e6a 100644 --- a/0002-Use-custom-resolver.patch +++ b/0002-Use-custom-resolver.patch @@ -1,4 +1,4 @@ -From c804249cb3355df3ac10b4a83fffa2a4c84bd69b Mon Sep 17 00:00:00 2001 +From 2f1e46675a26996103ba9c96ae62d3b5876bdba8 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 18 Jan 2011 11:09:32 +0100 Subject: [PATCH 2/2] Use custom resolver @@ -11,43 +11,42 @@ project when WorkspaceReader is not available yet. .../repository/internal/DefaultModelResolver.java | 9 +++++++++ .../org/apache/maven/artifact/ArtifactUtils.java | 10 ++++++++-- .../main/java/org/apache/maven/DefaultMaven.java | 7 +++++++ - .../main/java/org/apache/maven/ReactorReader.java | 4 ++-- .../apache/maven/plugin/MavenPluginValidator.java | 5 ++++- .../internal/DefaultPluginVersionResolver.java | 9 +++++++++ .../apache/maven/project/ProjectModelResolver.java | 9 +++++++++ .../project/artifact/MavenMetadataSource.java | 9 +++++++++ .../model/validation/DefaultModelValidator.java | 16 +++++++++++++--- - 9 files changed, 70 insertions(+), 8 deletions(-) + 8 files changed, 68 insertions(+), 6 deletions(-) diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java -index cae3735..2d11d64 100644 +index 746f852..4232fd7 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java -@@ -39,6 +39,7 @@ import org.sonatype.aether.repository.RemoteRepository; +@@ -40,6 +40,7 @@ import org.sonatype.aether.repository.RemoteRepository; import org.sonatype.aether.resolution.ArtifactRequest; import org.sonatype.aether.resolution.ArtifactResolutionException; import org.sonatype.aether.util.artifact.DefaultArtifact; -+import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; ++import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; /** * A model resolver to assist building of dependency POMs. This resolver gives priority to those repositories that have -@@ -108,6 +109,14 @@ class DefaultModelResolver +@@ -114,6 +115,14 @@ class DefaultModelResolver throws UnresolvableModelException { Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version ); -+ if ( System.getProperty("maven.local.mode") != null) { -+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader(); -+ File pomFile = wReader.findArtifact(pomArtifact); -+ // if pom file does not exist continue resolving using different -+ // resolvers (maybe they will have more luck) -+ if ( pomFile != null ) -+ return new FileModelSource( pomFile ); -+ } ++ if ( System.getProperty("maven.local.mode") != null) { ++ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader(); ++ File pomFile = wReader.findArtifact(pomArtifact); ++ // if pom file does not exist continue resolving using different ++ // resolvers (maybe they will have more luck) ++ if ( pomFile != null ) ++ return new FileModelSource( pomFile ); ++ } try { diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java -index 1f37d4f..d60dab8 100644 +index 1f37d4f..05b7df6 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java @@ -99,12 +99,18 @@ public final class ArtifactUtils @@ -55,71 +54,49 @@ index 1f37d4f..d60dab8 100644 throw new NullPointerException( "artifactId is null" ); } - if ( version == null ) -+ // in local mode we ignore versions because these would only cause -+ // problems -+ if ( version == null && System.getProperty("maven.local.mode") == null ) ++ // in local mode we ignore versions because these would only cause ++ // problems ++ if ( version == null && System.getProperty("maven.local.mode") == null ) { throw new NullPointerException( "version is null" ); } - return groupId + ":" + artifactId + ":" + version; -+ if( System.getProperty("maven.local.mode") == null ) { -+ return groupId + ":" + artifactId + ":" + version; -+ } else { -+ return versionlessKey(groupId, artifactId); -+ } ++ if( System.getProperty("maven.local.mode") == null ) { ++ return groupId + ":" + artifactId + ":" + version; ++ } else { ++ return versionlessKey(groupId, artifactId); ++ } } public static Map artifactMapByVersionlessId( Collection artifacts ) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java -index e892ee9..0222b01 100644 +index a7c1a2b..8fdb6ed 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java -@@ -55,6 +55,7 @@ import org.apache.maven.project.ProjectBuildingException; +@@ -56,6 +56,7 @@ import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.project.ProjectBuildingResult; import org.apache.maven.project.ProjectSorter; -+import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; ++import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; import org.apache.maven.repository.DelegatingLocalArtifactRepository; import org.apache.maven.repository.LocalRepositoryNotAccessibleException; import org.apache.maven.settings.Mirror; -@@ -361,6 +362,12 @@ public class DefaultMaven +@@ -363,6 +364,12 @@ public class DefaultMaven session.setWorkspaceReader( workspaceRepository ); } -+ // Set our own workspace reader to resolve from /usr/share/java -+ if ( System.getProperty("maven.local.mode") != null) -+ { -+ session.setWorkspaceReader(new JavadirWorkspaceReader()); -+ } -+ ++ // Set our own workspace reader to resolve from /usr/share/java ++ if ( System.getProperty("maven.local.mode") != null) ++ { ++ session.setWorkspaceReader(new JavadirWorkspaceReader()); ++ } ++ DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest(); decrypt.setProxies( request.getProxies() ); decrypt.setServers( request.getServers() ); -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 62e181a..3d08c65 100644 ---- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java -+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java -@@ -216,7 +216,7 @@ class ReactorReader - - public File findArtifact( Artifact artifact ) - { -- String projectKey = artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getVersion(); -+ String projectKey = ArtifactUtils.key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ); - - MavenProject project = projectsByGAV.get( projectKey ); - -@@ -230,7 +230,7 @@ class ReactorReader - - public List findVersions( Artifact artifact ) - { -- String key = artifact.getGroupId() + ':' + artifact.getArtifactId(); -+ String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() ); - - List projects = projectsByGA.get( key ); - if ( projects == null || projects.isEmpty() ) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java -index 009635b..7d03748 100644 +index 009635b..93b86d0 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java @@ -60,7 +60,10 @@ public class MavenPluginValidator @@ -127,121 +104,121 @@ index 009635b..7d03748 100644 } - if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) ) -+ // ignore incorrect version in local mode (we can have different -+ // versions in /usr/share/java -+ if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) -+ && System.getProperty("maven.local.mode") == null) ++ // ignore incorrect version in local mode (we can have different ++ // versions in /usr/share/java ++ if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) ++ && System.getProperty("maven.local.mode") == null) { errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() ); } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java -index fb074fb..bf2e703 100644 +index c5f5604..cac7fc8 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java -@@ -75,6 +75,15 @@ public class DefaultPluginVersionResolver +@@ -89,6 +89,15 @@ public class DefaultPluginVersionResolver throws PluginVersionResolutionException { logger.debug( "Resolving plugin version for " + request.getGroupId() + ":" + request.getArtifactId() ); -+ if (System.getProperty("maven.local.mode") != null) { -+ // in local mode we always use "latest" as a resolved version -+ // (we ignore it anyway) -+ DefaultPluginVersionResult result = new DefaultPluginVersionResult("latest"); -+ result.setRepository(request.getRepositorySession().getWorkspaceReader().getRepository()); -+ logger.debug( "Resolved plugin version for " + request.getGroupId() + ":" + request.getArtifactId() -+ + " to latest from repository " + result.getRepository()); -+ return result; -+ } ++ if (System.getProperty("maven.local.mode") != null) { ++ // in local mode we always use "latest" as a resolved version ++ // (we ignore it anyway) ++ DefaultPluginVersionResult result = new DefaultPluginVersionResult("latest"); ++ result.setRepository(request.getRepositorySession().getWorkspaceReader().getRepository()); ++ logger.debug( "Resolved plugin version for " + request.getGroupId() + ":" + request.getArtifactId() ++ + " to latest from repository " + result.getRepository()); ++ return result; ++ } PluginVersionResult result = resolveFromProject( request ); diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java -index 403351a..2351620 100644 +index e788cea..430960c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java -@@ -41,6 +41,7 @@ import org.sonatype.aether.repository.RepositoryPolicy; +@@ -42,6 +42,7 @@ import org.sonatype.aether.repository.RemoteRepository; import org.sonatype.aether.resolution.ArtifactRequest; import org.sonatype.aether.resolution.ArtifactResolutionException; import org.sonatype.aether.util.artifact.DefaultArtifact; -+import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; ++import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; /** * A model resolver to assist building of projects. This resolver gives priority to those repositories that have been -@@ -172,6 +173,14 @@ class ProjectModelResolver +@@ -147,6 +148,14 @@ class ProjectModelResolver if ( pomFile == null ) { Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version ); -+ if ( System.getProperty("maven.local.mode") != null) { -+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader(); -+ pomFile = wReader.findArtifact(pomArtifact); -+ // if pom file does not exist continue resolving using different resolvers -+ // (maybe they will have more luck) -+ if ( pomFile != null) -+ return new FileModelSource( pomFile ); -+ } ++ if ( System.getProperty("maven.local.mode") != null) { ++ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader(); ++ pomFile = wReader.findArtifact(pomArtifact); ++ // if pom file does not exist continue resolving using different resolvers ++ // (maybe they will have more luck) ++ if ( pomFile != null) ++ return new FileModelSource( pomFile ); ++ } try { diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java -index 066fbf3..a7cbf40 100644 +index 44a6879..7209b49 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java -@@ -326,6 +326,15 @@ public class MavenMetadataSource +@@ -325,6 +325,15 @@ public class MavenMetadataSource return null; } -+ // this is a workaround for 669034 -+ // Seems like plexus-container-default has some quirks that -+ // cause it to lose version. Needs more looking into and fix it -+ // properly -+ if (dependency.getVersion() == null && System.getProperty("maven.local.mode") != null) -+ { -+ System.out.println("FIXING NULL VERSION:" + dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion()); -+ dependency.setVersion("1.0.0"); -+ } ++ // this is a workaround for 669034 ++ // Seems like plexus-container-default has some quirks that ++ // cause it to lose version. Needs more looking into and fix it ++ // properly ++ if (dependency.getVersion() == null && System.getProperty("maven.local.mode") != null) ++ { ++ System.out.println("FIXING NULL VERSION:" + dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion()); ++ dependency.setVersion("1.0.0"); ++ } VersionRange versionRange = VersionRange.createFromVersionSpec( dependency.getVersion() ); Artifact dependencyArtifact = diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java -index 033211a..eec6caf 100644 +index c97095f..ef0edc2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java -@@ -405,7 +405,11 @@ public class DefaultModelValidator +@@ -434,7 +434,11 @@ public class DefaultModelValidator if ( !management ) { - validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); -+ // in local mode set version to "latest" and validate -+ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null) -+ d.setVersion("latest"); -+ else -+ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); ++ // in local mode set version to "latest" and validate ++ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null) ++ d.setVersion("latest"); ++ else ++ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); /* * TODO: Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc. -@@ -433,7 +437,11 @@ public class DefaultModelValidator +@@ -462,7 +466,11 @@ public class DefaultModelValidator { validateEffectiveDependency( problems, d, false, prefix, request ); - validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); -+ // in local mode set version to "latest" and validate -+ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null) -+ d.setVersion("latest"); -+ else -+ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); ++ // in local mode set version to "latest" and validate ++ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null) ++ d.setVersion("latest"); ++ else ++ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); validateEnum( prefix + "scope", problems, errOn30, d.getScope(), d.getManagementKey(), d, "compile", "runtime", "system" ); -@@ -452,7 +460,9 @@ public class DefaultModelValidator +@@ -481,7 +489,9 @@ public class DefaultModelValidator { validateStringNotEmpty( prefix + "type", problems, Severity.ERROR, d.getType(), d.getManagementKey(), d ); - validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, d.getVersion(), d.getManagementKey(), -+ // in local mode ignore missing version completely -+ if(System.getProperty("maven.local.mode") == null) -+ validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, d.getVersion(), d.getManagementKey(), ++ // in local mode ignore missing version completely ++ if(System.getProperty("maven.local.mode") == null) ++ validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, d.getVersion(), d.getManagementKey(), d ); } -- -1.7.3.4 +1.7.4 diff --git a/maven.spec b/maven.spec index 47faca6..4a11793 100644 --- a/maven.spec +++ b/maven.spec @@ -1,13 +1,16 @@ +%global ver_add -RC1 Name: maven -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.0.3 +Release: 0.1.rc1%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools License: ASL 2.0 and MIT and BSD URL: http://maven.apache.org/ -Source0: http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{version}-src.tar.gz +# Source URL is for testing only, final version will be in different place: +# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{version}-src.tar.gz +Source0: https://repository.apache.org/content/repositories/maven-049/org/apache/maven/apache-%{name}/%{version}%{ver_add}/apache-%{name}-%{version}%{ver_add}-src.tar.gz # custom resolver java files # source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/ @@ -24,14 +27,14 @@ Source250: repo-metadata.tar.xz # Patch1XX could be upstreamed probably # Patch15X are already upstream -Patch150: 0001-Add-plexus-default-container-dep.patch +Patch150: 0001-Add-plugin-api-deps.patch # Patch2XX for non-upstreamable patches Patch200: 0002-Use-custom-resolver.patch BuildArch: noarch -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-assembly-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin @@ -42,21 +45,21 @@ BuildRequires: maven-site-plugin BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 BuildRequires: buildnumber-maven-plugin -BuildRequires: plexus-containers-component-metadata >= 1.5.4-4 +BuildRequires: plexus-containers-component-metadata >= 1.5.5 BuildRequires: plexus-containers-container-default BuildRequires: animal-sniffer >= 1.6-5 BuildRequires: mojo-parent BuildRequires: atinject -BuildRequires: aether >= 1.9 +BuildRequires: aether >= 1.11 BuildRequires: async-http-client BuildRequires: sonatype-oss-parent -BuildRequires: sisu -BuildRequires: google-guice +BuildRequires: sisu >= 2.1.1-2 +BuildRequires: google-guice >= 3.0 BuildRequires: hamcrest BuildRequires: apache-commons-parent Requires: java >= 1:1.6.0 -Requires: plexus-classworlds +Requires: plexus-classworlds >= 2.4 Requires: apache-commons-cli Requires: guava Requires: hamcrest @@ -70,11 +73,11 @@ Requires: plexus-utils Requires: xbean Requires: xerces-j2 Requires: maven-wagon -Requires: aether >= 1.9 +Requires: aether >= 1.11 Requires: async-http-client Requires: sonatype-oss-parent -Requires: sisu -Requires: google-guice +Requires: sisu >= 2.1.1-2 +Requires: google-guice >= 3.0 Requires: atinject Requires: animal-sniffer >= 1.6-5 Requires: mojo-parent @@ -100,7 +103,7 @@ Requires: jpackage-utils %{summary}. %prep -%setup -q -n apache-%{name}-%{version} +%setup -q -n apache-%{name}-%{version}%{ver_add} %patch150 -p1 %patch200 -p1 @@ -133,24 +136,17 @@ sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath popd %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -# temporary ignore of failures in maven-compat -mvn-jpp -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.failure.ignore=true \ - install javadoc:aggregate +mvn-rpmbuild -e install javadoc:aggregate mkdir m2home (cd m2home tar xvf ../apache-maven/target/*tar.gz -chmod -x apache-%{name}-%{version}/conf/settings.xml +chmod -x apache-%{name}-%{version}%{ver_add}/conf/settings.xml ) %install -export M2_HOME=$(pwd)/m2home/apache-maven-%{version} +export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{ver_add} # maven2 directory in /usr/share/java install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} @@ -205,12 +201,12 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib (cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib build-jar-repository -s -p . aether/api aether/connector-wagon aether/impl aether/spi aether/util \ - commons-cli guava hamcrest/core nekohtml plexus/plexus-cipher \ + commons-cli guava google-guice hamcrest/core nekohtml plexus/plexus-cipher \ plexus/containers-component-annotations plexus/containers-container-default \ plexus/interpolation plexus/plexus-sec-dispatcher plexus/utils \ sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \ maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \ - xbean/xbean-reflect xerces-j2 jdom xml-commons-apis + xbean/xbean-reflect xerces-j2 jdom xml-commons-apis atinject ) ################ @@ -260,7 +256,7 @@ for module in maven-aether-provider maven-artifact maven-compat \ maven-settings-builder;do pushd $module - install -m 644 target/$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar + install -m 644 target/$module-%{version}%{ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar ln -s %{_javadir}/%{name}/$module.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/$module.jar install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$module.pom %add_to_maven_depmap org.apache.maven $module %{version} JPP/%{name} $module @@ -312,6 +308,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog +* Tue Mar 1 2011 Stanislav Ochotnicky - 3.0.3-0.1.rc1 +- Update to 3.0.3rc1 +- Enable tests again + * Thu Feb 10 2011 Stanislav Ochotnicky - 3.0.2-2 - Added mvn-rpmbuild script to be used in spec files - mvn-local is now mixed mode (online with javadir priority) diff --git a/sources b/sources index f872c34..2f98cd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09b3092100e1f15fa4777217562309ea apache-maven-3.0.2-src.tar.gz +562a919758f71b8170b1f5a9b34dcccd apache-maven-3.0.3-RC1-src.tar.gz