[Jpackage-commits] dist/maven-release/JPP-6 maven-release-5-jpp-depmap.xml, 1.1, 1.2 maven-release.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Sun Dec 5 19:36:43 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-release/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv15225

Modified Files:
	maven-release-5-jpp-depmap.xml maven-release.spec 
Log Message:
5-2 adapted to modello-1.3

Index: maven-release-5-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-release/JPP-6/maven-release-5-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-release-5-jpp-depmap.xml	21 Jan 2009 16:58:52 -0000	1.1
--- maven-release-5-jpp-depmap.xml	5 Dec 2010 18:36:41 -0000	1.2
***************
*** 2,13 ****
     <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.2</version>
        </jpp>
     </dependency>
--- 2,26 ----
     <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>

Index: maven-release.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-release/JPP-6/maven-release.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-release.spec	21 Jan 2009 16:58:52 -0000	1.2
--- maven-release.spec	5 Dec 2010 18:36:41 -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.
  #
***************
*** 45,49 ****
  Name:           maven-release
  Version:        5
! Release:        1%{dist}
  Epoch:          0
  Summary:        Maven Release
--- 45,49 ----
  Name:           maven-release
  Version:        5
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Maven Release
***************
*** 62,66 ****
  Patch1:         %{name}-%{version}-ForkedMavenExecutorTest.patch
  Patch2:         %{name}-%{version}-plugin-pom.patch
! #Patch3:         %{name}-%{version}-manager-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--- 62,66 ----
  Patch1:         %{name}-%{version}-ForkedMavenExecutorTest.patch
  Patch2:         %{name}-%{version}-plugin-pom.patch
! Patch3:         %{name}-manager-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 68,76 ****
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! 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-antrun
--- 68,76 ----
  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
***************
*** 81,88 ****
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  modello-maven-plugin >= 0:1.0-0.a15.2
- BuildRequires:  maven-shared >= 0:8-0.p8.5
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
  %endif
--- 81,86 ----
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  modello-maven-plugin >= 0:1.0-0.a15.2
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
  %endif
***************
*** 91,109 ****
  BuildRequires:  jdom
  BuildRequires:  jmock
! BuildRequires:  maven2-bootstrap >= 0:2.0.7
  BuildRequires:  maven-scm >= 0:1.1
  BuildRequires:  maven-scm-test >= 0:1.1
- BuildRequires:  maven-shared-invoker
  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:  java >= 0:1.5.0
  Requires:  jaxen
  Requires:  jdom
! Requires:  maven2-bootstrap >= 0:2.0.7
  Requires:  maven-scm >= 0:1.1
  Requires:  plexus-container-default
--- 89,106 ----
  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
***************
*** 122,127 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 119,122 ----
***************
*** 132,138 ****
  cp %{SOURCE1} build.xml
  cp %{SOURCE3} settings.xml
- %if %{without_maven}
  gzip -dc %{SOURCE4} | tar xf -
- %endif
  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
--- 127,131 ----
***************
*** 141,145 ****
  %patch1 -b .sav1
  %patch2 -b .sav2
! #%patch3 -b .sav3
  
  %build
--- 134,138 ----
  %patch1 -b .sav1
  %patch2 -b .sav2
! %patch3 -b .sav3
  
  %build
***************
*** 152,171 ****
  
  export M2_SETTINGS=$(pwd)/settings.xml
- 
- mvn-jpp -e \
-         -s $M2_SETTINGS \
-         -Dmaven.test.failure.ignore=true \
-         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-         -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 \
--- 145,155 ----
  
  export M2_SETTINGS=$(pwd)/settings.xml
      mvn-jpp \
          -e \
          -s $M2_SETTINGS \
+         -Dmaven.test.failure.ignore=true \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         ant:ant install
      mvn-jpp \
          -e \
***************
*** 174,178 ****
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          javadoc:javadoc
- popd
  %else
  export CLASSPATH=$(build-classpath \
--- 158,161 ----
***************
*** 195,199 ****
  cglib-nodep \
  classworlds \
- commons-cli \
  jaxen \
  jdom \
--- 178,181 ----
***************
*** 210,214 ****
  maven2/settings \
  maven-scm \
- maven-shared/invoker \
  maven-shared/plugin-testing-harness \
  maven-wagon/provider-api \
--- 192,195 ----
***************
*** 272,284 ****
  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
--- 253,256 ----
***************
*** 289,302 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{name}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Thu Jan 15 2009 Ralph Apel <r.apel at r-apel.de> 0:5-1.jpp5
  - 5
--- 261,279 ----
  %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
+ * Thu Dec 02 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




More information about the JPackage-commits mailing list