[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-1.0-pom.patch, NONE, 1.1 maven-doxia-module-apt-pom.patch, NONE, 1.1 maven-doxia-module-xdoc-pom.patch, NONE, 1.1 maven-doxia.spec, 1.2, 1.3 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sun Dec 5 12:27:55 CET 2010


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

Modified Files:
	maven-doxia.spec sources 
Added Files:
	maven-doxia-1.0-pom.patch maven-doxia-module-apt-pom.patch 
	maven-doxia-module-xdoc-pom.patch 
Log Message:
1.0-1

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-doxia.spec	30 Sep 2010 17:37:01 -0000	1.2
--- maven-doxia.spec	5 Dec 2010 11:27:52 -0000	1.3
***************
*** 39,47 ****
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define namedversion 1.0-alpha-10
  
  Name:           maven-doxia
  Version:        1.0
! Release:        0.3.a10.9%{?dist}
  Epoch:          0
  Summary:        Content generation framework
--- 39,47 ----
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define namedversion 1.0
  
  Name:           maven-doxia
  Version:        1.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Content generation framework
***************
*** 50,57 ****
  URL:            http://maven.apache.org/doxia/
  
! # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-10
  #       maven-doxia/
! # tar czf maven-doxia-1.0.a10-src.tar.gz maven-doxia/
! Source0:        %{name}-%{version}a10.tar.gz
  
  Source1:        %{name}-decoration-model-build.xml
--- 50,57 ----
  URL:            http://maven.apache.org/doxia/
  
! # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0
  #       maven-doxia/
! # tar czf maven-doxia-1.0-src.tar.gz maven-doxia/
! Source0:        %{name}-%{version}-src.tar.gz
  
  Source1:        %{name}-decoration-model-build.xml
***************
*** 59,63 ****
  Source3:        %{name}-sink-api-build.xml
  Source4:        %{name}-site-renderer-build.xml
- Source6:        %{name}-jpp-depmap.xml
  
  # These files are taken from the doxia build itself, done with maven2
--- 59,62 ----
***************
*** 65,70 ****
  Source5:        %{name}-autogenerated-files.tar.gz
  
! Patch0:         %{name}-1.4compile.patch
! Patch1:         maven-doxia-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
--- 64,74 ----
  Source5:        %{name}-autogenerated-files.tar.gz
  
! Source6:        %{name}-jpp-depmap.xml
! Source7:        %{name}-settings.xml
! #Source8:        %{name}-plexus-containers.pom
! 
! Patch0:         maven-doxia-1.0-pom.patch
! Patch1:         maven-doxia-module-apt-pom.patch
! Patch2:         maven-doxia-module-xdoc-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
***************
*** 76,83 ****
  %endif
  
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  ant, ant-nodeps
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.4-9
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 80,88 ----
  %endif
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  ant >= 0:1.7.1
! BuildRequires:  ant-nodeps
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 87,96 ****
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-assembly
- BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-surefire 
  BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  plexus-maven-plugin >= 0:1.2-2
! BuildRequires:  qdox
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
  BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc 
--- 92,100 ----
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-surefire 
  BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  plexus-maven-plugin 
! BuildRequires:  qdox161
! BuildRequires:  modello-maven-plugin 
  BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc 
***************
*** 110,117 ****
  BuildRequires:  plexus-velocity
  BuildRequires:  velocity
- #BuildRequires:  bea-stax-api
- #BuildRequires:  stax-utils
- #BuildRequires:  stax_1_0_api
  BuildRequires:  itext <= 2.0
  
  Requires:       classworlds
--- 114,119 ----
  BuildRequires:  plexus-velocity
  BuildRequires:  velocity
  BuildRequires:  itext <= 2.0
+ BuildRequires:  xml-commons-jaxp-1.3-apis
  
  Requires:       classworlds
***************
*** 155,158 ****
--- 157,161 ----
  %setup -q -n %{name}
  
+ %if %{without_maven}
  # Extract autogenerated (by maven) files
  tar xzf %{SOURCE5}
***************
*** 160,186 ****
  rm -rf doxia-site-renderer
  
- %if %{without_maven}
- cp -p %{SOURCE1} doxia-decoration-model/build.xml
  cp -p %{SOURCE2} doxia-core/build.xml
  cp -p %{SOURCE3} doxia-sink-api/build.xml
- cp -p %{SOURCE4} doxia-site-renderer/build.xml
  %endif
  
! #%patch0 -b .sav
! %patch1 -p1 -b .sav1
  
  %build
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  
! %if %{with_maven}
  
!     mvn-jpp \
          -e \
          -Dmaven2.jpp.depmap.file=%{SOURCE6} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
!         install javadoc:javadoc
  
  %else
--- 163,204 ----
  rm -rf doxia-site-renderer
  
  cp -p %{SOURCE2} doxia-core/build.xml
  cp -p %{SOURCE3} doxia-sink-api/build.xml
  %endif
  
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! 
! cp %{SOURCE7} 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
  
  %build
  
+ %if %{with_maven}
+ 
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
! #cp %{SOURCE8} $MAVEN_REPO_LOCAL/JPP/maven2/poms/JPP.plexus-containers.pom 
  
! export M2_SETTINGS=$(pwd)/settings.xml
  
! mvn-jpp \
          -e \
+         -s ${M2_SETTINGS} \
          -Dmaven2.jpp.depmap.file=%{SOURCE6} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
!         install
! 
! mvn-jpp \
!         -e \
!         -s ${M2_SETTINGS} \
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Daggregate=true \
!         javadoc:javadoc
  
  %else
***************
*** 250,286 ****
  %add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia
  
- # Install parent javadocs
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
    do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
! # javadoc (all javadocs are contained in the main module docs dir used below)
! #install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}
! 
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! 
! for p in \
!         doxia-sink-api \
!         doxia-core \
!         doxia-modules/doxia-module-apt \
!         doxia-modules/doxia-module-confluence \
!         doxia-modules/doxia-module-docbook-simple \
!         doxia-modules/doxia-module-fml \
!         doxia-modules/doxia-module-itext \
!         doxia-modules/doxia-module-latex \
!         doxia-modules/doxia-module-rtf \
!         doxia-modules/doxia-module-twiki \
!         doxia-modules/doxia-module-xdoc \
!         doxia-modules/doxia-module-xhtml \
!         doxia-book \
! %if %{with_maven}
!         doxia-maven-plugin \
! %endif
!         ; do
!             project=$(basename $p)
!             install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
!             cp -pr $p/target/site/apidocs/* \
!                     $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
! done
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
--- 268,278 ----
  %add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia
  
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
    do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
! # Install javadocs
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
***************
*** 308,315 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{name}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
! 
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 300,307 ----
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 323,326 ****
--- 315,322 ----
  
  %changelog
+ * Mon Nov 29 2010 Ralph Apel <r.apel at r-apel.de> 1.0-1
+ - 1.0 final
+ - BR plexus-maven-plugin < 1.3.6 !!
+ 
  * Thu Sep 30 2010 Ralph Apel <r.apel at r-apel.de> 1.0-0.3.a10.9
  - relax some BRs

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	30 Sep 2010 17:31:20 -0000	1.1
--- sources	5 Dec 2010 11:27:52 -0000	1.2
***************
*** 1,2 ****
! 50ab7d300005b658a2d3ca5b24fb3317  maven-doxia-1.0a10.tar.gz
  6e164ac8be64cc3c3390c494daef1975  maven-doxia-autogenerated-files.tar.gz
--- 1,2 ----
! 9d7a334f7645577d0299352b8e3886e4  maven-doxia-1.0-src.tar.gz
  6e164ac8be64cc3c3390c494daef1975  maven-doxia-autogenerated-files.tar.gz

--- NEW FILE: maven-doxia-module-xdoc-pom.patch ---
--- doxia-modules/doxia-module-xdoc/pom.xml.sav	2010-11-28 14:03:37.000000000 +0100
+++ doxia-modules/doxia-module-xdoc/pom.xml	2010-11-28 14:03:43.000000000 +0100
@@ -62,7 +62,6 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>

--- NEW FILE: maven-doxia-1.0-pom.patch ---
--- pom.xml.sav	2010-11-28 21:23:35.000000000 +0100
+++ pom.xml	2010-11-28 21:23:56.000000000 +0100
@@ -168,6 +168,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

--- NEW FILE: maven-doxia-module-apt-pom.patch ---
--- doxia-modules/doxia-module-apt/pom.xml.sav	2010-11-28 13:52:44.000000000 +0100
+++ doxia-modules/doxia-module-apt/pom.xml	2010-11-28 13:52:54.000000000 +0100
@@ -53,7 +53,6 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
@@ -66,4 +65,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>




More information about the JPackage-commits mailing list