rpms/maven2/devel import.log, NONE, 1.1 maven2-2.2.1-enable-bootstrap-repo.patch, NONE, 1.1 maven2-2.2.1-jpp.patch, NONE, 1.1 maven2-2.2.1-settings.xml, NONE, 1.1 maven2-2.2.1-update-tests.patch, NONE, 1.1 maven2-antbuild.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 maven2-jpp-script, 1.1, 1.2 maven2.spec, 1.27, 1.28 sources, 1.8, 1.9 maven2-2.0.8-excludeexternaljars.patch, 1.1, NONE maven2-MNG-3139.patch, 1.1, NONE maven2-addjdom-depmap.xml, 1.1, NONE maven2-addjdomtobootstrappath.patch, 1.3, NONE maven2-bash-completion, 1.1, NONE maven2-empty-dep.jar, 1.1, NONE maven2-empty-dep.pom, 1.1, NONE maven2-enable-bootstrap-repository.patch, 1.1, NONE maven2-fastjar-manifest-fix.patch, 1.3, NONE maven2-jpp-readme.html, 1.1, NONE maven2-jpprepolayout.patch, 1.3, NONE maven2-plugins-catch-uncaught-exceptions.patch, 1.1, NONE maven2-plugins-dependency-plugin-import-fix.patch, 1.1, NONE maven2-plugins-disablecobertura.patch, 1.1, NONE maven2-plugins-doxiaupdatefix.patch, 1.2, NONE maven2-plugins-javadoc-newdoxia.patch, 1.2, NONE maven2-plugins-jpprepolayout.patch, 1.1, NONE maven2-plugins-project-info-reports-jdkversion.patch, 1.1, NONE maven2-run-it-tests.sh, 1.1, NONE maven2-settings.xml, 1.1, NONE maven2-shade-plugin-replacement.patch, 1.1, NONE maven2-site-plugin-addservletdep.patch, 1.1, NONE maven2-sourcetarget.patch, 1.1, NONE maven2-use-unversioned-classworlds.patch, 1.1, NONE maven2-versionless-depmap.xml, 1.1, NONE
Yang Yong
yyang at fedoraproject.org
Thu May 6 09:22:28 UTC 2010
Author: yyang
Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12830/devel
Modified Files:
.cvsignore maven2-jpp-script maven2.spec sources
Added Files:
import.log maven2-2.2.1-enable-bootstrap-repo.patch
maven2-2.2.1-jpp.patch maven2-2.2.1-settings.xml
maven2-2.2.1-update-tests.patch maven2-antbuild.patch
Removed Files:
maven2-2.0.8-excludeexternaljars.patch maven2-MNG-3139.patch
maven2-addjdom-depmap.xml maven2-addjdomtobootstrappath.patch
maven2-bash-completion maven2-empty-dep.jar
maven2-empty-dep.pom maven2-enable-bootstrap-repository.patch
maven2-fastjar-manifest-fix.patch maven2-jpp-readme.html
maven2-jpprepolayout.patch
maven2-plugins-catch-uncaught-exceptions.patch
maven2-plugins-dependency-plugin-import-fix.patch
maven2-plugins-disablecobertura.patch
maven2-plugins-doxiaupdatefix.patch
maven2-plugins-javadoc-newdoxia.patch
maven2-plugins-jpprepolayout.patch
maven2-plugins-project-info-reports-jdkversion.patch
maven2-run-it-tests.sh maven2-settings.xml
maven2-shade-plugin-replacement.patch
maven2-site-plugin-addservletdep.patch
maven2-sourcetarget.patch
maven2-use-unversioned-classworlds.patch
maven2-versionless-depmap.xml
Log Message:
import maven 2.2.1 bootstrap package
--- NEW FILE import.log ---
maven2-2_2_1-1:HEAD:maven2-2.2.1-1.src.rpm:1273137813
maven2-2.2.1-enable-bootstrap-repo.patch:
pom-4.0.0.xml | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
--- NEW FILE maven2-2.2.1-enable-bootstrap-repo.patch ---
diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
--- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2009-11-19 21:48:25.214582305 -0500
+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-11-20 00:02:16.608725006 -0500
@@ -33,6 +33,15 @@ under the License.
</snapshots>
</repository>
<repository>
+ <id>__bootstrap_jpp_repo__</id>
+ <name>Maven Bootstrap Repository</name>
+ <layout>default</layout>
+ <url>file:///usr/share/maven2/bootstrap_repo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>__jpp_repo__</id>
<name>JPackage Maven Repository</name>
<layout>jpp</layout>
@@ -57,6 +66,18 @@ under the License.
</releases>
</pluginRepository>
<pluginRepository>
+ <id>__bootstrap_jpp_repo__</id>
+ <name>Maven Bootstrap Repository</name>
+ <layout>default</layout>
+ <url>file:///usr/share/maven2/bootstrap_repo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
<id>__jpp_repo__</id>
<name>JPackage Maven Repository</name>
<layout>jpp</layout>
maven2-2.2.1-jpp.patch:
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java | 31 ++++++++++
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java | 2
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java | 3
maven-artifact/pom.xml | 5 +
maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java | 17 +++++
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java | 9 ++
maven-artifact/src/main/resources/META-INF/plexus/components.xml | 6 +
maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java | 12 +++
maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java | 6 +
maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java | 8 ++
maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java | 8 ++
maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java | 10 ++-
maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml | 22 +++++++
pom.xml | 5 +
14 files changed, 133 insertions(+), 11 deletions(-)
--- NEW FILE maven2-2.2.1-jpp.patch ---
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav 2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java 2009-11-19 14:17:42.000000000 -0500
@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtil
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -66,6 +68,7 @@ import java.net.URL;
import java.security.NoSuchAlgorithmException;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -409,7 +412,20 @@ public class DefaultWagonManager
ArtifactRepository repository )
throws TransferFailedException, ResourceDoesNotExistException
{
+
+ String originalVersion = artifact.getVersion();
+
+ if ( ( repository.getLayout() instanceof org.apache.maven.artifact.repository.layout.JPackageRepositoryLayout ) &&
+ ( System.getProperty("maven2.jpp.mode") != null ) )
+ {
+ MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
+ Hashtable newInfo = map.getMappedInfo(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+
+ artifact.setVersion((String) newInfo.get("version"));
+ }
+
String remotePath = repository.pathOf( artifact );
+ artifact.setVersion(originalVersion); // set it back
ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
@@ -421,8 +437,23 @@ public class DefaultWagonManager
{
getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
}
+ else if ((System.getProperty("maven2.jpp.mode") != null) &&
+ (!repository.getUrl().startsWith("file:")))
+ {
+ // In JPP mode, repos other than those starting with file:// are
+ // not allowed
+ getLogger().warn( "Skipping non filebased repository " + repository.getUrl() + " in full offline mode");
+ }
else
{
+ // In vanilla mode, the JPP repos should be ignored
+ if ((System.getProperty("maven2.jpp.mode") == null) &&
+ (repository.getId().equals("__jpp_repo__")))
+ {
+ getLogger().warn( "Skipping jpp repository " + repository.getUrl() + " in vanilla mode");
+ return;
+ }
+
getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( getMirrorRepository( repository ), artifact.getFile(), remotePath, downloadMonitor,
policy.getChecksumPolicy(), false );
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav 2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java 2009-11-18 16:54:39.000000000 -0500
@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataMa
boolean checkForUpdates =
!file.exists() || policy.checkOutOfDate( new Date( file.lastModified() ) );
- if ( checkForUpdates )
+ if ( checkForUpdates && (System.getProperty("maven2.jpp.mode") == null))
{
if ( wagonManager.isOnline() )
{
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav 2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java 2009-11-18 16:54:39.000000000 -0500
@@ -206,7 +206,8 @@ public class DefaultArtifactResolver
try
{
// TODO: force should be passed to the wagon manager
- if ( artifact.getRepository() != null )
+ if ( (artifact.getRepository() != null) &&
+ (System.getProperty("maven2.jpp.mode") == null))
{
// the transformations discovered the artifact - so use it exclusively
wagonManager.getArtifact( artifact, artifact.getRepository() );
diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
--- ./maven-artifact/pom.xml.sav 2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/pom.xml 2009-11-19 14:54:43.000000000 -0500
@@ -39,5 +39,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
--- ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav 2009-08-06 15:11:31.000000000 -0400
+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java 2009-11-19 14:15:45.000000000 -0500
@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
+
+import java.util.Hashtable;
/**
* @author jdcasey
@@ -42,6 +45,8 @@ public class DefaultRepositoryLayout
StringBuffer path = new StringBuffer();
+ String baseVersion = artifact.getBaseVersion();
+
path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
path.append( artifact.getArtifactId() ).append( PATH_SEPARATOR );
path.append( artifact.getBaseVersion() ).append( PATH_SEPARATOR );
@@ -76,7 +81,17 @@ public class DefaultRepositoryLayout
if ( metadata.storedInArtifactVersionDirectory() )
{
- path.append( metadata.getBaseVersion() ).append( PATH_SEPARATOR );
+ String baseVersion = metadata.getBaseVersion();
+
+ if (System.getProperty("maven2.jpp.mode") != null)
+ {
+ MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
+ Hashtable newInfo = map.getMappedInfo(metadata.getGroupId(), metadata.getArtifactId(), baseVersion);
+
+ baseVersion = (String) newInfo.get("version");
+ }
+
+ path.append( baseVersion ).append( PATH_SEPARATOR );
}
}
diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
--- ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav 2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java 2009-11-18 16:54:39.000000000 -0500
@@ -341,7 +341,7 @@ public class DefaultArtifactCollector
// set the recommended version
// TODO: maybe its better to just pass the range through to retrieval and use a transformation?
ArtifactVersion version;
- if ( artifact.isSelectedVersionKnown() )
+ if ( artifact.isSelectedVersionKnown() && System.getProperty("maven2.jpp.mode") == null)
{
version = artifact.getSelectedVersion();
}
@@ -380,7 +380,12 @@ public class DefaultArtifactCollector
//this is dangerous because artifact.getSelectedVersion() can
//return null. However it is ok here because we first check if the
//selected version is known. As currently coded we can't get a null here.
- artifact.selectVersion( version.toString() );
+
+ if ( !artifact.isSelectedVersionKnown() && System.getProperty("maven2.jpp.mode") != null)
+ artifact.selectVersion( "DUMMY_VER" );
+ else
+ artifact.selectVersion( version.toString() );
+
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav ./maven-artifact/src/main/resources/META-INF/plexus/components.xml
--- ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav 2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/src/main/resources/META-INF/plexus/components.xml 2009-11-18 16:54:39.000000000 -0500
@@ -31,6 +31,12 @@ under the License.
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
</component>
+ <component>
+ <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>jpp</role-hint>
+ <implementation>org.apache.maven.artifact.repository.layout.JPackageRepositoryLayout</implementation>
+ </component>
+
<!--
|
| ArtifactHandlerManager
diff -up ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java.sav ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav 2009-11-19 11:36:53.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java 2009-11-19 11:47:25.000000000 -0500
@@ -60,6 +60,7 @@ public class MavenPluginCollector
{
pluginsInProcess.add( key );
+ System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
pluginDescriptors.put( key, pluginDescriptor );
// TODO: throw an (not runtime) exception if there is a prefix overlap - means doing so elsewhere
@@ -75,6 +76,17 @@ public class MavenPluginCollector
public PluginDescriptor getPluginDescriptor( Plugin plugin )
{
String key = PluginUtils.constructVersionedKey( plugin );
+ System.err.println("*DEBUG*: Constructed plugin version key is " + key);
+
+ PluginDescriptor descriptor = (PluginDescriptor) pluginDescriptors.get( key );
+
+ // In JPP mode, we give it a second chance
+ if ( ( descriptor == null ) &&
+ ( System.getProperty("maven2.jpp.mode") != null ) )
+ {
+ //for descriptors
+ }
+
return (PluginDescriptor) pluginDescriptors.get( key );
}
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav 2009-11-19 11:08:06.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java 2009-11-19 11:08:29.000000000 -0500
@@ -57,8 +57,10 @@ public class MavenPluginValidator
{
errors.add( "Plugin's descriptor contains the wrong artifact ID: " + pluginDescriptor.getArtifactId() );
}
-
- if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) )
+
+ if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) &&
+ ( System.getProperty("maven2.jpp.mode") == null )
+ )
{
errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
}
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav 2009-11-19 11:51:04.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java 2009-11-19 12:00:15.000000000 -0500
@@ -72,7 +72,13 @@ class PluginUtils
String baseVersion = ArtifactUtils.toSnapshotVersion( version );
StringBuffer key = new StringBuffer( 128 );
- key.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( baseVersion );
+
+ // In JPP mode, we don't want to use versions in keys
+
+ if (System.getProperty("maven2.jpp.mode") == null)
+ key.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( baseVersion );
+ else
+ key.append( groupId ).append( ':' ).append( artifactId );
return key.toString();
}
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav 2009-08-06 15:11:28.000000000 -0400
+++ ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java 2009-11-18 16:54:39.000000000 -0500
@@ -224,9 +224,15 @@ public class DefaultPluginVersionManager
}
// if we still haven't found a version, then fail early before we get into the update goop.
- if ( StringUtils.isEmpty( version ) )
+ if ( (StringUtils.isEmpty( version )) && (System.getProperty("maven2.jpp.mode") == null))
{
throw new PluginVersionNotFoundException( groupId, artifactId );
+ } else if (System.getProperty("maven2.jpp.mode") != null)
+ {
+ // Doesn't matter what we have here. We need *something* because
+ // metadata is not retrieved in offline mode, so there needs to be
+ // some kind of version
+ version = "DUMMY_VER";
}
// if the plugin registry is inactive, then the rest of this goop is useless...
diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
--- ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav 2009-08-06 15:11:37.000000000 -0400
+++ ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java 2009-11-18 16:54:39.000000000 -0500
@@ -43,7 +43,7 @@ import java.util.List;
public class DefaultModelValidator
implements ModelValidator
{
- private static final String ID_REGEX = "[A-Za-z0-9_\\-.]+";
+ private static final String ID_REGEX = "[A-Za-z0-9_/\\\\.-]+";
///////////////////////////////////////////////////////////////////////////
// ModelValidator Implementation
@@ -88,7 +88,13 @@ public class DefaultModelValidator
validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), d.getManagementKey() );
- validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), d.getManagementKey() );
+ // In JPP mode, don't bother validating. But do put a dummy
+ // version if one is not provided
+ if ((System.getProperty("maven2.jpp.mode") != null) &&
+ (d.getVersion() == null))
+ d.setVersion("DUMMY_VER");
+ else
+ validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), d.getManagementKey() );
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
--- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2009-08-06 15:11:38.000000000 -0400
+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-11-19 13:12:23.000000000 -0500
@@ -32,6 +32,15 @@ under the License.
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>__jpp_repo__</id>
+ <name>JPackage Maven Repository</name>
+ <layout>jpp</layout>
+ <url>file:///usr/share/maven2/repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
@@ -47,6 +56,19 @@ under the License.
<updatePolicy>never</updatePolicy>
</releases>
</pluginRepository>
+ <pluginRepository>
+ <id>__jpp_repo__</id>
+ <name>JPackage Maven Repository</name>
+ <layout>jpp</layout>
+ <url>file:///usr/share/maven2/repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ </pluginRepository>
+
</pluginRepositories>
<build>
diff -up ./pom.xml.sav ./pom.xml
--- ./pom.xml.sav 2009-08-06 15:11:38.000000000 -0400
+++ ./pom.xml 2009-11-19 14:54:29.000000000 -0500
@@ -481,6 +481,11 @@ under the License.
<artifactId>classworlds</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<!--start-->
</dependencyManagement>
--- NEW FILE maven2-2.2.1-settings.xml ---
<settings>
<localRepository>__M2_LOCALREPO_PLACEHOLDER__</localRepository>
<mirrors>
<mirror>
<id>RPMCentralRepoMirror</id>
<name>RPM Central Repo Mirror</name>
<url>__M2_REMOTEREPO_PLACEHOLDER__</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<profiles>
<profile>
<id>build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>RPMBuildRepo</id>
<name>Repo used during rpmbuild</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</snapshots>
<url>__M2_REMOTEREPO_PLACEHOLDER__</url>
<layout>default</layout>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>RPMPluginBuildRepo</id>
<name>Plugin repo used during rpmbuild</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</snapshots>
<url>__M2_REMOTEREPO_PLACEHOLDER__</url>
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
maven2-2.2.1-update-tests.patch:
DefaultModelValidatorTest.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE maven2-2.2.1-update-tests.patch ---
diff -up ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java.sav ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
--- ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java.sav 2009-11-19 14:47:31.000000000 -0500
+++ ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java 2009-11-19 14:48:41.000000000 -0500
@@ -73,11 +73,9 @@ public class DefaultModelValidatorTest
{
ModelValidationResult result = validate( "invalid-ids-pom.xml" );
- assertEquals( 2, result.getMessageCount() );
-
- assertEquals( "'groupId' with value 'o/a/m' does not match a valid id pattern.", result.getMessage( 0 ) );
+ assertEquals( 1, result.getMessageCount() );
- assertEquals( "'artifactId' with value 'm$-do$' does not match a valid id pattern.", result.getMessage( 1 ) );
+ assertEquals( "'artifactId' with value 'm$-do$' does not match a valid id pattern.", result.getMessage( 0 ) );
}
public void testMissingType()
maven2-antbuild.patch:
build.xml | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE maven2-antbuild.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav 2009-08-06 15:11:38.000000000 -0400
+++ ./build.xml 2009-11-19 13:44:40.000000000 -0500
@@ -108,6 +108,9 @@ TODO:
<localRepository path="${maven.repo.local}"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
+ <dependency groupId="org.codehaus.modello" artifactId="modello-plugin-java" version="1.0"/>
+ <dependency groupId="org.codehaus.modello" artifactId="modello-plugin-xpp3" version="1.0"/>
+ <dependency groupId="org.codehaus.plexus" artifactId="plexus-classworlds" version="1.2-alpha-9"/>
</artifact:dependencies>
</target>
@@ -195,10 +198,13 @@ TODO:
<classpath refid="maven.classpath"/>
<arg value="-e"/>
<arg value="-B"/>
+ <arg value="-s"/>
+ <arg value="__M2_SETTINGS_FILE__"/>
<arg value="clean"/>
<arg value="install"/>
<arg value="-Dmaven.repo.local=${maven.repo.local}"/>
<arg value="-Dsurefire.useFile=${surefire.useFile}"/>
+ <arg value="-Dmaven2.jpp.mode=1"/>
</java>
</target>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 25 Aug 2009 18:53:22 -0000 1.8
+++ .cvsignore 6 May 2010 09:22:21 -0000 1.9
@@ -1,8 +1,2 @@
-maven-javadoc-plugin-2.4-src.tar.gz
-maven2-maven-site-plugin.tar.gz
-maven2-model-v3.jar
-maven2-plugins-070705-src.tar.gz
-maven2-src.tar.gz
-m2_jar_repo.tar.gz
-m2_pom_repo.tar.gz
-maven2-empty-dep.jar
+maven2-2.2.1-bootstrapdeps.tar.gz
+maven2-2.2.1.tar.gz
Index: maven2-jpp-script
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-jpp-script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-jpp-script 20 Mar 2007 00:52:40 -0000 1.1
+++ maven2-jpp-script 6 May 2010 09:22:26 -0000 1.2
@@ -7,4 +7,4 @@ fi
export M2_HOME=/usr/share/maven2
echo $JAVA_HOME
-export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.offline.mode -Dmaven2.ignore.versions -Dmaven2.usejppjars $@
+export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.jpp.mode $@
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.27 -r 1.28 maven2.specIndex: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- maven2.spec 2 Sep 2009 09:04:08 -0000 1.27
+++ maven2.spec 6 May 2010 09:22:27 -0000 1.28
@@ -1,1947 +1,246 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define with_itests %{!?_with_itests:0}%{?_with_itests:1}
-
-%define with_bootstrap 0
-%define without_bootstrap 1
-
-%define maven_version 2.0.8
-%define NONFREE 0
-
-%define base_name maven
-%define name maven2
-
-%define repo_dir m2_home_local/repository
-%define maven_settings_file %{_builddir}/%{name}/settings.xml
-
-Name: %{name}
-Version: %{maven_version}
-Release: 3%{?dist}
-Epoch: 0
-Summary: Java project management and project comprehension tool
-
-Group: Development/Build Tools
-License: ASL 2.0 and MIT and BSD
-URL: http://maven.apache.org/
-
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
-# tar czf maven2-src.tar.gz maven2
-Source0: %{name}-src.tar.gz
-
-# svn export -r {2007-07-05} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
-# tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
-Source2: %{name}-plugins-070705-src.tar.gz
-
-# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
-# has several bugs
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
-# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin
-Source22: maven-javadoc-plugin-2.4-src.tar.gz
-
-# No source location for these. They are ascii files generated from maven
-# repositories, and are not in cvs/svn
-# The files were originally aquired from: http://repo1.maven.org/maven2/
-Source3: m2_pom_repo.tar.gz
-
-# As with above, these files are from the maven repositories, and are not in
-# cvs/svn
-# The files were originally aquired from: http://repo1.maven.org/maven2/
-Source4: m2_jar_repo.tar.gz
-Source5: %{name}-script
-
-Source6: maven2-JPackageRepositoryLayout.java
-Source7: maven2-settings.xml
-
-# svn export -r '{2006-03-08}' http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin maven-site-plugin
-# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin
-Source8: %{name}-maven-site-plugin.tar.gz
-
-Source9: %{name}-run-it-tests.sh
-
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
-# cd maven-model
-# mvn -P all-models package
-# Find model jar in target/maven-model-2.0.8.jar
-Source10: %{name}-model-v3.jar
-Source11: %{name}-MavenJPackageDepmap.java
-Source12: %{name}-addjdom-depmap.xml
-Source13: %{name}-empty-dep.pom
-
-# Empty jar file with just a manifest. No source destination to specify
-Source14: %{name}-empty-dep.jar
-Source15: %{name}-jpp-script
-Source16: %{name}-jpp-readme.html
-Source17: %{name}-versionless-depmap.xml
-Source18: %{name}-bash-completion
-
-Patch0: maven2-addjdomtobootstrappath.patch
-Patch1: %{name}-jpprepolayout.patch
-Patch2: %{name}-fastjar-manifest-fix.patch
-Patch3: %{name}-plugins-doxiaupdatefix.patch
-Patch4: %{name}-plugins-catch-uncaught-exceptions.patch
-Patch5: %{name}-plugins-dependency-plugin-import-fix.patch
-Patch6: %{name}-%{version}-excludeexternaljars.patch
-Patch7: %{name}-site-plugin-addservletdep.patch
-Patch8: %{name}-enable-bootstrap-repository.patch
-Patch9: %{name}-use-unversioned-classworlds.patch
-Patch10: %{name}-plugins-disablecobertura.patch
-Patch11: %{name}-shade-plugin-replacement.patch
-Patch12: %{name}-sourcetarget.patch
-# javadoc 2.4 uses an old doxia method
-Patch15: %{name}-plugins-javadoc-newdoxia.patch
-# This plugin can't cope with a JAR without a JDK version on it
-Patch16: %{name}-plugins-project-info-reports-jdkversion.patch
-Patch17: %{name}-MNG-3139.patch
-Patch18: %{name}-plugins-jpprepolayout.patch
-
-BuildRequires: java-1.6.0-openjdk-devel
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
-
-BuildRequires: ant >= 1.6.5
-BuildRequires: ant-junit
-BuildRequires: antlr >= 2.7.4
-BuildRequires: aqute-bndlib
-BuildRequires: backport-util-concurrent
-BuildRequires: bsh >= 1.3.0
-#BuildRequires: cglib >= 2.1.0
-BuildRequires: checkstyle >= 4.1
-BuildRequires: classworlds >= 1.1
-%if %{NONFREE}
-BuildRequires: clover
-%endif
-BuildRequires: dom4j >= 1.6.1
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: gnu.regexp >= 1.1.4
-BuildRequires: httpunit >= 1.6
-BuildRequires: jakarta-commons-beanutils >= 1.7.0
-BuildRequires: jakarta-commons-cli >= 1.0
-BuildRequires: jakarta-commons-collections >= 3.1
-BuildRequires: jakarta-commons-io >= 1.1
-BuildRequires: jakarta-commons-lang >= 2.1
-BuildRequires: jakarta-commons-logging >= 1.0.4
-BuildRequires: jakarta-commons-validator >= 1.1.4
-BuildRequires: jaxen >= 1.1
-BuildRequires: jdom >= 1.0
-#BuildRequires: jmock >= 1.0.1
-BuildRequires: jline >= 0.8.1
-BuildRequires: jsch >= 0.1.20
-BuildRequires: jtidy >= 1.0
-BuildRequires: junit >= 3.8.2
-BuildRequires: maven2-common-poms >= 1.0-8
-BuildRequires: maven-jxr >= 1.0-2
-BuildRequires: maven-wagon >= 1.0-0.1.b2
-BuildRequires: maven-doxia >= 1.0-0.a9
-BuildRequires: nekohtml >= 0.9.3
-BuildRequires: oro >= 2.0.8
-BuildRequires: plexus-ant-factory >= 1.0-0.a1.2
-BuildRequires: plexus-bsh-factory >= 1.0-0.a7s.2
-BuildRequires: plexus-archiver >= 1.0-0.a6
-BuildRequires: plexus-compiler >= 1.5.1
-BuildRequires: plexus-container-default >= 1.0
-BuildRequires: plexus-i18n >= 1.0
-BuildRequires: plexus-interactivity >= 1.0
-BuildRequires: plexus-utils >= 1.2
-BuildRequires: pmd >= 3.6
-BuildRequires: qdox >= 1.5
-BuildRequires: rhino >= 1.5
-BuildRequires: saxon-scripts
-BuildRequires: saxpath
-BuildRequires: velocity >= 1.4
-BuildRequires: xerces-j2 >= 2.7.1
-BuildRequires: xalan-j2 >= 2.6.0
-BuildRequires: xmlrpc
-BuildRequires: xmlunit
-BuildRequires: xom
-
-# FIXME these should be Requires for commons-logging 1.1
-BuildRequires: avalon-framework
-BuildRequires: avalon-logkit
-
-%if %{with_itests}
-BuildRequires: log4j >= 1.2.13
[...1730 lines suppressed...]
-- Fix javadoc source directory name
-- Don't try to symlink model-all JAR
-
-* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
-- Import 2.0.8 work from Deepak Bhole:
--- Fix maven-remote-resources-plugin
--- Handle artifacts other than just poms and jars
--- Cope with empty version XML tags
--- Prevent unecessary files to end up in lib
--- Fix handling of RELEASE versions
--- Added BR for java-devel
--- Fixed artifact path setting code for upstream group/artifactids
-- Import these fixes from Permaine Cheung:
--- Change maven-archiver to maven-shared-archiver
--- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
--- Add missing Requires: maven-archiver to maven2-plugin-jar
--- Add missing Requires: ant to maven2-plugin-ant
--- Add missing Requires: maven-shared-plugin-tools-beanshell,
- maven-shared-plugin-tools-java to maven2-plugin-docck and
- maven2-plugin-plugin
--- Add missing Requires: to maven2-plugin-install
-- Import these fixes from Yong Yang:
--- add maven2-plugins-jpprepolayout.patch
--- Add missing BR xom
--- Add missing BR maven-shared-io in non-bootstrap mode
--- Add missing Requires xom
--- Add missing Requires: maven-enforcer-rule-api in non-bootstrap mode
--- Add missing Requires: maven-shared-invoker in non-bootstrap mode
--- Add missing Requires: maven-shared-io in non-bootstrap mode
--- Add missing Requires: maven-shared-jar in non-bootstrap mode
--- Add missing Requires: maven-shared-model-converter in non-bootstrap mode
--- Add missing Requires: maven-shared-verifier in non-bootstrap mode
--- Add missing Requires: for all subpackages
-- Import these fixes from Fernando Nasser:
--- Project Report Info plugin can't cope with a JAR without a JDK version on it
--- Parent poms sometimes come as type "xml", adjust JPackageRepositoryLayout
--- Test for jar in JPackageRepositoryLayout as pom may not have the
- packaging set
--- Update javadoc plugin to 2.4 to get rid of 2.3 bugs
--- Modify MJAVADOC-137 oatch to exclude part reverted by MJAVADOC-196
--- Add patch for javadoc plugin (MJAVADOC-137)
--- Remove jetty from site plugin dependencies
--- Install the model-all JAR
--- Build model-all.jar for model-v3 needed by maven-shared-model-converter
--- Add missing BRs in non-bootstrap mode:
--- Add missing BR maven-embedder
--- Add missing BR maven-shared-dependency-analyzer
--- Add missing BR maven-shared-dependency-tree
--- Add missing BR maven-shared-downloader
--- Add missing BR maven-enforcer-rule-api
--- Add missing BR maven-shared-invoker
--- Add missing BR maven-shared-jar
--- Add missing BR maven-shared-model-converter
--- Add missing BR maven-shared-plugin-testing-tools
--- Add missing BR maven-shared-plugin-tools-api
--- Add missing BR maven-shared-plugin-tools-beanshell
--- Add missing BR maven-shared-plugin-tools-java
--- Add missing BR maven-shared-reporting-impl
--- Add missing BR maven-shared-verifier
--- Add missing BR maven2-plugin-ant
--- Add missing BR maven2-plugin-clean
--- Add missing BR plexus-mail-sender
--- Add missing BR plexus-resources
--- Add missing BRs in non-bootstrap mode:
--- Add missing BR maven-doxia-sitetools
--- Add missing BR maven-surefire-provider-junit
--- Add missing BR maven2-plugin-shade in non-bootstrap mode
--- Add missing BR plexus-digest in non-bootstrap mode
--- Add missing BR maven-shared-common-artifact-filters
--- Add missing BR maven-shared-repository-builder
--- Rebuild with plexus-archiver rolled back to a7 to avoid compilation errors
--- Adapt for commons-logging 1.1
--- Specify source and target 1.4
--- Add missing BRs to ant-nodeps, ant-junit, aqute-bndlib and javamail
--- Remove extra maven- from maven-shared poms and jars in bootstrap binaries
--- Require newer version of plexus-archiver to match maven-archiver
--- Move maven-doxia to outside the bootstrap condition
--- Add missing BR saxpath
-- Import these fixes from David Walluck:
--- add patch for MNG-3139
-
-* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.1
-- Import 2.0.8 work from Deepak Bhole
-- Explicitly disable gcj support
-- Set bootstrap
-- Fix up LICENSE.txt files
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.4-12.19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Mar 02 2009 Deepak Bhole <dbhole at redhat.com> 2.0.4-11.19
-- Build with OpenJDK again, now that koji issues are resolved
-
-* Fri Feb 27 2009 Deepak Bhole <dbhole at redhat.com> 2.0.4-11.18
-- Revert back to building with gcj
-
-* Thu Feb 26 2009 Deepak Bhole <dbhole at redhat.com> 2.0.4-11.17
-- Build with OpenJDK
-
-* Thu Feb 26 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-11.16
-- Add patch so that multiple properties can be specified with commons-cli 1.1
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.4-11.15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Sep 05 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10.15
-- Fall back to gcj build
-
-* Wed Aug 13 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10.14
-- Build with IcedTea
-
-* Wed Aug 13 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10.13
-- Build for ppc64
-
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.4-10.12
-- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.4-10jpp.11
-- fix license tag
-
-* Thu Feb 28 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10jpp.10
-- Update path in the MNG-3118 patch
-
-* Tue Feb 12 2008 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.9
-- Resolve bz# 432508 - added patch for MNG-3118
-
-* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.8
-- Rebuild without bootstrap
-
-* Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
-- Exclude ppc64 build
-- Add patch to build with ant 1.7
-- Build with bootstrap (First build on F8/ppc)
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.6
-- Build without bootstrap
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 2.0.4-10jpp.5
-- Force gcj_support to 0
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 2.0.4-10jpp.4
-- Build without gcj for now
-
-* Fri Mar 16 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.3
-- Added gcj support
-- Fix up per Fedora spec
-- Added source locations/generation methods for binary %%SOURCEes
-- Added workaround for gcj bug that causes plugin reload to fail
-
-* Wed Dec 13 2006 Deepak Bhole <dbhole at redhat.com> 2.0.4-10jpp.2
-- Build without bootstrap
-
-* Mon Dec 04 2006 Deepak Bhole <dbhole at redhat.com> 2.0.4-10jpp.1
-- Synch with jpp
-- From dbhole at redhat:
- - Added a new mapping system
- - Added a jpp howto
- - Added support for plugin mixing
- - Wired in /usr/share/maven2/repository as one of the default repos
- - Moved poms over to maven2-common-poms
- - Reverted to original plugin groupid's
- - Installer maven-{artifact-ant,embedder,meeper,script}
-- From r.apel at r-apel.de:
- - Fix maven-site-plugin pom in maven2-jpp-mapping.patch
- - Add maven-shared-file-management to plugin-assembly Requires
- - Add post/postun Requires for javadoc
-
-* Wed Jul 12 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-4jpp_1rh
-- Merge with upstream
-
-* Mon Jul 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-4jpp
-- Additional fixes (mostly to the dependency transformer xsl) for itests.
-- Added a --with regereratedpoms switch.
-
-* Wed Jul 05 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-3jpp
-- Added partial support for it tests, and appropriate fixes.
-
-* Thu Jun 29 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-2jpp_2rh
-- Rebuild
-
-* Tue Jun 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-2jpp_1rh
-- Full build
-
-* Mon Jun 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-2jpp_0rh
-- Merge with upstream
-- Bootstrap building
-
-* Thu Jun 22 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-2jpp
-- Fixes for Tuscany building
-
-* Fri Jun 02 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-1jpp
-- Upgrade to 2.0.4
+* Thu Nov 26 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.2.1-1
+- Initial bootstrap build
-* Wed May 31 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.2-1jpp_1rh
-- First Red Hat build
-* Wed Feb 22 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.2-1jpp
-- Initial build.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 25 Aug 2009 18:53:22 -0000 1.8
+++ sources 6 May 2010 09:22:27 -0000 1.9
@@ -1,8 +1,2 @@
-cf287f9dceb51c21af5da92ff83a6b52 maven-javadoc-plugin-2.4-src.tar.gz
-de45a278b88554bb545f092e2f82c56d maven2-maven-site-plugin.tar.gz
-13c1088b7b9535b9e4fb31317f79491a maven2-model-v3.jar
-a9b9ce42ffbba60eb1833f0a773f7aa7 maven2-plugins-070705-src.tar.gz
-ffd6fcb439b5b7e143a31a4fd5af9902 maven2-src.tar.gz
-b94d6c2bd76523470a39ff7083a253bd m2_jar_repo.tar.gz
-e1dcb37943da8c0f1767891f00f6dc44 m2_pom_repo.tar.gz
-dc36ce1fbefedbdd27fa93c8584ba91a maven2-empty-dep.jar
+982a71d34d3fe3f1eb73dd01fa76b85c maven2-2.2.1-bootstrapdeps.tar.gz
+1197900ced670d0a62211f67aa8a3b68 maven2-2.2.1.tar.gz
--- maven2-2.0.8-excludeexternaljars.patch DELETED ---
--- maven2-MNG-3139.patch DELETED ---
--- maven2-addjdom-depmap.xml DELETED ---
--- maven2-addjdomtobootstrappath.patch DELETED ---
--- maven2-bash-completion DELETED ---
--- maven2-empty-dep.jar DELETED ---
--- maven2-empty-dep.pom DELETED ---
--- maven2-enable-bootstrap-repository.patch DELETED ---
--- maven2-fastjar-manifest-fix.patch DELETED ---
--- maven2-jpp-readme.html DELETED ---
--- maven2-jpprepolayout.patch DELETED ---
--- maven2-plugins-catch-uncaught-exceptions.patch DELETED ---
--- maven2-plugins-dependency-plugin-import-fix.patch DELETED ---
--- maven2-plugins-disablecobertura.patch DELETED ---
--- maven2-plugins-doxiaupdatefix.patch DELETED ---
--- maven2-plugins-javadoc-newdoxia.patch DELETED ---
--- maven2-plugins-jpprepolayout.patch DELETED ---
--- maven2-plugins-project-info-reports-jdkversion.patch DELETED ---
--- maven2-run-it-tests.sh DELETED ---
--- maven2-settings.xml DELETED ---
--- maven2-shade-plugin-replacement.patch DELETED ---
--- maven2-site-plugin-addservletdep.patch DELETED ---
--- maven2-sourcetarget.patch DELETED ---
--- maven2-use-unversioned-classworlds.patch DELETED ---
--- maven2-versionless-depmap.xml DELETED ---
More information about the scm-commits
mailing list