[Jpackage-commits] dist/maven2/JPP-6 maven2-plugin-assembly-AssemblyFormatUtils.patch, NONE, 1.1 maven2-plugin-assembly-FileFormatter.patch, NONE, 1.1 maven2-plugin-assembly-PropertyUtils.patch, NONE, 1.1 maven2-plugin-javadoc-pom.patch, NONE, 1.1 maven2-plugin-war-MappingUtils.patch, NONE, 1.1 maven2-plugin-war-pom.patch, NONE, 1.1 maven2-plugins-disableenforcer.patch, 1.1, 1.2 maven2-shade-plugin-replacement.patch, 1.1, NONE maven2.spec, 1.12, 1.13 sources, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Sat Dec 4 11:39:52 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv11484

Modified Files:
	maven2-plugins-disableenforcer.patch maven2.spec sources 
Added Files:
	maven2-plugin-assembly-AssemblyFormatUtils.patch 
	maven2-plugin-assembly-FileFormatter.patch 
	maven2-plugin-assembly-PropertyUtils.patch 
	maven2-plugin-javadoc-pom.patch 
	maven2-plugin-war-MappingUtils.patch 
	maven2-plugin-war-pom.patch 
Removed Files:
	maven2-shade-plugin-replacement.patch 
Log Message:
2.0.8-28

--- NEW FILE: maven2-plugin-assembly-AssemblyFormatUtils.patch ---
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java.sav	2010-11-28 16:25:17.000000000 +0100
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java	2010-11-28 16:27:43.000000000 +0100
@@ -71,7 +71,10 @@
             interpolator.addValueSource( new ObjectBasedValueSource( project ) );
         }
 
-        value = interpolator.interpolate( value, "__project" );
+        try {
+            value = interpolator.interpolate( value, "__project" );
+        } catch(Exception e) {
+        }
 
         if ( ( value.length() > 0 ) && !value.endsWith( "/" ) && !value.endsWith( "\\" ) )
         {
@@ -123,7 +126,11 @@
 
         interpolator.addValueSource( new PropertiesInterpolationValueSource( specialRules ) );
 
-        value = interpolator.interpolate( value, "__artifact" );
+        try {
+            value = interpolator.interpolate( value, "__artifact" );
+        } catch(Exception e) {
+            throw new AssemblyFormattingException( "cannot interpolate value: " + e.getMessage(), e );
+        }
 
         return value;
     }

Index: maven2-plugins-disableenforcer.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2-plugins-disableenforcer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-plugins-disableenforcer.patch	29 Mar 2010 15:28:10 -0000	1.1
--- maven2-plugins-disableenforcer.patch	4 Dec 2010 10:39:50 -0000	1.2
***************
*** 1,4 ****
! --- maven2-plugins/pom.xml.sav	2009-09-02 14:44:36.000000000 -0400
! +++ maven2-plugins/pom.xml	2009-09-02 14:44:48.000000000 -0400
  @@ -106,7 +106,6 @@
       <module>maven-ear-plugin</module>
--- 1,4 ----
! --- maven2-plugins/pom.xml.sav19	2007-06-06 09:47:25.000000000 +0200
! +++ maven2-plugins/pom.xml	2010-11-28 22:22:29.000000000 +0100
  @@ -106,7 +106,6 @@
       <module>maven-ear-plugin</module>
***************
*** 9,10 ****
--- 9,18 ----
       <module>maven-help-plugin</module>
       <module>maven-idea-plugin</module>
+ @@ -115,7 +114,6 @@
+      <module>maven-jar-plugin</module>
+      <module>maven-javadoc-plugin</module>
+      <module>maven-one-plugin</module>
+ -    <module>maven-plugin-plugin</module>
+      <module>maven-pmd-plugin</module>
+      <module>maven-project-info-reports-plugin</module>
+      <module>maven-rar-plugin</module>

--- NEW FILE: maven2-plugin-assembly-FileFormatter.patch ---
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java.sav	2010-11-28 16:15:25.000000000 +0100
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java	2010-11-28 16:17:43.000000000 +0100
@@ -163,8 +163,12 @@
         interpolator.addValueSource( new MapBasedValueSource( filterProperties ) );
         interpolator.addValueSource( new ObjectBasedValueSource( configSource.getProject() ) );
 
-        contents = interpolator.interpolate( contents, "project" );
-
+        try {
+            contents = interpolator.interpolate( contents, "project" );
+        } catch(Exception e) {
+            throw new AssemblyFormattingException( "cannot interpolate contents: " + e.getMessage(), e );
+        }
+ 
         return contents;
     }
 

--- NEW FILE: maven2-plugin-war-pom.patch ---
--- maven2-plugins/maven-war-plugin/pom.xml.sav	2010-11-28 17:02:26.000000000 +0100
+++ maven2-plugins/maven-war-plugin/pom.xml	2010-11-28 17:03:19.000000000 +0100
@@ -49,7 +49,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
+      <version>1.5.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	29 Mar 2010 18:59:09 -0000	1.3
--- sources	4 Dec 2010 10:39:50 -0000	1.4
***************
*** 4,8 ****
  13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
  de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
! a4b18868658fe3e3c58d0f4e9bf66bee  m2_pom_repo.tar.gz
! 00976d79948c93be23cdda62300dc8c2  m2_jar_repo.tar.gz
  dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
--- 4,8 ----
  13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
  de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
! 2d748942f6e1de90252509e498c9ad47  m2_pom_repo.tar.gz
! cfd387a94777b0836e4ab64bbf846c39  m2_jar_repo.tar.gz
  dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar

--- maven2-shade-plugin-replacement.patch DELETED ---

--- NEW FILE: maven2-plugin-war-MappingUtils.patch ---
--- maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java.sav24	2007-03-11 17:55:10.000000000 +0100
+++ maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java	2010-11-28 17:37:14.000000000 +0100
@@ -21,8 +21,8 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
-import org.codehaus.plexus.util.interpolation.ValueSource;
+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
+import org.codehaus.plexus.interpolation.ValueSource;
 
 import java.util.ArrayList;
 import java.util.Iterator;

--- NEW FILE: maven2-plugin-assembly-PropertyUtils.patch ---
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java.sav	2010-11-28 16:02:34.000000000 +0100
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java	2010-11-28 16:06:17.000000000 +0100
@@ -83,7 +83,12 @@
         for ( Enumeration n = props.propertyNames(); n.hasMoreElements(); )
         {
             String key = (String) n.nextElement();
-            String value = interpolator.interpolate( props.getProperty( key ), "__properties" );
+            String value = null;
+            try {
+                value = interpolator.interpolate( props.getProperty( key ), "__properties" );
+            } catch(Exception e) {
+                throw new IOException( "cannot interpolate property: " + e.getMessage(), e );
+            }
             
             props.setProperty( key, value );
         }

--- NEW FILE: maven2-plugin-javadoc-pom.patch ---
--- maven2-plugins/maven-javadoc-plugin/pom.xml.sav	2010-11-29 00:20:39.000000000 +0100
+++ maven2-plugins/maven-javadoc-plugin/pom.xml	2010-11-29 00:22:13.000000000 +0100
@@ -112,6 +112,11 @@
       <artifactId>doxia-sink-api</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
 
     <!-- Doxia-sitetools -->
     <dependency>
@@ -279,4 +284,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** maven2.spec	1 Oct 2010 08:09:00 -0000	1.12
--- maven2.spec	4 Dec 2010 10:39:50 -0000	1.13
***************
*** 60,64 ****
  Name:           %{name}
  Version:        %{maven_version}
! Release:        27%{?dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
--- 60,64 ----
  Name:           %{name}
  Version:        %{maven_version}
! Release:        28%{?dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
***************
*** 143,146 ****
--- 143,153 ----
  Patch19:	%{name}-plugins-disableenforcer.patch
  Patch20:        %{name}-commons-cli-1.1.patch
+ Patch21:        %{name}-plugin-assembly-PropertyUtils.patch
+ Patch22:        %{name}-plugin-assembly-FileFormatter.patch
+ Patch23:        %{name}-plugin-assembly-AssemblyFormatUtils.patch
+ Patch24:        %{name}-plugin-war-MappingUtils.patch
+ Patch25:        %{name}-plugin-war-pom.patch
+ Patch26:        %{name}-plugin-javadoc-pom.patch
+ 
  
  Provides:       %{name}-bootstrap = %{epoch}:%{version}-%{release}
***************
*** 189,193 ****
  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
--- 196,201 ----
  BuildRequires:    maven-jxr >= 1.0-2
  BuildRequires:    maven-wagon >= 1.0-0.1.b2
! BuildRequires:    maven-doxia >= 1.0
! BuildRequires:    maven-plugin-tools
  BuildRequires:    nekohtml >= 0.9.3
  BuildRequires:    oro >= 2.0.8
***************
*** 227,231 ****
  BuildRequires:    maven2-plugin-jar
  BuildRequires:    maven2-plugin-javadoc
- BuildRequires:    maven2-plugin-plugin
  BuildRequires:    maven2-plugin-resources
  BuildRequires:    maven2-plugin-shade
--- 235,238 ----
***************
*** 925,951 ****
  
  
- %package        plugin-plugin
- Summary:        Plugin plugin for maven
- Group:          Development/Build Tools
- Requires:       %{name} = %{epoch}:%{version}-%{release}
- Requires(postun): %{name} = %{epoch}:%{version}-%{release}
- Requires:       maven-shared-plugin-tools-beanshell >= 2.2
- Requires:       maven-shared-plugin-tools-java >= 2.2
- Requires:    	maven-shared-reporting-impl
- Requires:       maven-doxia >= 1.0-0.a9
- Requires:       plexus-utils >= 1.2
- Requires:       plexus-container-default
- 
- %if %{gcj_support}
- BuildRequires:       java-gcj-compat-devel
- Requires(post):      java-gcj-compat
- Requires(postun):    java-gcj-compat
- %endif
- 
- %description    plugin-plugin
- Creates a Maven plugin descriptor for any Mojo's found in the source tree, 
- to include in the JAR.
- 
- 
  %package        plugin-pmd
  Summary:        Pmd plugin for maven
--- 932,935 ----
***************
*** 1186,1189 ****
--- 1170,1174 ----
  # Extract the plugins
  tar xzf %{SOURCE2}
+ rm -rf maven2-plugins/maven-plugin-plugin
  
  # We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
***************
*** 1202,1216 ****
  
  # javadoc 2.4 uses an old doxia method
! %patch15 -b .sav
  
  # This plugin can't cope with a JAR without a JDK version on it
! %patch16 -b .sav
  
! %patch17 -b .sav
  
! %patch18 -b .sav
! %patch19 -b .sav
  
! %patch20 -b .sav
  
  # Remove dependencies on org.codehaus.doxia.* (it is now
--- 1187,1201 ----
  
  # javadoc 2.4 uses an old doxia method
! %patch15 -b .sav15
  
  # This plugin can't cope with a JAR without a JDK version on it
! %patch16 -b .sav16
  
! %patch17 -b .sav17
  
! %patch18 -b .sav18
! %patch19 -b .sav19
  
! %patch20 -b .sav20
  
  # Remove dependencies on org.codehaus.doxia.* (it is now
***************
*** 1222,1226 ****
              maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
              maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
-             maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
              maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
              maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
--- 1207,1210 ----
***************
*** 1240,1270 ****
  #find . -name "*.jar" -exec rm -f '{}' \;
  
! %patch0 -b .sav
! %patch1 -b .sav
! %patch2 -b .sav
! %patch3 -b .sav
! %patch4 -b .sav
! %patch5 -b .sav
  
  # keep external jars out of uber jar only in non-bootstrap mode
  %if %without bootstrap
! %patch6 -b .sav
  %endif
  
  
! %patch7 -b .sav
  
  %if %with bootstrap
! %patch8 -b .sav
  %endif
  
! %patch9 -b .sav
! %patch10 -b .sav
! %patch11 -b .sav
! %patch12 -b .sav
  # javadoc 2.5 no longer needs this patch
! #%patch13 -b .sav
  # javadoc 2.5 pre-reqs maven 2.0.9 by default
! #%patch14 -b .sav
  
  # FIXME: Maven eclipse plugin tests are disabled for now, until a way
--- 1224,1261 ----
  #find . -name "*.jar" -exec rm -f '{}' \;
  
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
! %patch4 -b .sav4
! %patch5 -b .sav5
  
  # keep external jars out of uber jar only in non-bootstrap mode
  %if %without bootstrap
! %patch6 -b .sav6
  %endif
  
  
! %patch7 -b .sav7
  
  %if %with bootstrap
! %patch8 -b .sav8
  %endif
  
! %patch9 -b .sav9
! %patch10 -b .sav10
! %patch11 -b .sav11
! %patch12 -b .sav12
  # javadoc 2.5 no longer needs this patch
! #%patch13 -b .sav13
  # javadoc 2.5 pre-reqs maven 2.0.9 by default
! #%patch14 -b .sav14
! 
! %patch21 -b .sav21
! %patch22 -b .sav22
! %patch23 -b .sav23
! %patch24 -b .sav24
! %patch25 -b .sav25
! %patch26 -b .sav26
  
  # FIXME: Maven eclipse plugin tests are disabled for now, until a way
***************
*** 1290,1293 ****
--- 1281,1285 ----
  %if %with bootstrap
  tar xzf %{SOURCE4}
+ cp $(build-classpath plexus/utils) m2_repo/repository/JPP/plexus/
  %endif
  
***************
*** 1403,1416 ****
  pushd maven2-plugins >& /dev/null
  
- # Build the plugin-plugin first, as it is needed to build itself later on
- # NOTE: Build of this plugin for the first time is expected to cause errors. 
- # That is why we build it first with -fn . Subsequent builds should not have 
- # errors, and if they do, they will be caught when all plugins are built 
- # again below. See: http://mail-archives.apache.org/mod_mbox/maven-users/200511.mbox/%3c4374C819.7090609@commonjava.org%3e
- 
- (cd maven-plugin-plugin
- $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -npu --no-plugin-registry -fn clean install 
- )
- 
  %if ! %{NONFREE}
  # Disable clover plugin. We don't have a clover package yet.
--- 1395,1398 ----
***************
*** 1445,1449 ****
  
  (cd integration-tests/maven-core-it-plugin
! $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.1.1-SNAPSHOT:descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
  $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install-file -DgroupId=org.apache.maven.plugins -DartifactId=maven-core-it-plugin -Dversion=%{version}-JPP -Dpackaging=maven-plugin -Dfile=target/maven-core-it-plugin-1.0-SNAPSHOT.jar
  )
--- 1427,1431 ----
  
  (cd integration-tests/maven-core-it-plugin
! $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.4.3:descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
  $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install-file -DgroupId=org.apache.maven.plugins -DartifactId=maven-core-it-plugin -Dversion=%{version}-JPP -Dpackaging=maven-plugin -Dfile=target/maven-core-it-plugin-1.0-SNAPSHOT.jar
  )
***************
*** 1451,1455 ****
  for i in `find integration-tests/maven-core-it-support -name pom.xml`; do
      pushd `dirname $i`
!         $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.1.1-SNAPSHOT::descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile  org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
      popd
  done
--- 1433,1437 ----
  for i in `find integration-tests/maven-core-it-support -name pom.xml`; do
      pushd `dirname $i`
!         $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.4.3:descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile  org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
      popd
  done
***************
*** 1919,1938 ****
  
  %if %{gcj_support}
- %post plugin-plugin
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
- %if %{gcj_support}
- %postun plugin-plugin
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
- %if %{gcj_support}
  %post plugin-one
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 1901,1904 ----
***************
*** 2798,2812 ****
  
  
- %files plugin-plugin
- %defattr(-,root,root,-)
- %dir %{_datadir}/%{name}/plugins
- %{_datadir}/%{name}/plugins/plugin-plugin*.jar
- 
- %if %{gcj_support}
- %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
- %attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin*.jar.*
- %endif
- 
- 
  %files plugin-pmd
  %defattr(-,root,root,-)
--- 2764,2767 ----
***************
*** 2931,2934 ****
--- 2886,2893 ----
  
  %changelog
+ * Sun Nov 28 2010 Ralph Apel <r.apel at r-apel.de> 0:2.0.8-28
+ - Adapt to doxia 1.0, modello 1.3, fix war plugin
+ - Drop -plugin-plugin, now provided by maven-plugin-tools
+ 
  * Thu Sep 30 2010 Ralph Apel <r.apel at r-apel.de> 0:2.0.8-27
  - put bootstrap_repo after jpp_repo




More information about the JPackage-commits mailing list