[Jpackage-commits] rpms/free/maven2 maven2-2.0.8-excludeexternaljars.patch, NONE, 1.1 maven2-JPackageRepositoryLayout.java, 1.2, 1.3 maven2-MavenReport.patch, 1.1, NONE maven2-addjdomtobootstrappath.patch, 1.2, 1.3 maven2-ant-plugin-pom.patch, 1.1, NONE maven2-antrun-plugin-pom.patch, 1.1, NONE maven2-assembly-plugin-build.xml, 1.1, NONE maven2-assembly-plugin-components.xml, 1.1, NONE maven2-assembly-plugin-pom.patch, 1.1, NONE maven2-assembly-plugin.xml, 1.1, NONE maven2-bootstrap-no-modello-plugin.patch, 1.1, NONE maven2-clean-plugin-build.xml, 1.2, NONE maven2-clean-plugin.xml, 1.2, NONE maven2-compiler-plugin-build.xml, 1.2, NONE maven2-compiler-plugin.xml, 1.2, NONE maven2-core-no-shade-plugin-pom.patch, 1.1, NONE maven2-dependency-plugin-AbstractDependencyMojo.patch, 1.1, NONE maven2-dependency-plugin-pom.patch, 1.1, NONE maven2-docck-plugin-pom.patch, 1.1, NONE maven2-eclipse-plugin-InstallPluginsMojo.patch, 1.1, NONE maven2-empty-dep.pom, 1.2, 1.3 maven2-enable-bootstrap-repository.patch, NONE, 1.1 maven2-enforcer-plugi n-pom.patch, 1.1, NONE maven2-fastjar-manifest-fix.patch, NONE, 1.1 maven2-install-plugin-build.xml, 1.2, NONE maven2-install-plugin.xml, 1.2, NONE maven2-jar-plugin-build.xml, 1.2, NONE maven2-jar-plugin.xml, 1.2, NONE maven2-javadoc-plugin-pom.patch, 1.1, NONE maven2-jpp-depmap.xml, 1.3, NONE maven2-jpprepolayout.patch, 1.2, 1.3 maven2-model-no-modello-plugin-pom.patch, 1.1, NONE maven2-plugin-descriptor-no-modello-plugin-pom.patch, 1.1, NONE maven2-plugin-parameter-documenter-no-modello-plugin-pom.patch, 1.1, NONE maven2-plugin-plugin-build.xml, 1.2, NONE maven2-plugin-plugin.xml, 1.3, NONE maven2-plugin-registry-no-modello-plugin-pom.patch, 1.1, NONE maven2-plugin-site-AbstractSiteRenderingMojo.patch, 1.1, NONE maven2-plugins-break-cycle.patch, 1.1, NONE maven2-plugins-catch-uncaught-exceptions.patch, NONE, 1.1 maven2-plugins-dependency-plugin-import-fix.patch, NONE, 1.1 maven2-plugins-disablecobertura.patch, NONE, 1.1 maven2-plugins-doxiaupdatefix.patch, NONE, 1.1 maven2-plugins-omit-add.patch, 1.1, NONE maven2-p md-plugin-pom.patch, 1.1, NONE maven2-profile-no-modello-plugin-pom.patch, 1.1, NONE maven2-remote-resources-plugin-components.patch, 1.1, NONE maven2-remote-resources-plugin-pom.patch, 1.1, NONE maven2-repository-metadata-no-modello-plugin-pom.patch, 1.1, NONE maven2-resources-plugin-build.xml, 1.2, NONE maven2-resources-plugin.xml, 1.2, NONE maven2-settings-no-modello-plugin-pom.patch, 1.1, NONE maven2-shade-plugin-replacement.patch, NONE, 1.1 maven2-shared-file-management-build.xml, 1.2, NONE maven2-shared-plugin-testing-harness-build.xml, 1.2, NONE maven2-site-plugin-addservletdep.patch, NONE, 1.1 maven2-site-plugin-pom.patch, 1.1, NONE maven2-use-unversioned-classworlds.patch, NONE, 1.1 maven2-verifier-plugin-pom.patch, 1.1, NONE maven2-versionless-depmap.xml, NONE, 1.1 maven2-war-plugin-AbstractWarPackagingTask.patch, 1.1, NONE maven2.spec, 1.6, 1.7

jpackage jpackage at ryu.zarb.org
Wed Feb 18 09:55:07 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/maven2
In directory ryu.zarb.org:/tmp/FvvyjPgqCX/rpms/free/maven2

Modified Files:
	maven2-JPackageRepositoryLayout.java 
	maven2-addjdomtobootstrappath.patch maven2-empty-dep.pom 
	maven2-jpprepolayout.patch maven2.spec 
Added Files:
	maven2-2.0.8-excludeexternaljars.patch 
	maven2-enable-bootstrap-repository.patch 
	maven2-fastjar-manifest-fix.patch 
	maven2-plugins-catch-uncaught-exceptions.patch 
	maven2-plugins-dependency-plugin-import-fix.patch 
	maven2-plugins-disablecobertura.patch 
	maven2-plugins-doxiaupdatefix.patch 
	maven2-shade-plugin-replacement.patch 
	maven2-site-plugin-addservletdep.patch 
	maven2-use-unversioned-classworlds.patch 
	maven2-versionless-depmap.xml 
Removed Files:
	maven2-MavenReport.patch maven2-ant-plugin-pom.patch 
	maven2-antrun-plugin-pom.patch 
	maven2-assembly-plugin-build.xml 
	maven2-assembly-plugin-components.xml 
	maven2-assembly-plugin-pom.patch maven2-assembly-plugin.xml 
	maven2-bootstrap-no-modello-plugin.patch 
	maven2-clean-plugin-build.xml maven2-clean-plugin.xml 
	maven2-compiler-plugin-build.xml maven2-compiler-plugin.xml 
	maven2-core-no-shade-plugin-pom.patch 
	maven2-dependency-plugin-AbstractDependencyMojo.patch 
	maven2-dependency-plugin-pom.patch 
	maven2-docck-plugin-pom.patch 
	maven2-eclipse-plugin-InstallPluginsMojo.patch 
	maven2-enforcer-plugin-pom.patch 
	maven2-install-plugin-build.xml maven2-install-plugin.xml 
	maven2-jar-plugin-build.xml maven2-jar-plugin.xml 
	maven2-javadoc-plugin-pom.patch maven2-jpp-depmap.xml 
	maven2-model-no-modello-plugin-pom.patch 
	maven2-plugin-descriptor-no-modello-plugin-pom.patch 
	maven2-plugin-parameter-documenter-no-modello-plugin-pom.patch 
	maven2-plugin-plugin-build.xml maven2-plugin-plugin.xml 
	maven2-plugin-registry-no-modello-plugin-pom.patch 
	maven2-plugin-site-AbstractSiteRenderingMojo.patch 
	maven2-plugins-break-cycle.patch maven2-plugins-omit-add.patch 
	maven2-pmd-plugin-pom.patch 
	maven2-profile-no-modello-plugin-pom.patch 
	maven2-remote-resources-plugin-components.patch 
	maven2-remote-resources-plugin-pom.patch 
	maven2-repository-metadata-no-modello-plugin-pom.patch 
	maven2-resources-plugin-build.xml maven2-resources-plugin.xml 
	maven2-settings-no-modello-plugin-pom.patch 
	maven2-shared-file-management-build.xml 
	maven2-shared-plugin-testing-harness-build.xml 
	maven2-site-plugin-pom.patch maven2-verifier-plugin-pom.patch 
	maven2-war-plugin-AbstractWarPackagingTask.patch 
Log Message:
2.0.8-2.jpp6

--- maven2-verifier-plugin-pom.patch DELETED ---

--- maven2-enforcer-plugin-pom.patch DELETED ---

--- maven2-javadoc-plugin-pom.patch DELETED ---

--- maven2-remote-resources-plugin-pom.patch DELETED ---

--- maven2-docck-plugin-pom.patch DELETED ---

--- maven2-install-plugin-build.xml DELETED ---

--- maven2-clean-plugin.xml DELETED ---

--- maven2-dependency-plugin-pom.patch DELETED ---

--- maven2-assembly-plugin-components.xml DELETED ---

--- maven2-remote-resources-plugin-components.patch DELETED ---

--- maven2-assembly-plugin-build.xml DELETED ---

--- NEW FILE: maven2-plugins-dependency-plugin-import-fix.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-17 17:23:05.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-17 17:24:49.000000000 -0400
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.dependen
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 

--- maven2-jar-plugin-build.xml DELETED ---

--- maven2-MavenReport.patch DELETED ---

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/maven2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** maven2.spec	4 Aug 2008 14:37:52 -0000	1.6
--- maven2.spec	18 Feb 2009 08:55:05 -0000	1.7
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
***************
*** 29,191 ****
  #
[...4670 lines suppressed...]
! 
! * 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
  
***************
*** 2066,2071 ****
  * Wed Feb 22 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.0.2-1jpp
  - Initial build.
- 
- 
-    /usr/share/maven2/plugins/stage-plugin.jar
- 
--- 2801,2802 ----

Index: maven2-jpprepolayout.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/maven2-jpprepolayout.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven2-jpprepolayout.patch	24 Jun 2008 16:47:49 -0000	1.2
--- maven2-jpprepolayout.patch	18 Feb 2009 08:55:04 -0000	1.3
***************
*** 1,154 ****
! --- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav	2005-11-16 22:39:28.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java	2006-10-11 18:16:56.000000000 -0400
! @@ -18,6 +18,8 @@
!  
!  import java.io.File;
!  import java.util.Collections;
! +import java.util.Hashtable;
! +import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
!  
!  /**
!   * Repository path management.
! @@ -31,6 +33,12 @@
!  
!      public static final String LAYOUT_DEFAULT = "default";
!  
! +	public static final String LAYOUT_JPP = "jpp";
! +
! +	private static final char GROUP_SEPARATOR = '.';
! +
! +	private static final char PATH_SEPARATOR = '/';
! +
!      private String basedir;
!  
!      private String layout;
! @@ -64,7 +72,26 @@
!      public String getArtifactPath( Dependency dependency )
!      {
!          String repositoryPath;
! -        if ( LAYOUT_LEGACY.equals( layout ) )
! +
! +        if ( LAYOUT_JPP.equals( layout ) )
! +        {
! +
! +			String groupId, artifactId;
! +
! +			MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +			Hashtable newInfo = map.getMappedInfo(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
! +
! +			groupId = (String) newInfo.get("group");
! +			artifactId = (String) newInfo.get("artifact");
! +			
! +			if (dependency.getType().equals("pom")) {
! +				return getMetadataPath(groupId, artifactId, dependency.getVersion(), dependency.getType(), dependency.getArtifact());
! +			}
! +
! +            // Same as legacy layout
! +            repositoryPath = groupId + "/" + artifactId + ".jar";
! +        }
! +        else if ( LAYOUT_LEGACY.equals( layout ) )
!          {
!              repositoryPath = dependency.getArtifactDirectory() + "/" + dependency.getType() + "s/" +
!                  dependency.getArtifact();
! @@ -94,7 +121,30 @@
!          Dependency dependency = new Dependency( groupId, artifactId, version, type, Collections.EMPTY_LIST );
!  
!          String repositoryPath;
! -        if ( LAYOUT_LEGACY.equals( layout ) )
! +		if ( LAYOUT_JPP.equals( layout ) ) 
! +		{
! +			if (filename.substring(filename.length()-4).equals(".pom") || type.equals("pom")) {
! +
! +				MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +				Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
! +
! +				groupId = (String) newInfo.get("group");
! +				artifactId = (String) newInfo.get("artifact");
! +
! +				String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
! +				repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + fName;
! +				java.io.File f;
! +
! +				// .substring(6) removes preceeding file://
! +				f = new File(basedir.substring(6) + "/" + repositoryPath);
! +				if (!f.exists()) {
! +					repositoryPath = System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms") + "/" + fName;
! +				}
! +			} else {
! +				 repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + filename;
! +			}
! +		}
! +        else if ( LAYOUT_LEGACY.equals( layout ) )
!          {
!              repositoryPath = dependency.getArtifactDirectory() + "/poms/" + filename;
!          }
! @@ -102,16 +152,37 @@
!          {
!              repositoryPath = dependency.getGroupId().replace( '.', '/' );
!              repositoryPath = repositoryPath + "/" + dependency.getArtifactId();
! -            if ( version != null )
! +
! +			String newVersion = version;
! +			String newFilename = filename;
! +
! +			if (	( 
! +						( System.getProperty("maven2.offline.mode") != null && 
! +						  System.getProperty("maven2.ignore.versions") != null ) ||
! +					  	(System.getProperty("maven2.jpp.mode") != null) 
! +					) && 
! +				version != null) {
! +				MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +				Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
! +
! +				newVersion = (String) newInfo.get("version");
! +
! +				//System.err.println("Replacing " + dependency.getVersion() + " with " + newVersion + " in offline+ignore versions mode");
! +
! +				newFilename = filename.replaceFirst(dependency.getVersion(), newVersion);
! +			}
! +
! +            if ( newVersion != null )
!              {
! -                repositoryPath = repositoryPath + "/" + dependency.getVersion();
! +                repositoryPath = repositoryPath + "/" + newVersion;
!              }
! -            repositoryPath = repositoryPath + "/" + filename;
! +            repositoryPath = repositoryPath + "/" + newFilename;
!          }
!          else
!          {
!              throw new IllegalStateException( "Unknown layout: " + layout );
!          }
! +
!          return repositoryPath;
!      }
!  
! --- ./maven2/bootstrap/bootstrap-mini/build.sav	2006-10-13 22:45:08.000000000 -0400
! +++ ./maven2/bootstrap/bootstrap-mini/build	2006-10-13 23:03:50.000000000 -0400
! @@ -9,6 +9,12 @@
!  mkdir -p ${classesDir}
!  
!  "$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
! +
! +# FIXME: Is there a better way to make the compiler see the jdom classes? 
! +# setting CLASSPATH, or giving -cp/-classpath didn't work :(
! +(cd ${classesDir} 
! +	jar xf $JDOMCLASS 
! +)
!  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
!  
!  ( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
! --- ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav	2005-10-13 22:57:13.000000000 -0400
! +++ ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java	2006-10-16 17:56:34.000000000 -0400
! @@ -177,7 +177,7 @@
!  
!          // third pass...we're always checking for latest install/deploy, so retrieve the version for LATEST metadata and
!          // also set that resolved version as the <useVersion/> in settings.xml.
! -        if ( StringUtils.isEmpty( version ) )
! +        if ( StringUtils.isEmpty( version ) ) 
!          {
!              // 1. resolve the version to be used
!              version = resolveMetaVersion( groupId, artifactId, project, localRepository, Artifact.LATEST_VERSION );
! @@ -220,10 +220,16 @@
           }
   
--- 1,5 ----
! --- ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav	2007-12-12 15:58:38.000000000 -0500
! +++ ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java	2007-12-12 15:59:53.000000000 -0500
! @@ -224,9 +224,16 @@ public class DefaultPluginVersionManager
           }
   
***************
*** 156,175 ****
  -        if ( StringUtils.isEmpty( version ) )
  +        if ( StringUtils.isEmpty( version ) && ((System.getProperty("maven2.offline.mode") == null) && 
! +												(System.getProperty("maven2.jpp.mode") == null)))
           {
               throw new PluginVersionNotFoundException( groupId, artifactId );
! -        }
! +		} else if (((System.getProperty("maven2.offline.mode") != null) || 
! +					(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 = "2.0.7";
! +		}
   
           // if the plugin registry is inactive, then the rest of this goop is useless...
!          if ( settings.isUsePluginRegistry() )
! --- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav	2006-10-06 13:19:49.000000000 -0400
! +++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java	2006-10-11 18:21:02.000000000 -0400
! @@ -20,6 +20,9 @@
   import org.apache.maven.artifact.handler.ArtifactHandler;
   import org.apache.maven.artifact.metadata.ArtifactMetadata;
--- 7,25 ----
  -        if ( StringUtils.isEmpty( version ) )
  +        if ( StringUtils.isEmpty( version ) && ((System.getProperty("maven2.offline.mode") == null) && 
! +                                               (System.getProperty("maven2.jpp.mode") == null)))
! +
           {
               throw new PluginVersionNotFoundException( groupId, artifactId );
! +        } else if (((System.getProperty("maven2.offline.mode") != null) || 
! +                    (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 = "2.0.8";
!          }
   
           // if the plugin registry is inactive, then the rest of this goop is useless...
! --- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav	2007-12-12 15:59:59.000000000 -0500
! +++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java	2007-12-12 16:01:51.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;
***************
*** 181,202 ****
   /**
    * @author jdcasey
! @@ -39,10 +42,25 @@
   
           StringBuffer path = new StringBuffer();
   
! +		String baseVersion = artifact.getBaseVersion();
! +		String version = artifact.getVersion();
! +
! +		if (( System.getProperty("maven2.offline.mode") != null  && 
! +			  System.getProperty("maven2.ignore.versions") != null ) || 
! +			( System.getProperty("maven2.jpp.mode") != null) ) {
! +			MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +			Hashtable newInfo = map.getMappedInfo(artifact.getGroupId(), artifact.getArtifactId(), version);
  +
! +			//System.err.println("Replacing[1] " + baseVersion + " and " + version + " with " + (String) newInfo.get("version") + " in offline+ignore versions mode");
  +
! +			baseVersion = (String) newInfo.get("version");
! +			version = baseVersion;
! +		}
  +
           path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
--- 31,51 ----
   /**
    * @author jdcasey
! @@ -42,10 +45,24 @@ public class DefaultRepositoryLayout
   
           StringBuffer path = new StringBuffer();
   
! +        String baseVersion = artifact.getBaseVersion();
! +        String version = artifact.getVersion();
  +
! +        if (( System.getProperty("maven2.offline.mode") != null  && 
! +              System.getProperty("maven2.ignore.versions") != null ) || 
! +            ( System.getProperty("maven2.jpp.mode") != null) ) { 
! +            MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +            Hashtable newInfo = map.getMappedInfo(artifact.getGroupId(), artifact.getArtifactId(), version);
  +
! +            //System.err.println("Replacing[1] " + baseVersion + " and " + version + " with " + (String) newInfo.get("version") + " in offline+ignore versions mode");
! +            baseVersion = (String) newInfo.get("version");
! +            version = baseVersion;
! +        }
  +
           path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
***************
*** 209,236 ****
           if ( artifact.hasClassifier() )
           {
! @@ -73,7 +91,19 @@
   
               if ( metadata.storedInArtifactVersionDirectory() )
               {
  -                path.append( metadata.getBaseVersion() ).append( PATH_SEPARATOR );
! +				String baseVersion = metadata.getBaseVersion();
! +
! +			if (( System.getProperty("maven2.offline.mode") != null  && 
! +				  System.getProperty("maven2.ignore.versions") != null ) || 
! +				( System.getProperty("maven2.jpp.mode") != null) ) {
! +					MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +					Hashtable newInfo = map.getMappedInfo(metadata.getGroupId(), metadata.getArtifactId(), baseVersion);
  +
! +					//System.err.println("Replacing[2] " + baseVersion + " with " + (String) newInfo.get("version") + " in offline+ignore versions mode");
  +
! +					baseVersion = (String) newInfo.get("version");
! +				}
  +                path.append( baseVersion ).append( PATH_SEPARATOR );
               }
           }
   
! --- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav	2006-10-12 14:19:36.000000000 -0400
! +++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java	2006-10-12 15:38:17.000000000 -0400
! @@ -232,7 +232,8 @@
                               // set the recommended version
                               // TODO: maybe its better to just pass the range through to retrieval and use a transformation?
--- 58,83 ----
           if ( artifact.hasClassifier() )
           {
! @@ -76,7 +93,17 @@ public class DefaultRepositoryLayout
   
               if ( metadata.storedInArtifactVersionDirectory() )
               {
  -                path.append( metadata.getBaseVersion() ).append( PATH_SEPARATOR );
! +               String baseVersion = metadata.getBaseVersion();
  +
! +           if (( System.getProperty("maven2.offline.mode") != null  && 
! +                 System.getProperty("maven2.ignore.versions") != null ) || 
! +               ( 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 );
               }
           }
   
! --- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav	2007-12-12 16:01:58.000000000 -0500
! +++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java	2007-12-12 16:03:29.000000000 -0500
! @@ -267,7 +267,8 @@ public class DefaultArtifactCollector
                               // set the recommended version
                               // TODO: maybe its better to just pass the range through to retrieval and use a transformation?
***************
*** 242,246 ****
                                   List versions = artifact.getAvailableVersions();
                                   if ( versions == null )
! @@ -267,7 +268,13 @@
                                   version = artifact.getSelectedVersion();
                               }
--- 89,93 ----
                                   List versions = artifact.getAvailableVersions();
                                   if ( versions == null )
! @@ -302,7 +303,14 @@ public class DefaultArtifactCollector
                                   version = artifact.getSelectedVersion();
                               }
***************
*** 248,263 ****
  -                            artifact.selectVersion( version.toString() );
  +                            if ( !artifact.isSelectedVersionKnown() && 
! +                                 System.getProperty("maven2.ignore.versions") != null )
  +                            {
! +                                artifact.selectVersion( "2.0.7" );
  +                            } else {
! +	                            artifact.selectVersion( version.toString() );
! +							}
                               fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
                           }
   
! --- ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav	2005-11-29 00:14:20.000000000 -0500
! +++ ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml	2006-10-02 12:02:34.000000000 -0400
! @@ -12,6 +12,12 @@
         <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
       </component>
--- 95,111 ----
  -                            artifact.selectVersion( version.toString() );
  +                            if ( !artifact.isSelectedVersionKnown() && 
! +                                System.getProperty("maven2.ignore.versions") != null )
  +                            {
! +                                artifact.selectVersion( "2.0.8" );
  +                            } else {
! +                               artifact.selectVersion( version.toString() );
! +                            }
! +
                               fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
                           }
   
! --- ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav	2007-12-12 16:03:35.000000000 -0500
! +++ ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml	2007-12-12 16:04:00.000000000 -0500
! @@ -31,6 +31,12 @@ under the License.
         <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
       </component>
***************
*** 272,307 ****
        |
        | ArtifactHandlerManager
! --- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav	2006-02-21 00:18:50.000000000 -0500
! +++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java	2006-10-13 14:05:01.000000000 -0400
! @@ -275,9 +275,25 @@
           else if ( repository.isBlacklisted() )
           {
               getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
  -        }
! +        } else if ( ((System.getProperty("maven2.offline.mode") != null) || 
! +						(System.getProperty("maven2.jpp.mode") != null)) && 
! +					!repository.getUrl().startsWith("file:") ) {
! +			getLogger().warn( "Skipping non filebased repository " + repository.getUrl() + " in full offline mode");
! +		}
!          else
!          {
! +
! +			// Else policy is enabled, this is not a blacklisted repo, and we 
! +			// may or may not be in jpp/offline mode. If we are not in 
! +			// jpp/offline mode, __jpp_repo__ needs to be disabled.
  +
! +			if (System.getProperty("maven2.usejppjars") == null &&
! +                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( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy() );
!              getLogger().debug( "  Artifact resolved" );
! --- ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav	2005-12-06 19:42:46.000000000 -0500
! +++ ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java	2006-10-16 18:06:13.000000000 -0400
! @@ -40,7 +40,7 @@
   public class DefaultModelValidator
       implements ModelValidator
--- 120,183 ----
        |
        | ArtifactHandlerManager
! --- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav	2007-12-12 16:04:07.000000000 -0500
! +++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2007-12-12 16:04:39.000000000 -0500
! @@ -88,7 +88,9 @@ public class DefaultRepositoryMetadataMa
!  
!                      boolean metadataIsEmpty = true;
!  
! -                    if ( checkForUpdates )
! +                    if ( checkForUpdates && 
! +                       ((System.getProperty("maven2.offline.mode") == null) && 
! +                           (System.getProperty("maven2.jpp.mode") == null)))
!                      {
!                          getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
!  
! --- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav	2007-12-12 16:04:56.000000000 -0500
! +++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java	2007-12-12 16:05:31.000000000 -0500
! @@ -184,7 +184,9 @@ public class DefaultArtifactResolver
!                  try
!                  {
!                      // TODO: force should be passed to the wagon manager
! -                    if ( artifact.getRepository() != null )
! +                    if ( artifact.getRepository() != null && 
! +                       ((System.getProperty("maven2.offline.mode") == null) && 
! +                           (System.getProperty("maven2.jpp.mode") == null)))
!                      {
!                          // the transformations discovered the artifact - so use it exclusively
!                          wagonManager.getArtifact( artifact, artifact.getRepository() );
! --- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav	2007-12-12 16:05:36.000000000 -0500
! +++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java	2007-12-12 16:06:56.000000000 -0500
! @@ -340,9 +340,25 @@ public class DefaultWagonManager
           else if ( repository.isBlacklisted() )
           {
               getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
  -        }
! -        else
! -        {
! +        } 
! +        else if ( ((System.getProperty("maven2.offline.mode") != null) || 
! +                       (System.getProperty("maven2.jpp.mode") != null)) && 
! +                        !repository.getUrl().startsWith("file:") ) {
! +           getLogger().warn( "Skipping non filebased repository " + repository.getUrl() + " in full offline mode");
! +       }
! +       else
! +       {
! +            // Else policy is enabled, this is not a blacklisted repo, and we 
! +            // may or may not be in jpp/offline mode. If we are not in 
! +            // jpp/offline mode, __jpp_repo__ needs to be disabled.
  +
! +            if (System.getProperty("maven2.usejppjars") == null &&
! +                 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( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(),
!                             false );
! --- ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav	2007-12-12 16:07:02.000000000 -0500
! +++ ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java	2007-12-12 16:08:54.000000000 -0500
! @@ -43,7 +43,7 @@ import java.util.List;
   public class DefaultModelValidator
       implements ModelValidator
***************
*** 312,336 ****
       ///////////////////////////////////////////////////////////////////////////
       // ModelValidator Implementation
! @@ -85,7 +85,18 @@
   
               validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), dependencySourceHint( d ) );
   
  -            validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
! +			// Check disabled in "ignore versions" mode. On many occassions, JPackage 
! +			// builds modules that are not built by default in a project. A lot of 
! +			// these seem to have missing versions for dependencies, so we omit 
! +			// validation check for version in the "ignore versions" mode.
! +
! +			if (System.getProperty("maven2.ignore.versions") == null) {
! +	            validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
! +			} else {
! +				if ( d.getVersion() == null ) {
! +					d.setVersion("2.0.7");
! +				}
! +			}
   
               if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
               {
! @@ -209,7 +220,7 @@
               boolean match = id.matches( ID_REGEX );
               if ( !match )
--- 188,212 ----
       ///////////////////////////////////////////////////////////////////////////
       // ModelValidator Implementation
! @@ -88,7 +88,18 @@ public class DefaultModelValidator
   
               validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), dependencySourceHint( d ) );
   
  -            validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
! +            // Check disabled in "ignore versions" mode. On many occassions, JPackage 
! +            // builds modules that are not built by default in a project. A lot of 
! +            // these seem to have missing versions for dependencies, so we omit 
! +            // validation check for version in the "ignore versions" mode.
! + 
! +            if (System.getProperty("maven2.ignore.versions") == null) {
! +                validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
! +            } else {
! +                if ( d.getVersion() == null ) {
! +                    d.setVersion("2.0.8");
! +                }
! +            }
   
               if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
               {
! @@ -212,7 +223,7 @@ public class DefaultModelValidator
               boolean match = id.matches( ID_REGEX );
               if ( !match )
***************
*** 341,347 ****
               return match;
           }
! --- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2006-10-12 10:20:20.000000000 -0400
! +++ ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2006-10-13 11:47:52.000000000 -0400
! @@ -5,6 +5,15 @@
   
     <repositories>
--- 217,223 ----
               return match;
           }
! --- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2007-12-12 16:09:05.000000000 -0500
! +++ ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2007-12-12 16:09:55.000000000 -0500
! @@ -24,6 +24,15 @@ under the License.
   
     <repositories>
***************
*** 359,366 ****
         <name>Maven Repository Switchboard</name>
         <layout>default</layout>
! @@ -20,6 +29,18 @@
   
     <pluginRepositories>
!      <pluginRepository>
  +      <id>__jpp_repo__</id>
  +      <name>JPackage Maven Plugin Repository</name>
--- 235,243 ----
         <name>Maven Repository Switchboard</name>
         <layout>default</layout>
! @@ -38,6 +47,18 @@ under the License.
!    </repositories>
   
     <pluginRepositories>
! +     <pluginRepository>
  +      <id>__jpp_repo__</id>
  +      <name>JPackage Maven Plugin Repository</name>
***************
*** 374,401 ****
  +      </releases>
  +    </pluginRepository>
! +    <pluginRepository>
         <id>central</id>
         <name>Maven Plugin Repository</name>
!        <!--
! --- ./maven2/bootstrap.sh.sav	2006-10-13 22:06:45.000000000 -0400
! +++ ./maven2/bootstrap.sh	2006-10-13 22:19:28.000000000 -0400
! @@ -1,4 +1,4 @@
! -#!/bin/sh
! +#!/bin/sh -x
   
!  ARGS=$@
!  ORIG_ARGS=$ARGS
! @@ -8,7 +8,7 @@
!    exit 1
!  fi
   
! -JAVACMD="$JAVA_HOME/bin/java"
! +JAVACMD="$JAVA_HOME/bin/java -classpath $CLASSPATH"
   
!  (
!    cd bootstrap/bootstrap-mini
! --- maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav2	2007-06-15 08:19:15.000000000 +0200
! +++ maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java	2007-12-04 00:06:46.000000000 +0100
! @@ -49,7 +49,8 @@
   
       private String proxyPassword;
--- 251,376 ----
  +      </releases>
  +    </pluginRepository>
!      <pluginRepository>
         <id>central</id>
         <name>Maven Plugin Repository</name>
! --- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav	2007-12-12 16:10:04.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java	2007-12-12 16:15:03.000000000 -0500
! @@ -18,6 +18,8 @@ package org.apache.maven.bootstrap.model
   
!  import java.io.File;
!  import java.util.Collections;
! +import java.util.Hashtable;
! +import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
   
!  /**
!   * Repository path management.
! @@ -35,6 +37,12 @@ public class Repository
   
!      private String layout = LAYOUT_DEFAULT;
!  
! +    public static final String LAYOUT_JPP = "jpp";
! +
! +    private static final char GROUP_SEPARATOR = '.';
! +
! +    private static final char PATH_SEPARATOR = '/';
! +
!      private String id;
!  
!      private boolean releases = true;
! @@ -64,7 +72,25 @@ public class Repository
!      public String getArtifactPath( Dependency dependency )
!      {
!          String repositoryPath;
! -        if ( LAYOUT_LEGACY.equals( layout ) )
! +        if ( LAYOUT_JPP.equals( layout ) )
! +        {
! +
! +           String groupId, artifactId;
! +
! +           MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +           Hashtable newInfo = map.getMappedInfo(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
! +
! +           groupId = (String) newInfo.get("group");
! +           artifactId = (String) newInfo.get("artifact");
! +           
! +           if (dependency.getType().equals("pom")) {
! +               return getMetadataPath(groupId, artifactId, dependency.getVersion(), dependency.getType(), dependency.getArtifact());
! +           }
! +
! +            // Same as legacy layout
! +            repositoryPath = groupId + "/" + artifactId + ".jar";
! +        }
! +        else if ( LAYOUT_LEGACY.equals( layout ) )
!          {
!              repositoryPath = dependency.getArtifactDirectory() + "/" + dependency.getType() + "s/" +
!                  dependency.getArtifact();
! @@ -94,7 +120,30 @@ public class Repository
!          Dependency dependency = new Dependency( groupId, artifactId, version, type, Collections.EMPTY_LIST );
!  
!          String repositoryPath;
! -        if ( LAYOUT_LEGACY.equals( layout ) )
! +        if ( LAYOUT_JPP.equals( layout ) ) 
! +        {
! +            if (filename.substring(filename.length()-4).equals(".pom") || type.equals("pom")) {
! + 
! +                MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +                Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
! + 
! +                groupId = (String) newInfo.get("group");
! +                artifactId = (String) newInfo.get("artifact");
! + 
! +                String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
! +                repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + fName;
! +                java.io.File f;
! + 
! +                // .substring(6) removes preceeding file://
! +                f = new File(basedir.substring(6) + "/" + repositoryPath);
! +                if (!f.exists()) {
! +                    repositoryPath = System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms") + "/" + fName;
! +                }
! +            } else {
! +                 repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + filename;
! +            }
! +        }
! +        else if ( LAYOUT_LEGACY.equals( layout ) )
!          {
!              repositoryPath = dependency.getArtifactDirectory() + "/poms/" + filename;
!          }
! @@ -102,11 +151,29 @@ public class Repository
!          {
!              repositoryPath = dependency.getGroupId().replace( '.', '/' );
!              repositoryPath = repositoryPath + "/" + dependency.getArtifactId();
! -            if ( version != null )
! +
! +            String newVersion = version;
! +            String newFilename = filename;
! +
! +            if (    ( 
! +                       ( System.getProperty("maven2.offline.mode") != null && 
! +                         System.getProperty("maven2.ignore.versions") != null ) ||
! +                       (System.getProperty("maven2.jpp.mode") != null) 
! +                   ) && 
! +                version != null) {
! +                MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
! +                Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
! +
! +                newVersion = (String) newInfo.get("version");
! +
! +                newFilename = filename.replaceFirst(dependency.getVersion(), newVersion);
! +            }
! +
! +            if ( newVersion != null )
!              {
! -                repositoryPath = repositoryPath + "/" + dependency.getVersion();
! +                repositoryPath = repositoryPath + "/" + newVersion;
!              }
! -            repositoryPath = repositoryPath + "/" + filename;
! +            repositoryPath = repositoryPath + "/" + newFilename;
!          }
!          else
!          {
! --- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav	2007-12-12 16:15:12.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java	2007-12-12 16:16:53.000000000 -0500
! @@ -49,7 +49,8 @@ public class OnlineArtifactDownloader
   
       private String proxyPassword;
***************
*** 403,411 ****
  -    private static final String REPO_URL = "http://repo1.maven.org/maven2";
  +    private static final String INTERNAL_REPO_URL = "__INTERNAL_REPO_PLACEHOLDER__";
! +	private static final String EXTERNAL_REPO_URL = "__EXTERNAL_REPO_PLACEHOLDER__";
   
       private Map downloadedArtifacts = new HashMap();
   
! @@ -170,7 +171,9 @@
               try
               {
--- 378,386 ----
  -    private static final String REPO_URL = "http://repo1.maven.org/maven2";
  +    private static final String INTERNAL_REPO_URL = "__INTERNAL_REPO_PLACEHOLDER__";
! +    private static final String EXTERNAL_REPO_URL = "__EXTERNAL_REPO_PLACEHOLDER__";
   
       private Map downloadedArtifacts = new HashMap();
   
! @@ -170,7 +171,10 @@ public class OnlineArtifactDownloader
               try
               {
***************
*** 413,422 ****
  -                if ( snapshot )
  +                if ( snapshot && 
! +					((System.getProperty("maven2.offline.mode") == null) && 
! +						(System.getProperty("maven2.jpp.mode") == null)) )
                   {
                       String filename = "maven-metadata-" + remoteRepo.getId() + ".xml";
                       File localFile = getLocalRepository().getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
! @@ -252,7 +255,9 @@
   
                       file.getParentFile().mkdirs();
--- 388,398 ----
  -                if ( snapshot )
  +                if ( snapshot && 
! +                   ((System.getProperty("maven2.offline.mode") == null) && 
! +                       (System.getProperty("maven2.jpp.mode") == null)) )
! +
                   {
                       String filename = "maven-metadata-" + remoteRepo.getId() + ".xml";
                       File localFile = getLocalRepository().getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
! @@ -252,7 +256,10 @@ public class OnlineArtifactDownloader
   
                       file.getParentFile().mkdirs();
***************
*** 424,504 ****
  -                    if ( !file.exists() || version.indexOf( "SNAPSHOT" ) >= 0 )
  +                    if ( (!file.exists() || version.indexOf( "SNAPSHOT" ) >= 0) && 
! +						((System.getProperty("maven2.offline.mode") == null) && 
! +							(System.getProperty("maven2.jpp.mode") == null)) )
                       {
                           String filename = dep.getArtifactId() + "-" + version + ".pom";
                           String metadataPath = remoteRepo.getMetadataPath( dep.getGroupId(), dep.getArtifactId(),
! @@ -291,6 +296,7 @@
!              }
!              catch ( FileNotFoundException e )
!              {
! +				e.printStackTrace();
!                  log( "Artifact not found at [" + url + "]" );
!                  // Ignore
!              }
! @@ -341,10 +347,9 @@
           if ( remoteRepositories.isEmpty() )
           {
!              // TODO: use super POM?
  -            remoteRepositories.add( new Repository( "central", REPO_URL, Repository.LAYOUT_DEFAULT, false, true ) );
! +            remoteRepositories.add( new Repository( "internal", INTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
!              // TODO: use maven root POM?
  -            remoteRepositories.add( new Repository( "apache.snapshots", "http://people.apache.org/repo/m2-snapshot-repository/",
  -                                                    Repository.LAYOUT_DEFAULT, true, false ) );
  +            remoteRepositories.add( new Repository( "external", EXTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
           }
   
           return remoteRepositories;
! --- maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav2	2007-01-17 10:34:28.000000000 +0100
! +++ maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2007-12-04 00:11:36.000000000 +0100
! @@ -88,7 +88,9 @@
!  
!                      boolean metadataIsEmpty = true;
   
! -                    if ( checkForUpdates )
! +                    if ( checkForUpdates && 
! +                        ((System.getProperty("maven2.offline.mode") == null) && 
! +                        (System.getProperty("maven2.jpp.mode") == null)))
!                      {
!                          getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
   
! --- maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav3	2007-03-25 07:06:10.000000000 +0200
! +++ maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java	2008-01-02 14:17:33.000000000 +0100
! @@ -57,6 +57,8 @@
   
       private boolean offline;
   
! +	private String settingsFile;
  +
       public BootstrapInstaller( SimpleArgumentParser parser )
           throws Exception
       {
! @@ -72,6 +74,8 @@
           this.updateSnapshots = parser.isArgumentSet( "--update-snapshots" );
   
           this.offline = parser.isArgumentSet( "--offline" );
  +
! +		this.settingsFile = parser.getArgumentValue( "--settings" );
       }
   
       public static void main( String[] args )
! @@ -203,7 +207,7 @@
!  
!          cli.setWorkingDirectory( basedir.getAbsolutePath() );
!  
! -        cli.createArgument().setValue( "-e" );
! +        cli.createArgument().setValue( "-e" );
!          cli.createArgument().setValue( "--batch-mode" );
!  
!          if ( offline )
! @@ -214,6 +218,10 @@
!          {
               cli.createArgument().setValue( "--update-snapshots" );
           }
- +		if (this.settingsFile != null) {
- +			cli.createArgument().setValue( "-s" );
- +			cli.createArgument().setValue( this.settingsFile ); 
- +		}
   
           for ( int i = 0; i < args.length; i++ )
           {
--- 400,478 ----
  -                    if ( !file.exists() || version.indexOf( "SNAPSHOT" ) >= 0 )
  +                    if ( (!file.exists() || version.indexOf( "SNAPSHOT" ) >= 0) && 
! +                       ((System.getProperty("maven2.offline.mode") == null) && 
! +                           (System.getProperty("maven2.jpp.mode") == null)) )
! +
                       {
                           String filename = dep.getArtifactId() + "-" + version + ".pom";
                           String metadataPath = remoteRepo.getMetadataPath( dep.getGroupId(), dep.getArtifactId(),
! @@ -340,11 +347,8 @@ public class OnlineArtifactDownloader
!  
           if ( remoteRepositories.isEmpty() )
           {
! -            // TODO: use super POM?
  -            remoteRepositories.add( new Repository( "central", REPO_URL, Repository.LAYOUT_DEFAULT, false, true ) );
! -            // TODO: use maven root POM?
  -            remoteRepositories.add( new Repository( "apache.snapshots", "http://people.apache.org/repo/m2-snapshot-repository/",
  -                                                    Repository.LAYOUT_DEFAULT, true, false ) );
+ +            remoteRepositories.add( new Repository( "internal", INTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
  +            remoteRepositories.add( new Repository( "external", EXTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
           }
   
           return remoteRepositories;
! --- ./maven2/bootstrap/bootstrap-mini/build.sav	2007-12-12 16:16:59.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-mini/build	2007-12-12 16:17:21.000000000 -0500
! @@ -9,6 +9,11 @@ rm -rf bootstrap-mini.jar ${buildDir} > 
!  mkdir -p ${classesDir}
   
!  "$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
! +# FIXME: Is there a better way to make the compiler see the jdom classes? 
! +# setting CLASSPATH, or giving -cp/-classpath didn't work :(
! +(cd ${classesDir} 
! +   jar xf $JDOMCLASS 
! +)
!  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
   
!  ( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
! --- ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav	2007-12-12 16:17:29.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java	2007-12-12 16:18:25.000000000 -0500
! @@ -57,6 +57,8 @@ public class BootstrapInstaller
   
       private boolean offline;
   
! +    private String settingsFile;
  +
       public BootstrapInstaller( SimpleArgumentParser parser )
           throws Exception
       {
! @@ -72,6 +74,8 @@ public class BootstrapInstaller
           this.updateSnapshots = parser.isArgumentSet( "--update-snapshots" );
   
           this.offline = parser.isArgumentSet( "--offline" );
  +
! +       this.settingsFile = parser.getArgumentValue( "--settings" );
       }
   
       public static void main( String[] args )
! @@ -215,6 +219,11 @@ public class BootstrapInstaller
               cli.createArgument().setValue( "--update-snapshots" );
           }
   
+ +        if (this.settingsFile != null) {
+ +            cli.createArgument().setValue( "-s" );
+ +            cli.createArgument().setValue( this.settingsFile ); 
+ +        }
+ +
           for ( int i = 0; i < args.length; i++ )
           {
+              cli.createArgument().setValue( args[i] );
+ --- ./maven2/bootstrap.sh.sav	2007-12-12 16:18:30.000000000 -0500
+ +++ ./maven2/bootstrap.sh	2007-12-12 16:18:47.000000000 -0500
+ @@ -8,7 +8,7 @@ if [ -z "$JAVA_HOME" ]; then
+    exit 1
+  fi
+  
+ -JAVACMD="$JAVA_HOME/bin/java"
+ +JAVACMD="$JAVA_HOME/bin/java -classpath $CLASSPATH"
+  
+  (
+    cd bootstrap/bootstrap-mini

--- maven2-bootstrap-no-modello-plugin.patch DELETED ---

--- maven2-site-plugin-pom.patch DELETED ---

--- NEW FILE: maven2-enable-bootstrap-repository.patch ---
--- maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2008-01-02 19:54:58.000000000 -0500
+++ maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-01-02 19:56:27.000000000 -0500
@@ -24,6 +24,15 @@ under the License.
 
   <repositories>
     <repository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Repository</name>
+      <layout>jpp</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>
@@ -48,6 +57,18 @@ under the License.
 
   <pluginRepositories>
      <pluginRepository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Plugin Repository</name>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <layout>jpp</layout>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+     </pluginRepository>
+     <pluginRepository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Plugin Repository</name>
       <url>file:///usr/share/maven2/repository</url>

Index: maven2-JPackageRepositoryLayout.java
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/maven2-JPackageRepositoryLayout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven2-JPackageRepositoryLayout.java	24 Jun 2008 16:47:48 -0000	1.2
--- maven2-JPackageRepositoryLayout.java	18 Feb 2009 08:55:04 -0000	1.3
***************
*** 90,95 ****
  		// a serious problem anyways..
  		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
! 		//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {
  			path = new StringBuffer();
  			path.append(System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
--- 90,96 ----
  		// a serious problem anyways..
  		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
! 		System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {
+             System.err.println(f.getAbsolutePath() + " not found");
  			path = new StringBuffer();
  			path.append(System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);

--- maven2-profile-no-modello-plugin-pom.patch DELETED ---

--- maven2-compiler-plugin-build.xml DELETED ---

--- maven2-ant-plugin-pom.patch DELETED ---

--- maven2-plugin-plugin-build.xml DELETED ---

--- maven2-core-no-shade-plugin-pom.patch DELETED ---

--- maven2-plugin-plugin.xml DELETED ---

--- NEW FILE: maven2-plugins-catch-uncaught-exceptions.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-16 10:25:00.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-16 10:26:27.000000000 -0400
@@ -241,6 +241,11 @@ public abstract class AbstractDependency
             throw new MojoExecutionException( "Error unpacking file: " + file + " to: " + location + "\r\n"
                 + e.toString(), e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new MojoExecutionException( "I/O exception when unpacking file: " + file, ioe );
+        }
+
     }
 
     private void silenceUnarchiver( UnArchiver unArchiver )
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java.sav	2007-10-16 10:23:42.000000000 -0400
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java	2007-10-16 10:26:51.000000000 -0400
@@ -62,6 +62,11 @@ public final class AssemblyFileUtils
         {
             throw new ArchiveExpansionException( "Error unpacking file: " + source + "to: " + destDir, e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new ArchiveExpansionException( "I/O exception when unpacking file: " + source, ioe );
+        }
+
     }
 
     /**

--- maven2-plugins-break-cycle.patch DELETED ---

Index: maven2-empty-dep.pom
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/maven2-empty-dep.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven2-empty-dep.pom	24 Jun 2008 16:47:49 -0000	1.2
--- maven2-empty-dep.pom	18 Feb 2009 08:55:04 -0000	1.3
***************
*** 4,8 ****
    <groupId>JPP/maven2</groupId>
    <artifactId>empty-dep</artifactId>
!   <version>2.0.7</version>
    <name>Empty dependency</name>
    <description>This is an empty dependency. For use in jpp mode when one or more dependencies need elimination.</description>
--- 4,8 ----
    <groupId>JPP/maven2</groupId>
    <artifactId>empty-dep</artifactId>
!   <version>2.0.4</version>
    <name>Empty dependency</name>
    <description>This is an empty dependency. For use in jpp mode when one or more dependencies need elimination.</description>

--- maven2-plugin-descriptor-no-modello-plugin-pom.patch DELETED ---

--- maven2-shared-file-management-build.xml DELETED ---

--- maven2-jar-plugin.xml DELETED ---

--- NEW FILE: maven2-use-unversioned-classworlds.patch ---
--- maven2/maven-core/src/bin/mvn.sav	2008-01-02 19:45:36.000000000 -0500
+++ maven2/maven-core/src/bin/mvn	2008-01-02 19:45:48.000000000 -0500
@@ -160,7 +160,7 @@ fi
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/boot/classworlds-*.jar \
+  -classpath "${M2_HOME}"/boot/classworlds*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS

--- maven2-plugin-registry-no-modello-plugin-pom.patch DELETED ---

--- maven2-plugin-parameter-documenter-no-modello-plugin-pom.patch DELETED ---

--- maven2-assembly-plugin.xml DELETED ---

--- maven2-war-plugin-AbstractWarPackagingTask.patch DELETED ---

--- NEW FILE: maven2-2.0.8-excludeexternaljars.patch ---
--- ./maven2/maven-core/pom.xml.sav	2007-12-12 16:21:15.000000000 -0500
+++ ./maven2/maven-core/pom.xml	2007-12-12 16:21:10.000000000 -0500
@@ -39,21 +39,23 @@
                   <exclude>junit:junit</exclude>
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
+                  <exclude>com.jcraft:jsch</exclude>
+                  <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                  <exclude>commons-cli:commons-cli</exclude>
+                  <exclude>org.apache.maven.doxia:doxia-sink-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-file</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-shared</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-provider-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-common</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-external</exclude>
+                  <exclude>org.codehaus.plexus:plexus-container-default</exclude>
+                  <exclude>org.codehaus.plexus:plexus-interactivity-api</exclude>
+                  <exclude>jdom:jdom</exclude>
+                  <exclude>jtidy:jtidy</exclude>
                 </excludes>
               </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.Xpp3Dom
-                    </exclude>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.pull.*
-                    </exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>

--- maven2-eclipse-plugin-InstallPluginsMojo.patch DELETED ---

--- NEW FILE: maven2-plugins-disablecobertura.patch ---
diff -up ./maven2-plugins/maven-dependency-plugin/pom.xml.sav ./maven2-plugins/maven-dependency-plugin/pom.xml
--- ./maven2-plugins/maven-dependency-plugin/pom.xml.sav	2007-07-04 12:36:14.000000000 -0400
+++ ./maven2-plugins/maven-dependency-plugin/pom.xml	2008-04-03 15:01:06.000000000 -0400
@@ -75,21 +75,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include the apache process LICENSE and NOTICE files.-->
 			<!--uncomment for release. Commented out for now to enable eclipse-plugin to work-->
diff -up ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav ./maven2-plugins/maven-enforcer-plugin/pom.xml
--- ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav	2008-04-03 15:01:20.000000000 -0400
+++ ./maven2-plugins/maven-enforcer-plugin/pom.xml	2008-04-03 15:01:35.000000000 -0400
@@ -53,21 +53,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include super-pom defined main/resources
 			Removing this section will break the build.

Index: maven2-addjdomtobootstrappath.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2/maven2-addjdomtobootstrappath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven2-addjdomtobootstrappath.patch	24 Jun 2008 16:47:48 -0000	1.2
--- maven2-addjdomtobootstrappath.patch	18 Feb 2009 08:55:04 -0000	1.3
***************
*** 1,37 ****
! --- maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav1	2007-06-14 07:58:45.000000000 +0200
! +++ maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF	2008-01-11 12:42:37.000000000 +0100
  @@ -1,3 +1,3 @@
   Manifest-Version: 1.0
   Main-Class: org.apache.maven.bootstrap.installer.BootstrapInstaller
  -Class-Path: bootstrap-mini-2.0.8-SNAPSHOT.jar plexus-utils-1.0.4.jar
! +Class-Path: bootstrap-mini-2.0.7.jar jdom-1.0.jar plexus-utils-1.0.4.jar
! --- maven2/bootstrap/bootstrap-mini/pom.xml.sav1	2008-01-11 12:41:49.000000000 +0100
! +++ maven2/bootstrap/bootstrap-mini/pom.xml	2008-01-11 12:46:13.000000000 +0100
! @@ -24,7 +24,7 @@
!    <modelVersion>4.0.0</modelVersion>
!    <groupId>org.apache.maven.bootstrap</groupId>
!    <artifactId>bootstrap-mini</artifactId>
! -  <version>2.0.8-SNAPSHOT</version>
! +  <version>2.0.7</version>
!    <name>Maven Bootstrap Mini Builder</name>
!    <description>Tool used to bootstrap m2.</description>
!  </project>
! --- maven2/bootstrap/bootstrap-installer/pom.xml.sav1	2007-06-14 07:58:45.000000000 +0200
! +++ maven2/bootstrap/bootstrap-installer/pom.xml	2008-01-11 12:58:30.000000000 +0100
! @@ -24,14 +24,14 @@
!    <modelVersion>4.0.0</modelVersion>
!    <groupId>org.apache.maven.bootstrap</groupId>
!    <artifactId>bootstrap-installer</artifactId>
! -  <version>2.0.8-SNAPSHOT</version>
! +  <version>2.0.7</version>
!    <name>Maven Bootstrap Installer</name>
!    <description>Tool used to bootstrap m2.</description>
!    <dependencies>
!      <dependency>
!        <groupId>org.apache.maven.bootstrap</groupId>
!        <artifactId>bootstrap-mini</artifactId>
! -      <version>2.0.8-SNAPSHOT</version>
! +      <version>2.0.7</version>
!      </dependency>
!      <dependency>
!        <groupId>org.codehaus.plexus</groupId>
--- 1,8 ----
! diff -up ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF
! --- ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav	2008-11-27 16:47:53.000000000 -0500
! +++ ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF	2008-11-27 16:48:22.000000000 -0500
  @@ -1,3 +1,3 @@
   Manifest-Version: 1.0
   Main-Class: org.apache.maven.bootstrap.installer.BootstrapInstaller
  -Class-Path: bootstrap-mini-2.0.8-SNAPSHOT.jar plexus-utils-1.0.4.jar
! +Class-Path: bootstrap-mini-2.0.8-SNAPSHOT.jar plexus-utils-1.0.4.jar jdom-1.0.jar

--- maven2-plugin-site-AbstractSiteRenderingMojo.patch DELETED ---

--- maven2-resources-plugin.xml DELETED ---

--- maven2-shared-plugin-testing-harness-build.xml DELETED ---

--- NEW FILE: maven2-fastjar-manifest-fix.patch ---
--- ./maven2/bootstrap/bootstrap-mini/build.sav	2007-08-14 10:37:28.000000000 -0400
+++ ./maven2/bootstrap/bootstrap-mini/build	2007-08-14 10:36:09.000000000 -0400
@@ -17,5 +17,5 @@ mkdir -p ${classesDir}
 )
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
-( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
+( cd ${classesDir} ; /bin/cp -f ../../src/main/resources/META-INF/MANIFEST.MF META-INF/; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi

--- NEW FILE: maven2-shade-plugin-replacement.patch ---
diff -up ./maven2/maven-core/pom.xml.sav ./maven2/maven-core/pom.xml
--- ./maven2/maven-core/pom.xml.sav	2008-04-07 20:42:34.000000000 -0400
+++ ./maven2/maven-core/pom.xml	2008-04-07 21:26:45.000000000 -0400
@@ -10,9 +10,9 @@
   <build>
     <plugins>
       <plugin>
-	    <groupId>org.codehaus.mojo</groupId>
-        <artifactId>shade-maven-plugin</artifactId>
-        <version>1.0-alpha-13</version>
+	    <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -28,7 +28,7 @@
                 true
               </keepDependenciesWithProvidedScope>
               <transformers>
-                <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
               </transformers>
               <artifactSet>
                 <excludes>
@@ -196,4 +196,4 @@
       <artifactId>classworlds</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

--- maven2-compiler-plugin.xml DELETED ---

--- NEW FILE: maven2-site-plugin-addservletdep.patch ---
--- ./maven2-plugins/maven-site-plugin/pom.xml.sav	2007-12-17 15:45:29.000000000 -0500
+++ ./maven2-plugins/maven-site-plugin/pom.xml	2007-12-17 15:45:44.000000000 -0500
@@ -190,6 +190,11 @@ under the License.
       <version>6.0.0rc0</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
       <version>1.0-beta-1</version>

--- maven2-settings-no-modello-plugin-pom.patch DELETED ---

--- maven2-resources-plugin-build.xml DELETED ---

--- NEW FILE: maven2-versionless-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>commons-collections</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-httpclient</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.0</version>
		</maven>
[...4114 lines suppressed...]
        <jpp>
            <groupId>JPP/tomcat5</groupId>
            <artifactId>parent</artifactId>
            <version>5.5.27</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>org.apache.maven.shared</groupId>
            <artifactId>maven-plugin-testing-harness</artifactId>
            <version>1.0-beta-1</version>
        </maven>
        <jpp>
            <groupId>JPP/maven-shared</groupId>
            <artifactId>plugin-testing-harness</artifactId>
            <version>1.0-SNAPSHOT</version>
        </jpp>
    </dependency>

</dependencies>

--- maven2-clean-plugin-build.xml DELETED ---

--- maven2-pmd-plugin-pom.patch DELETED ---

--- NEW FILE: maven2-plugins-doxiaupdatefix.patch ---
--- ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.sav	2007-10-15 16:29:04.000000000 -0400
+++ ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2007-10-15 17:15:42.000000000 -0400
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.javadoc;
  * under the License.
  */
 
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -214,20 +215,11 @@ public class JavadocReport
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
+            SiteRendererSink sink = new SiteRendererSink( context );
 
             generate( sink, Locale.getDefault() );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
         catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
--- ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav	2007-10-15 16:27:27.000000000 -0400
+++ ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java	2007-10-15 17:15:23.000000000 -0400
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -218,20 +219,12 @@ public class AntlrHtmlReport
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
+    
+            SiteRendererSink sink = new SiteRendererSink( context );
 
             generate( sink, Locale.getDefault() );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
         catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )

--- maven2-repository-metadata-no-modello-plugin-pom.patch DELETED ---

--- maven2-assembly-plugin-pom.patch DELETED ---

--- maven2-jpp-depmap.xml DELETED ---

--- maven2-model-no-modello-plugin-pom.patch DELETED ---

--- maven2-antrun-plugin-pom.patch DELETED ---

--- maven2-plugins-omit-add.patch DELETED ---

--- maven2-dependency-plugin-AbstractDependencyMojo.patch DELETED ---

--- maven2-install-plugin.xml DELETED ---




More information about the JPackage-commits mailing list