[Jpackage-commits] rpms/free/maven-release maven-release-5-ForkedMavenExecutorTest.patch, NONE, 1.1 maven-release-5-InvokerMavenExecutor.patch, NONE, 1.1 maven-release-5-build.xml, NONE, 1.1 maven-release-5-jpp-depmap.xml, NONE, 1.1 maven-release-5-plugin-pom.patch, NONE, 1.1 maven-release-5-settings.xml, NONE, 1.1 maven-release-CommandLineFactoryTest.patch, 1.1, NONE maven-release-ForkedMavenExecutorTest.patch, 1.1, NONE maven-release-build.xml, 1.1, NONE maven-release-jpp-depmap.xml, 1.2, NONE maven-release-manager-pom.patch, NONE, 1.1 maven-release-settings.xml, 1.1, NONE maven-release.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Sun Dec 5 20:14:22 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-release
In directory ryu.zarb.org:/tmp/8Ex5lIJMWm/rpms/free/maven-release

Modified Files:
	maven-release.spec 
Added Files:
	maven-release-5-ForkedMavenExecutorTest.patch 
	maven-release-5-InvokerMavenExecutor.patch 
	maven-release-5-build.xml maven-release-5-jpp-depmap.xml 
	maven-release-5-plugin-pom.patch maven-release-5-settings.xml 
	maven-release-manager-pom.patch 
Removed Files:
	maven-release-CommandLineFactoryTest.patch 
	maven-release-ForkedMavenExecutorTest.patch 
	maven-release-build.xml maven-release-jpp-depmap.xml 
	maven-release-settings.xml 
Log Message:
5-2.jpp6

--- NEW FILE: maven-release-5-build.xml ---

--- NEW FILE: maven-release-5-InvokerMavenExecutor.patch ---
--- maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java.sav	2009-01-15 15:57:01.000000000 +0100
+++ maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java	2009-01-15 15:59:44.000000000 +0100
@@ -211,11 +211,13 @@
 
             if ( cli.hasOption( REACTOR ) )
             {
-                req.setRecursive( true );
+                getLogger().warn( "Enabling recursive is not supported currently." );
+//              req.setRecursive( true );
             }
             else if ( cli.hasOption( NON_RECURSIVE ) )
             {
-                req.setRecursive( false );
+                getLogger().warn( "Disabling recursive is not supported currently." );
+//              req.setRecursive( false );
             }
 
             if ( cli.hasOption( UPDATE_SNAPSHOTS ) )
@@ -275,7 +277,8 @@
             }
             else if ( cli.hasOption( SUPPRESS_PLUGIN_UPDATES ) )
             {
-                req.setNonPluginUpdates( true );
+                getLogger().warn( "Suppressing plugin updates is not supported currently." );
+//              req.setNonPluginUpdates( true );
             }
 
             if ( cli.hasOption( SUPPRESS_PLUGIN_REGISTRY ) )
@@ -512,7 +515,7 @@
 
         public void setThreshold( int level )
         {
-            logger.setThreshold( level );
+//          logger.setThreshold( level );
         }
 
         public void warn( String message,

--- maven-release-build.xml DELETED ---

--- NEW FILE: maven-release-5-ForkedMavenExecutorTest.patch ---
--- maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java.sav0	2007-01-03 07:56:15.000000000 +0100
+++ maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java	2008-01-04 19:17:38.000000000 +0100
@@ -24,7 +24,8 @@
 import org.codehaus.plexus.util.StringInputStream;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.Commandline;
-import org.jmock.cglib.Mock;
+import org.jmock.Mock;
+import org.jmock.cglib.CGLIBCoreMock;
 import org.jmock.core.constraint.IsEqual;
 import org.jmock.core.matcher.InvokeOnceMatcher;
 import org.jmock.core.stub.ReturnStub;
@@ -60,7 +61,7 @@
         Mock commandLineMock = createMockCommandLine( workingDirectory, process );
         expectDefaultArguments( commandLineMock );
 
-        Mock mock = new Mock( CommandLineFactory.class );
+        Mock mock = new Mock( new CGLIBCoreMock( CommandLineFactory.class, "CommandLineFactory" ) );
 
         mock.expects( new InvokeOnceMatcher() ).method( "createCommandLine" ).with( new IsEqual( "mvn" ) ).will(
             new ReturnStub( commandLineMock.proxy() ) );
@@ -86,7 +87,7 @@
         commandLineMock.expects( new InvokeOnceMatcher() ).method( "createArgument" ).will(
             new ReturnStub( createArgumentLineMock( arguments ) ) );
 
-        Mock mock = new Mock( CommandLineFactory.class );
+        Mock mock = new Mock( new CGLIBCoreMock( CommandLineFactory.class, "CommandLineFactory" ) );
 
         mock.expects( new InvokeOnceMatcher() ).method( "createCommandLine" ).with( new IsEqual( "mvn" ) ).will(
             new ReturnStub( commandLineMock.proxy() ) );
@@ -113,7 +114,7 @@
 
         expectDefaultArguments( commandLineMock );
 
-        Mock mock = new Mock( CommandLineFactory.class );
+        Mock mock = new Mock( new CGLIBCoreMock( CommandLineFactory.class, "CommandLineFactory" ) );
 
         mock.expects( new InvokeOnceMatcher() ).method( "createCommandLine" ).with( new IsEqual( "mvn" ) ).will(
             new ReturnStub( commandLineMock.proxy() ) );
@@ -136,7 +137,7 @@
 
         expectDefaultArguments( commandLineMock );
 
-        Mock mock = new Mock( CommandLineFactory.class );
+        Mock mock = new Mock( new CGLIBCoreMock( CommandLineFactory.class, "CommandLineFactory" ) );
 
         mock.expects( new InvokeOnceMatcher() ).method( "createCommandLine" ).with( new IsEqual( "mvn" ) ).will(
             new ReturnStub( commandLineMock.proxy() ) );
@@ -160,7 +161,7 @@
     {
         File workingDirectory = getTestFile( "target/working-directory" );
 
-        Mock commandLineMock = new Mock( Commandline.class );
+        Mock commandLineMock = new Mock( new CGLIBCoreMock( Commandline.class, "Commandline" ) );
         commandLineMock.expects( new InvokeOnceMatcher() ).method( "setWorkingDirectory" ).with(
             new IsEqual( workingDirectory.getAbsolutePath() ) );
         commandLineMock.expects( new InvokeOnceMatcher() ).method( "addEnvironment" ).with(
@@ -170,7 +171,7 @@
 
         expectDefaultArguments( commandLineMock );
 
-        Mock mock = new Mock( CommandLineFactory.class );
+        Mock mock = new Mock( new CGLIBCoreMock( CommandLineFactory.class, "CommandLineFactory" ) );
 
         mock.expects( new InvokeOnceMatcher() ).method( "createCommandLine" ).with( new IsEqual( "mvn" ) ).will(
             new ReturnStub( commandLineMock.proxy() ) );
@@ -201,7 +202,7 @@
 
     private static Mock createMockCommandLine( File workingDirectory, Process process )
     {
-        Mock commandLineMock = new Mock( Commandline.class );
+        Mock commandLineMock = new Mock( new CGLIBCoreMock( Commandline.class, "Commandline" ) );
         commandLineMock.expects( new InvokeOnceMatcher() ).method( "setWorkingDirectory" ).with(
             new IsEqual( workingDirectory.getAbsolutePath() ) );
         commandLineMock.expects( new InvokeOnceMatcher() ).method( "addEnvironment" ).with(
@@ -213,21 +214,21 @@
 
     private static Commandline.Argument createArgumentValueMock( String value )
     {
-        Mock mock = new Mock( Commandline.Argument.class );
+        Mock mock = new Mock( new CGLIBCoreMock( Commandline.Argument.class, "Commandline.Argument" ) );
         mock.expects( new InvokeOnceMatcher() ).method( "setValue" ).with( new IsEqual( value ) );
         return (Commandline.Argument) mock.proxy();
     }
 
     private static Commandline.Argument createArgumentLineMock( String value )
     {
-        Mock mock = new Mock( Commandline.Argument.class );
+        Mock mock = new Mock( new CGLIBCoreMock( Commandline.Argument.class, "Commandline.Argument" ) );
         mock.expects( new InvokeOnceMatcher() ).method( "setLine" ).with( new IsEqual( value ) );
         return (Commandline.Argument) mock.proxy();
     }
 
     private static Process createMockProcess( int exitCode )
     {
-        Mock mockProcess = new Mock( Process.class );
+        Mock mockProcess = new Mock( new CGLIBCoreMock( Process.class, "Process" ) );
         mockProcess.expects( new InvokeOnceMatcher() ).method( "getInputStream" ).will(
             new ReturnStub( new StringInputStream( "" ) ) );
         mockProcess.expects( new InvokeOnceMatcher() ).method( "getErrorStream" ).will(

--- maven-release-settings.xml DELETED ---

--- NEW FILE: maven-release-5-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.3</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>servlet_2_4_api</artifactId>
         <version>2.4</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
        <groupId>com.thoughtworks.qdox</groupId>
        <artifactId>qdox</artifactId>
        <version>1.6.3</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>qdox</artifactId>
        <version>1.6.1</version>
      </jpp>
   </dependency>

</dependencies>

--- NEW FILE: maven-release-5-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

Index: maven-release.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-release/maven-release.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-release.spec	12 Feb 2008 16:17:02 -0000	1.2
--- maven-release.spec	5 Dec 2010 19:14:20 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 38,77 ****
  
  %define bname release
! %define manager_version 1.0-alpha-4
! %define plugin_version 2.0-beta-7
  
  %define maven_settings_file %{_builddir}/%{name}/settings.xml
  
  Name:           maven-release
! Version:        4
! Release:        2jpp
  Epoch:          0
  Summary:        Maven Release
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://maven.apache.org/
  Source0:        %{name}-%{version}.tar.gz
! # svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/
  
  
! Source1:        %{name}-build.xml
! Source2:        %{name}-jpp-depmap.xml
! Source3:        %{name}-settings.xml
! Source4:        %{name}-autogenerated-files.tar.gz
! Patch0:         %{name}-ForkedMavenExecutorTest.patch
! Patch1:         %{name}-CommandLineFactoryTest.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  %if %{with_maven}
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 38,78 ----
  
  %define bname release
! %define manager_version 1.0-alpha-5
! %define plugin_version 2.0-beta-8
  
  %define maven_settings_file %{_builddir}/%{name}/settings.xml
  
  Name:           maven-release
! Version:        5
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Maven Release
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/
  Source0:        %{name}-%{version}.tar.gz
! # svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-5/
  
  
! Source1:        %{name}-%{version}-build.xml
! Source2:        %{name}-%{version}-jpp-depmap.xml
! Source3:        %{name}-%{version}-settings.xml
! Source4:        %{name}-%{version}-autogenerated-files.tar.gz
! Patch0:         %{name}-%{version}-InvokerMavenExecutor.patch
! Patch1:         %{name}-%{version}-ForkedMavenExecutorTest.patch
! Patch2:         %{name}-%{version}-plugin-pom.patch
! Patch3:         %{name}-manager-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  %if %{with_maven}
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-ant
+ BuildRequires:  maven2-plugin-antrun
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 82,85 ****
--- 83,87 ----
  BuildRequires:  maven2-plugin-surefire
  BuildRequires:  modello-maven-plugin >= 0:1.0-0.a15.2
+ BuildRequires:  apache-commons-parent
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
  %endif
***************
*** 88,111 ****
  BuildRequires:  jdom
  BuildRequires:  jmock
! BuildRequires:  maven2-bootstrap >= 0:2.0.7
! BuildRequires:  maven-scm >= 0:1.0-1
! BuildRequires:  maven-scm-test >= 0:1.0-1
  BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  maven-wagon
! BuildRequires:  modello >= 0:1.0-0.a15.2
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-interactivity
  BuildRequires:  plexus-utils
  
  Requires:  jaxen
  Requires:  jdom
! Requires:  maven2-bootstrap >= 0:2.0.7
! Requires:  maven-scm >= 0:1.0-1
  Requires:  plexus-container-default
  Requires:  plexus-interactivity
  Requires:  plexus-utils
  
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  Provides:  maven2-plugin-release = %{epoch}:%{version}-%{release}
  Obsoletes: maven2-plugin-release < %{epoch}:2.0.5
--- 90,114 ----
  BuildRequires:  jdom
  BuildRequires:  jmock
! BuildRequires:  maven2-bootstrap >= 0:2.0.8
! BuildRequires:  maven-scm >= 0:1.1
! BuildRequires:  maven-scm-test >= 0:1.1
  BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  maven-wagon
! BuildRequires:  modello >= 0:1.3
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-interactivity
  BuildRequires:  plexus-utils
  
+ Requires:  java >= 0:1.6.0
  Requires:  jaxen
  Requires:  jdom
! Requires:  maven2-bootstrap >= 0:2.0.8
! Requires:  maven-scm >= 0:1.1
  Requires:  plexus-container-default
  Requires:  plexus-interactivity
  Requires:  plexus-utils
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  Provides:  maven2-plugin-release = %{epoch}:%{version}-%{release}
  Obsoletes: maven2-plugin-release < %{epoch}:2.0.5
***************
*** 117,122 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 120,123 ----
***************
*** 133,140 ****
  %patch0 -b .sav0
  %patch1 -b .sav1
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! 
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
--- 134,142 ----
  %patch0 -b .sav0
  %patch1 -b .sav1
+ %patch2 -b .sav2
+ %patch3 -b .sav3
  
  %build
! %if %{with_maven}
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
***************
*** 144,148 ****
  
  export M2_SETTINGS=$(pwd)/settings.xml
- %if %{with_maven}
      mvn-jpp \
          -e \
--- 146,149 ----
***************
*** 152,164 ****
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          ant:ant install
- pushd maven-release-manager
-     mvn-jpp \
-         -e \
-         -s $M2_SETTINGS \
-         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         javadoc:javadoc
- popd
- pushd maven-release-plugin
      mvn-jpp \
          -e \
--- 153,156 ----
***************
*** 167,171 ****
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          javadoc:javadoc
- popd
  %else
  export CLASSPATH=$(build-classpath \
--- 159,162 ----
***************
*** 263,275 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 254,257 ----
***************
*** 280,293 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{name}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Tue Feb 12 2008 Ralph Apel <r.apel at r-apel.de> 0:4-2jpp
  - Obsolete maven2-plugin-release < 0:2.0.5
--- 262,283 ----
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms/*
! %{_datadir}/maven2/plugins/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 0:5-2
+ - Adapt to JPP6
+ 
+ * Thu Jan 15 2009 Ralph Apel <r.apel at r-apel.de> 0:5-1.jpp5
+ - 5
+ 
  * Tue Feb 12 2008 Ralph Apel <r.apel at r-apel.de> 0:4-2jpp
  - Obsolete maven2-plugin-release < 0:2.0.5

--- maven-release-jpp-depmap.xml DELETED ---

--- maven-release-CommandLineFactoryTest.patch DELETED ---

--- maven-release-ForkedMavenExecutorTest.patch DELETED ---

--- NEW FILE: maven-release-manager-pom.patch ---
--- maven-release-manager/pom.xml.sav3	2008-10-27 19:06:43.000000000 +0100
+++ maven-release-manager/pom.xml	2010-12-02 18:44:28.000000000 +0100
@@ -33,7 +33,7 @@
   <name>Maven Release Manager</name>
 
   <properties>
-    <plexusOutput>${project.build.directory}/generated-resources/plexus</plexusOutput>
+    <plexusOutput>target/generated-resources/plexus</plexusOutput>
     <componentsFileName>META-INF/plexus/components.xml</componentsFileName>
   </properties>
 
@@ -286,7 +286,7 @@
         <configuration>
           <version>1.0.0</version>
           <packageWithVersion>false</packageWithVersion>
-          <model>src/main/mdo/release-descriptor.mdo</model>
+          <models><model>src/main/mdo/release-descriptor.mdo</model></models>
         </configuration>
       </plugin>
       <plugin>
@@ -328,7 +328,7 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <copy todir="${project.build.outputDirectory}" overwrite="true">
+                <copy todir="target" overwrite="true">
                   <fileset dir="${plexusOutput}" />
                 </copy>
               </tasks>

--- NEW FILE: maven-release-5-plugin-pom.patch ---
--- maven-release-plugin/pom.xml.sav	2009-01-15 16:19:53.000000000 +0100
+++ maven-release-plugin/pom.xml	2009-01-15 16:20:43.000000000 +0100
@@ -125,6 +125,7 @@
           <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
         </configuration>
       </plugin>
+<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
@@ -138,6 +139,7 @@
           </execution>
         </executions>
       </plugin>
+-->
     </plugins>
   </build>
 




More information about the JPackage-commits mailing list