[Jpackage-commits] dist/maven-surefire/devel .cvsignore, 1.3, 1.4 maven-surefire-2.3-CmdShell.patch, 1.2, 1.3 maven-surefire-2.3-CommandShell.patch, 1.2, 1.3 maven-surefire-2.3-Commandline.patch, 1.2, 1.3 maven-surefire-2.3-junit4-pom.patch, 1.2, 1.3 maven-surefire-2.3-testng-TestNGDirectoryTestSuite.patch, 1.2, 1.3 maven-surefire-2.3-testng-TestNGXmlTestSuite.patch, 1.2, 1.3 maven-surefire-jpp-depmap.xml, 1.5, 1.6 maven-surefire.spec, 1.9, 1.10 sources, 1.3, 1.4

jpackage-guest jpackage-guest at ryu.zarb.org
Mon Mar 23 03:30:01 CET 2009


Update of /home/projects/jpackage/cvs/dist/maven-surefire/devel
In directory ryu.zarb.org:/tmp/cvs-serv8419

Modified Files:
	.cvsignore maven-surefire-jpp-depmap.xml maven-surefire.spec 
	sources 
Added Files:
	maven-surefire-2.3-CmdShell.patch 
	maven-surefire-2.3-CommandShell.patch 
	maven-surefire-2.3-Commandline.patch 
	maven-surefire-2.3-junit4-pom.patch 
	maven-surefire-2.3-testng-TestNGDirectoryTestSuite.patch 
	maven-surefire-2.3-testng-TestNGXmlTestSuite.patch 
Log Message:
update to 2.3.1

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-surefire/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	6 Jan 2009 07:31:41 -0000	1.3
--- .cvsignore	23 Mar 2009 02:29:58 -0000	1.4
***************
*** 1 ****
! maven-surefire-2.3-src.tar.gz
--- 1,2 ----
! maven-surefire-2.3.1.tar.gz
! maven-surefire-2.3.1-build.tar.gz

--- NEW FILE: maven-surefire-2.3-testng-TestNGDirectoryTestSuite.patch ---
--- surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java.sav5	2007-12-10 17:02:06.000000000 +0100
+++ surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java	2007-12-10 17:03:32.000000000 +0100
@@ -103,7 +103,11 @@
         }
 
         XmlSuite suite = new XmlSuite();
-        suite.setParallel( parallel );
+        if ( parallel ) {
+            suite.setParallel( "tests" );
+        } else {
+            suite.setParallel( "none" );
+        }
         suite.setThreadCount( threadCount );
 
         createXmlTest( suite, testSet );
@@ -120,7 +124,11 @@
         }
 
         XmlSuite suite = new XmlSuite();
-        suite.setParallel( parallel );
+        if ( parallel ) {
+            suite.setParallel( "tests" );
+        } else {
+            suite.setParallel( "none" );
+        }
         suite.setThreadCount( threadCount );
 
         for ( Iterator i = testSets.values().iterator(); i.hasNext(); )

--- NEW FILE: maven-surefire-2.3-CommandShell.patch ---
--- surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CommandShell.java.sav1	2007-12-10 13:10:47.000000000 +0100
+++ surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CommandShell.java	2007-12-10 13:11:12.000000000 +0100
@@ -30,7 +30,7 @@
  * @author <a href="mailto:carlos at apache.org">Carlos Sanchez</a>
  */
 public class CommandShell
-    extends Shell
+    extends org.codehaus.plexus.util.cli.shell.Shell
 {
     public CommandShell()
     {

--- NEW FILE: maven-surefire-2.3-CmdShell.patch ---
--- surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CmdShell.java.sav2	2007-12-10 13:14:26.000000000 +0100
+++ surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CmdShell.java	2007-12-10 13:14:45.000000000 +0100
@@ -33,7 +33,7 @@
  * @author <a href="mailto:carlos at apache.org">Carlos Sanchez</a>
  */
 public class CmdShell
-    extends Shell
+    extends org.codehaus.plexus.util.cli.shell.Shell
 {
     public CmdShell()
     {

Index: maven-surefire-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-surefire/devel/maven-surefire-jpp-depmap.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven-surefire-jpp-depmap.xml	4 Mar 2009 23:31:04 -0000	1.5
--- maven-surefire-jpp-depmap.xml	23 Mar 2009 02:29:58 -0000	1.6
***************
*** 2,23 ****
    <dependency>
  	<maven>
! 	  <groupId>jmock</groupId>
! 	  <artifactId>jmock</artifactId>
! 	  <version>1.0.1</version>
  	</maven>
    </dependency>
-     
      <dependency>
!         <maven>
!             <groupId>org.apache.maven</groupId>
!             <artifactId>maven-parent</artifactId>
!             <version>5</version>
!         </maven>
!         <jpp>
!             <groupId>JPP/maven2</groupId>
!             <artifactId>parent</artifactId>
!             <version>1</version>
!         </jpp>
      </dependency>
  
  </dependencies>
--- 2,77 ----
    <dependency>
  	<maven>
! 	  <groupId>junit</groupId>
! 	  <artifactId>junit4</artifactId>
! 	  <version>4.0</version>
  	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>junit4</artifactId>
+ 	  <version>4.3.1</version>
+ 	</jpp>
+   </dependency>
+   <dependency>
+ 	<maven>
+ 	  <groupId>junit</groupId>
+ 	  <artifactId>junit</artifactId>
+ 	  <version>3.8.1</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>junit</artifactId>
+ 	  <version>3.8.2</version>
+ 	</jpp>
+   </dependency>
+   <dependency>
+ 	<maven>
+ 	  <groupId>org.testng</groupId>
+ 	  <artifactId>testng</artifactId>
+ 	  <version>5.1</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>testng-jdk15</artifactId>
+ 	  <version>5.6</version>
+ 	</jpp>
+   </dependency>
+   <dependency>
+ 	<maven>
+ 	  <groupId>javax.servlet</groupId>
+ 	  <artifactId>servlet-api</artifactId>
+ 	  <version>2.5</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>servlet_2_5_api</artifactId>
+ 	  <version>2.5</version>
+ 	</jpp>
    </dependency>
      <dependency>
!       <maven>
!         <groupId>javax.servlet</groupId>
!         <artifactId>servlet-api</artifactId>
!         <version>2.3</version>
!       </maven>
!       <jpp>
!         <groupId>JPP</groupId>
!         <artifactId>tomcat5-servlet-2.4-api</artifactId>
!         <version>2.4</version>
!       </jpp>
      </dependency>
  
+   <dependency>
+ 	<maven>
+ 	  <groupId>jmock</groupId>
+ 	  <artifactId>jmock</artifactId>
+ 	  <version>1.0.1</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>jmock</artifactId>
+ 	  <version>1.2.0</version>
+ 	</jpp>
+   </dependency>
+ <!--
+ -->
  </dependencies>

Index: maven-surefire.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** maven-surefire.spec	19 Mar 2009 08:14:26 -0000	1.9
--- maven-surefire.spec	23 Mar 2009 02:29:58 -0000	1.10
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
***************
*** 29,40 ****
  #
  
! %define _with_gcj_support 1
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
! %define gcj_support 0
  
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  Name:           maven-surefire
--- 29,40 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without maven
! 
! %define section free
  
  Name:           maven-surefire
***************
*** 42,56 ****
  Release:        4%{?dist}
  Epoch:          0
! Summary:        Test framework project
! License:        Apache Software License
  Group:          Development/Java
  URL:            http://maven.apache.org/surefire/
  # svn export http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.3.1/ maven-surefire-2.3.1
- #Source0:        %{name}-%{version}-src.tar.gz
- ##Source1:        %{name}-settings.xml
- #Source2:        %{name}-build.xml
- #Source3:        %{name}-booter-build.xml
- #Source4:        %{name}-jpp-depmap.xml
- 
  Source0:        %{name}-%{version}.tar.gz
  Source1:        %{name}-settings.xml
--- 42,50 ----
  Release:        4%{?dist}
  Epoch:          0
! Summary:        Surefire is a test framework project.
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/surefire/
  # svn export http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.3.1/ maven-surefire-2.3.1
  Source0:        %{name}-%{version}.tar.gz
  Source1:        %{name}-settings.xml
***************
*** 63,182 ****
  Patch4:         maven-surefire-2.3-testng-TestNGXmlTestSuite.patch
  Patch5:         maven-surefire-2.3-testng-TestNGDirectoryTestSuite.patch
! 
! 
! #Patch0:         %{name}-plexus12.patch
! #Patch1:         %{name}-buildonlyjunit3.patch
! 
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildRequires:  ant
! BuildRequires:  ant-nodeps
! BuildRequires:  classworlds
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  junit >= 3.8.2
  BuildRequires:  plexus-utils
! 
! %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4
! #BuildRequires:  maven2-common-poms
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
- BuildRequires:  maven2-plugin-resources
- BuildRequires:	maven2-plugin-site
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven-shared-plugin-testing-harness
- BuildRequires:  plexus-containers-component-api >= 1.0-0.a34
- BuildRequires:  tomcat5
- BuildRequires:  tomcat5-servlet-2.4-api
- BuildRequires:  excalibur-avalon-logkit
- BuildRequires:  excalibur-avalon-framework
  %endif
  
! Requires:       classworlds
! Requires:       maven2
! Requires:       junit
! Requires:       plexus-utils
! 
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
  
! Obsoletes:      maven-surefire-booter <= 0:1.5.3
! Provides:       maven-surefire-booter = %{epoch}:%{version}-%{release}
  
! %description
! Surefire is a test framework project.
  
! %package maven-plugin
! Summary:                Surefire plugin for maven
! Group:                  Development/Java
! Requires:               maven-surefire = %{epoch}:%{version}-%{release}
! Obsoletes:              maven2-plugin-surefire <= 0:2.0.4
! Provides :              maven2-plugin-surefire = %{epoch}:%{version}-%{release}
  
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
  
! %description maven-plugin
! Maven surefire plugin for running tests via the surefire framework.
  
! %package report-maven-plugin
! Summary:                Surefire reports plugin for maven
! Group:                  Development/Java
! Requires:               maven-surefire = %{epoch}:%{version}-%{release}
! Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4
! Provides :              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
  
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
  
! %description report-maven-plugin
! Plugin for generating reports from surefire test runs.
  
! %package provider-junit
! Summary:                JUnit3 provider for Maven Surefire
! Group:                  Development/Java
! Requires:               maven-surefire = %{epoch}:%{version}-%{release}
! Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4
! Provides :              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
  
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
  
! %description provider-junit
! JUnit3 provider for Maven Surefire.
  
  %package javadoc
! Summary:          Javadoc for %{name}
! Group:            Development/Documentation
! Requires(post):   /bin/rm,/bin/ln
! Requires(postun): /bin/rm
  
  %description javadoc
! Javadoc for %{name}.
  
  %prep
! %setup -q -n %{name}
  %if %without maven
  %setup -q -T -D -a 3
  %endif
! 
  
  sed -i -e s:"private static void failSame(":"public static void failSame(":g \
--- 57,214 ----
  Patch4:         maven-surefire-2.3-testng-TestNGXmlTestSuite.patch
  Patch5:         maven-surefire-2.3-testng-TestNGDirectoryTestSuite.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       classworlds
! Requires:       plexus-utils
! Requires:       junit4
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
! BuildRequires:  ant-junit
! BuildRequires:  bsh
! BuildRequires:  
  BuildRequires:  junit >= 3.8.2
+ BuildRequires:  junit4
+ BuildRequires:  maven2-bootstrap
+ BuildRequires:  maven-doxia
+ BuildRequires:  maven-shared-reporting-impl
  BuildRequires:  plexus-utils
! BuildRequires:  testng
! %if %with maven
! BuildRequires:  maven2 >= 0:2.0.7
! BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-plugin
+ BuildRequires:  maven2-plugin-resources
+ BuildRequires:  maven2-plugin-site
+ BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven-shared-plugin-testing-harness
  %endif
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
! %description
! Surefire is a test framework project.
  
! %package booter
! Summary:         Booter for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        plexus-archiver
! Requires:        plexus-containers-component-api
! Requires:        plexus-utils
  
! %description booter
! %{summary}.
  
! %package junit
! Summary:         JUnit3 Runner for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        junit
! Obsoletes:       maven-surefire-provider-junit <= 2.3
! Provides:        maven-surefire-provider-junit = %{epoch}:%{version}-%{release}
  
! %description junit
! %{summary}.
  
! %package junit4
! Summary:         JUnit4 Runner for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        junit4
  
! %description junit4
! %{summary}.
  
! %package testng
! Summary:         TestNG Runner for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        plexus-utils
! Requires:        testng
  
! %description testng
! %{summary}.
  
! %package plugin
! Summary:         Maven2 Plugin for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        %{name}-booter = %{epoch}:%{version}-%{release}
! Requires:        %{name}-junit = %{epoch}:%{version}-%{release}
! Requires:        %{name}-junit4 = %{epoch}:%{version}-%{release}
! Requires:        %{name}-testng = %{epoch}:%{version}-%{release}
! Requires:        maven2-bootstrap
! Requires:        plexus-utils
! Obsoletes:       maven2-plugin-surefire < 0:2.0.7
! Provides:        maven2-plugin-surefire = %{epoch}:%{version}-%{release}
  
! %description plugin
! %{summary}.
  
! %package report-plugin
! Summary:         Maven2 Report Plugin for %{name}
! Group:           Development/Java
! Requires:        %{name} = %{epoch}:%{version}-%{release}
! Requires:        %{name}-booter = %{epoch}:%{version}-%{release}
! Requires:        maven2-bootstrap
! Requires:        maven-doxia
! Requires:        plexus-utils
! Obsoletes:       maven2-plugin-surefire-report < 0:2.0.7
! Provides:        maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
  
! %description report-plugin
! %{summary}.
  
  %package javadoc
! Summary:        Javadoc for %{name} API
! Group:          Development/Documentation
  
  %description javadoc
! %{summary}.
! 
! %package booter-javadoc
! Summary:        Javadoc for %{name} Booter
! Group:          Development/Documentation
! 
! %description booter-javadoc
! %{summary}.
! 
! %package junit-javadoc
! Summary:        Javadoc for %{name} JUnit3 Runner
! Group:          Development/Documentation
! 
! %description junit-javadoc
! %{summary}.
! 
! %package junit4-javadoc
! Summary:        Javadoc for %{name} JUnit4 Runner
! Group:          Development/Documentation
! 
! %description junit4-javadoc
! %{summary}.
! 
! %package testng-javadoc
! Summary:        Javadoc for %{name} TestNG Runner
! Group:          Development/Documentation
! 
! %description testng-javadoc
! %{summary}.
  
  %prep
! %setup -q
  %if %without maven
  %setup -q -T -D -a 3
  %endif
! cp -p %{SOURCE1} settings.xml
! sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
! sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
  
  sed -i -e s:"private static void failSame(":"public static void failSame(":g \
***************
*** 312,468 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire maven-surefire-plugin 2.3 JPP/maven-surefire maven-plugin
! install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-maven-plugin.pom
  
! install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire maven-surefire-report-plugin 2.3 JPP/maven-surefire report-maven-plugin
! install -pm 644 maven-surefire-report-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-report-maven-plugin.pom
  
! install -pm 644 surefire-api/target/surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-api 2.3 JPP/maven-surefire api
! install -pm 644 surefire-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-api.pom
  
! install -pm 644 surefire-booter/target/surefire-booter-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-booter 2.3 JPP/maven-surefire booter
! install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-booter.pom
  
! install -pm 644 surefire-providers/surefire-junit/target/surefire-junit-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-junit 2.3 JPP/maven-surefire junit
! install -pm 644 surefire-providers/surefire-junit/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-junit.pom
  
! %add_to_maven_depmap org.apache.maven.surefire providers 2.3 JPP/maven-surefire providers
! install -pm 644 surefire-providers/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-providers.pom
  
! (cd $RPM_BUILD_ROOT%{_javadir}/maven-surefire && for jar in *-%{version}*; \
!   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
- %if %{with_maven}
- # javadoc
  
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/maven-plugin
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/report-maven-plugin
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/api
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/booter
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit
! 
! cp -pr maven-surefire-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/maven-plugin/
! cp -pr maven-surefire-report-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/report-maven-plugin/
! cp -pr surefire-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/api/
! cp -pr surefire-booter/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/booter/
! cp -pr surefire-providers/surefire-junit/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit/
  
! %endif
  
- # Create compatibility links
- ln -s %{_javadir}/maven-surefire/api.jar \
-       $RPM_BUILD_ROOT%{_javadir}/maven-surefire/surefire.jar
  
! install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
! ln -s %{_javadir}/maven-surefire/maven-surefire-plugin.jar \
!       $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-plugin.jar
  
! ln -s %{_javadir}/maven-surefire/maven-surefire-report-plugin.jar \
!       $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar
  
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
! %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
- %if %{gcj_support}
  %post
- 
  %update_maven_depmap
  
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- 
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
- %if %{gcj_support}
  %postun
- 
  %update_maven_depmap
  
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
  %files
! %defattr(-,root,root,-)
  %dir %{_javadir}/maven-surefire
  %{_javadir}/maven-surefire/api*
- %{_javadir}/maven-surefire/booter*
  %{_javadir}/maven-surefire/surefire.jar
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  
! %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/api*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/booter*
! %endif
  
! %files maven-plugin
! %{_javadir}/maven-surefire/maven-plugin*
! %dir %{_datadir}/maven2/plugins
! %{_datadir}/maven2/plugins/surefire-plugin.jar
! %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin*
! %endif
  
! %files report-maven-plugin
! %{_javadir}/maven-surefire/report-maven-plugin*
  %dir %{_datadir}/maven2/plugins
! %{_datadir}/maven2/plugins/surefire-report-plugin.jar
! %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/report-maven-plugin*
! %endif
  
! %files provider-junit
! %{_javadir}/maven-surefire/junit*
! %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/junit*
! %endif
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  
  %changelog
! * Thu Mar 05 2009 Yong Yang <yyang at redhat.com> - 0:2.3-2
! - Adding missing BRs
  
! * Wed Mar 04 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.3-1jpp.1
! - Update to 2.3
! - Adding missing BR's
  
! * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.5.3-2jpp.2
! - Build with maven
  
! * Mon Feb 26 2007 Tania Bento <tbento at redhat.com> 0:1.5.3-2jpp.1
! - Fixed %%Release.
! - Fixed %%BuildRoot.
! - Removed %%Vendor.
! - Removed %%Distribution.
! - Removed period at the end of %%Summary.
! - Removed %%post and %%postun sections for javadoc.
! - Removed %%post and %%postun sections for booter-javadoc.
! - Added gcj support option.
! - Fixed instructions on how to generate source drop.
  
  * Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.5.3-2jpp
--- 344,509 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -m 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-surefire.pom
! %add_to_maven_depmap org.apache.maven.surefire surefire %{version} JPP/maven-surefire surefire
  
! install -m 644 surefire-api/target/surefire-api-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-api %{version} JPP/maven-surefire api
! install -m 644 surefire-api/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-api.pom
  
! install -m 644 surefire-booter/target/surefire-booter-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-booter %{version} JPP/maven-surefire booter
! install -m 644 surefire-booter/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-booter.pom
  
! install -m 644 surefire-providers/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-providers.pom
! %add_to_maven_depmap org.apache.maven.surefire surefire-providers %{version} JPP/maven-surefire providers
  
! install -m 644 surefire-providers/surefire-junit4/target/surefire-junit4-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-junit4 %{version} JPP/maven-surefire junit4
! install -m 644 surefire-providers/surefire-junit4/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-junit4.pom
  
! install -m 644 surefire-providers/surefire-junit/target/surefire-junit-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-junit %{version} JPP/maven-surefire junit
! install -m 644 surefire-providers/surefire-junit/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-junit.pom
  
! install -m 644 surefire-providers/surefire-testng/target/surefire-testng-%{version}.jar \
!     $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng-%{version}.jar
! %add_to_maven_depmap org.apache.maven.surefire surefire-testng %{version} JPP/maven-surefire testng
! install -m 644 surefire-providers/surefire-testng/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-testng.pom
  
  
! install -m 644 maven-surefire-plugin/target/maven-surefire-plugin-%{version}.jar \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-plugin-%{version}.jar
! %add_to_maven_depmap org.apache.maven.plugins maven-surefire-plugin %{version} JPP/maven2/plugins surefire-plugin
! install -m 644 maven-surefire-plugin/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
  
! install -m 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-%{version}.jar \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin-%{version}.jar
! %add_to_maven_depmap org.apache.maven.plugins maven-surefire-report-plugin %{version} JPP/maven2/plugins surefire-report-plugin
! install -m 644 maven-surefire-report-plugin/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-report-plugin.pom
  
  
! (cd $RPM_BUILD_ROOT%{_javadir}/maven-surefire && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir}/maven-surefire && ln -sf api.jar surefire.jar)
! (cd $RPM_BUILD_ROOT%{_datadir}/maven2/plugins && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! # javadoc
  
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-api-%{version}
! cp -pr surefire-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-api-%{version}
! ln -s %{name}-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-api
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-booter-%{version}
! cp -pr surefire-booter/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-booter-%{version}
! ln -s %{name}-booter-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-booter
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit4-%{version}
! cp -pr surefire-providers/surefire-junit4/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit4-%{version}
! ln -s %{name}-junit4-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit4
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit-%{version}
! cp -pr surefire-providers/surefire-junit/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit-%{version}
! ln -s %{name}-junit-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-junit
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testng-%{version}
! cp -pr surefire-providers/surefire-testng/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testng-%{version}
! ln -s %{name}-testng-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testng
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
  
  %files
! %defattr(0644,root,root,0755)
  %dir %{_javadir}/maven-surefire
  %{_javadir}/maven-surefire/api*
  %{_javadir}/maven-surefire/surefire.jar
! %dir %{_datadir}/maven2
! %dir %{_datadir}/maven2/poms
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
! %files booter
! %defattr(0644,root,root,0755)
! %{_javadir}/maven-surefire/booter*
  
! %files junit
! %defattr(0644,root,root,0755)
! %{_javadir}/maven-surefire/junit-%{version}.jar
! %{_javadir}/maven-surefire/junit.jar
  
! %files junit4
! %defattr(0644,root,root,0755)
! %{_javadir}/maven-surefire/junit4-%{version}.jar
! %{_javadir}/maven-surefire/junit4.jar
! 
! %files testng
! %defattr(0644,root,root,0755)
! %{_javadir}/maven-surefire/testng*
! 
! %files plugin
! %defattr(0644,root,root,0755)
  %dir %{_datadir}/maven2/plugins
! %{_datadir}/maven2/plugins/surefire-plugin*
  
! %files report-plugin
! %defattr(0644,root,root,0755)
! %dir %{_datadir}/maven2/plugins
! %{_datadir}/maven2/plugins/surefire-report-plugin*
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-surefire-api-%{version}
! %{_javadocdir}/maven-surefire-api
! 
! %files booter-javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-surefire-booter-%{version}
! %{_javadocdir}/maven-surefire-booter
! 
! %files junit-javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-surefire-junit-%{version}
! %{_javadocdir}/maven-surefire-junit
! 
! %files junit4-javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-surefire-junit4-%{version}
! %{_javadocdir}/maven-surefire-junit4
! 
! %files testng-javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-surefire-testng-%{version}
! %{_javadocdir}/maven-surefire-testng
  
  %changelog
! * Thu Dec 11 2008 David Walluck <dwalluck at redhat.com> 2.3.1-3
! - patch for command-line
! - fix javadocs
  
! * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 2.3.1-2
! - Auto rebuild for JPackage 5 in mock
  
! * Thu Nov 13 2008 Ralph Apel <r.apel at r-apel.de> 0:2.3.1-1.jpp5
! - 2.3.1
  
! * Fri Jan 25 2007 Ralph Apel <r.apel at r-apel.de> 0:2.3-1jpp
! - 2.3
  
  * Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.5.3-2jpp

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-surefire/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	6 Jan 2009 07:31:42 -0000	1.3
--- sources	23 Mar 2009 02:29:58 -0000	1.4
***************
*** 1 ****
! c6b313ed539c040f1a64115c6c150421  maven-surefire-2.3-src.tar.gz
--- 1,2 ----
! 1edface0f924c2786a664ff0cfd0aa4f  maven-surefire-2.3.1.tar.gz
! 66925e0ab096c5fda18c815c37e0aac8  maven-surefire-2.3.1-build.tar.gz

--- NEW FILE: maven-surefire-2.3-testng-TestNGXmlTestSuite.patch ---
--- surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java.sav4	2007-12-10 16:52:04.000000000 +0100
+++ surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java	2007-12-10 16:53:16.000000000 +0100
@@ -129,7 +129,7 @@
 
         try
         {
-            suite = new Parser( suiteFile.getAbsolutePath() ).parse();
+            suite = (XmlSuite) new Parser( suiteFile.getAbsolutePath() ).parse().toArray()[0];
         }
         catch ( IOException e )
         {

--- NEW FILE: maven-surefire-2.3-Commandline.patch ---
--- surefire-booter/src/main/java/org/apache/maven/surefire/booter/Commandline.java.sav0	2007-02-23 03:13:49.000000000 -0500
+++ surefire-booter/src/main/java/org/apache/maven/surefire/booter/Commandline.java	2008-12-11 15:50:25.820975270 -0500
@@ -21,7 +21,8 @@
 
 import org.apache.maven.surefire.booter.shell.CmdShell;
 import org.apache.maven.surefire.booter.shell.CommandShell;
-import org.apache.maven.surefire.booter.shell.Shell;
+//import org.apache.maven.surefire.booter.shell.Shell;
+import org.codehaus.plexus.util.cli.shell.Shell;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,77 +44,5 @@
     public Commandline()
     {
         super();
-        setDefaultShell();
     }
-
-    /**
-     * <p>Sets the shell or command-line interpretor for the detected operating system,
-     * and the shell arguments.</p>
-     */
-    private void setDefaultShell()
-    {
-        String os = System.getProperty( OS_NAME );
-
-        //If this is windows set the shell to command.com or cmd.exe with correct arguments.
-        if ( os.indexOf( WINDOWS ) != -1 )
-        {
-            if ( os.indexOf( "95" ) != -1 || os.indexOf( "98" ) != -1 || os.indexOf( "Me" ) != -1 )
-            {
-                setShell( new CommandShell() );
-            }
-            else
-            {
-                setShell( new CmdShell() );
-            }
-        }
-    }
-
-    /**
-     * Returns the shell, executable and all defined arguments.
-     */
-    public String[] getShellCommandline()
-    {
-
-        if ( getShell() == null )
-        {
-            if ( executable != null )
-            {
-                List commandLine = new ArrayList();
-                commandLine.add( executable );
-                commandLine.addAll( Arrays.asList( getArguments() ) );
-                return (String[]) commandLine.toArray( new String[0] );
-            }
-            else
-            {
-                return getArguments();
-            }
-
-        }
-        else
-        {
-            return (String[]) getShell().getShellCommandLine( executable, getArguments() ).toArray( new String[0] );
-        }
-    }
-
-    /**
-     * Allows to set the shell to be used in this command line.
-     *
-     * @param shell
-     * @since 1.2
-     */
-    public void setShell( Shell shell )
-    {
-        this.shell = shell;
-    }
-
-    /**
-     * Get the shell to be used in this command line.
-     *
-     * @since 1.2
-     */
-    public Shell getShell()
-    {
-        return shell;
-    }
-
 }

--- NEW FILE: maven-surefire-2.3-junit4-pom.patch ---
--- surefire-providers/surefire-junit4/pom.xml.sav3	2007-12-10 13:38:57.000000000 +0100
+++ surefire-providers/surefire-junit4/pom.xml	2007-12-10 13:39:15.000000000 +0100
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <artifactId>junit4</artifactId>
       <version>4.0</version>
     </dependency>
   </dependencies>




More information about the JPackage-commits mailing list