[Jpackage-commits] dist/qdox/devel .cvsignore, 1.2, 1.3 qdox-1.6.3-jpp-depmap.xml, 1.2, NONE qdox-1.6.3-pom.patch, 1.2, NONE qdox-1.9.2-jpp-depmap.xml, NONE, 1.1 qdox-1.9.2-pom.patch, NONE, 1.1 qdox-build.xml, 1.1, 1.2 qdox-lexer.patch, 1.1, NONE qdox.spec, 1.10, 1.11 sources, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 14 12:32:05 CET 2010


Update of /home/projects/jpackage/cvs/dist/qdox/devel
In directory ryu.zarb.org:/tmp/cvs-serv9681

Modified Files:
	.cvsignore qdox-build.xml qdox.spec sources 
Added Files:
	qdox-1.9.2-jpp-depmap.xml qdox-1.9.2-pom.patch 
Removed Files:
	qdox-1.6.3-jpp-depmap.xml qdox-1.6.3-pom.patch 
	qdox-lexer.patch 
Log Message:
1.9.2-1

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:40:59 -0000	1.2
--- .cvsignore	14 Dec 2010 11:32:03 -0000	1.3
***************
*** 1 ****
! qdox-1.6.3-src.tar.gz
--- 1 ----
! qdox-1.9.2.tar.gz

--- qdox-lexer.patch DELETED ---

--- NEW FILE: qdox-1.9.2-jpp-depmap.xml ---
<dependencies>
<!--
-->
  <dependency>
    <maven>
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-io</artifactId>
    <version>1.3.2</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>commons-io</artifactId>
    <version>1.4</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
    <groupId>org.freemarker</groupId>
    <artifactId>freemarker</artifactId>
    <version>2.3.13</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>freemarker</artifactId>
    <version>2.3.15</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
    <groupId>javax.annotation</groupId>
    <artifactId>jsr250-api</artifactId>
    <version>1.0</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>annotation_1_0_api</artifactId>
    <version>1.0</version>
    </jpp>
  </dependency>


</dependencies>

--- qdox-1.6.3-pom.patch DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:40:59 -0000	1.2
--- sources	14 Dec 2010 11:32:03 -0000	1.3
***************
*** 1 ****
! 5ee8bf502ec7a93a439ecc562b1b305d  qdox-1.6.3-src.tar.gz
--- 1 ----
! 5ba676a5e08110a3edd9e1e0ae6e4e91  qdox-1.9.2.tar.gz

Index: qdox.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox/devel/qdox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** qdox.spec	17 Sep 2010 09:20:20 -0000	1.10
--- qdox.spec	14 Dec 2010 11:32:03 -0000	1.11
***************
*** 41,62 ****
  Summary:        Extract class/interface/method definitions from sources
  Name:           qdox
! Version:        1.6.3
! Release:        5%{?dist}
  Epoch:          0
  License:        Apache-style Software License
  URL:            http://qdox.codehaus.org/
  Group:          Development/Libraries/Java
! Source0:        qdox-1.6.3-src.tar.gz
! # svn export http://svn.codehaus.org/qdox/tags/QDOX_1_6_3/ qdox-1.6.3
  
  Source1:        qdox-build.xml
  Source2:        qdox-settings.xml
! Source3:        qdox-1.6.3-jpp-depmap.xml
! Patch0:         qdox-1.6.3-pom.patch
! Patch1:         qdox-lexer.patch
  
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
--- 41,61 ----
  Summary:        Extract class/interface/method definitions from sources
  Name:           qdox
! Version:        1.9.2
! Release:        1%{?dist}
  Epoch:          0
  License:        Apache-style Software License
  URL:            http://qdox.codehaus.org/
  Group:          Development/Libraries/Java
! Source0:        qdox-1.9.2.tar.gz
! # svn export http://svn.codehaus.org/qdox/tags/qdox-1.9.2
  
  Source1:        qdox-build.xml
  Source2:        qdox-settings.xml
! Source3:        qdox-1.9.2-jpp-depmap.xml
! Patch0:         qdox-1.9.2-pom.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
***************
*** 78,82 ****
  BuildRequires:  maven2-common-poms >= 1.0
  BuildRequires:  jmock >= 0:1.0
- #BuildRequires:  mockobjects >= 0:0.09
  %endif
  BuildRequires:  excalibur-avalon-framework
--- 77,80 ----
***************
*** 86,91 ****
  
  Requires:          java >= 0:1.6.0
! Requires(post):    jpackage-utils >= 0:5.0.0
! Requires(postun):  jpackage-utils >= 0:5.0.0
  
  %if ! %{gcj_support}
--- 84,89 ----
  
  Requires:          java >= 0:1.6.0
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %if ! %{gcj_support}
***************
*** 111,116 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 109,112 ----
***************
*** 141,147 ****
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  
- 
  %patch0 -b .sav0
- %patch1 -b .sav1
  
  %build
--- 137,141 ----
***************
*** 152,155 ****
--- 146,151 ----
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
+ mkdir -p target/generated-site
+ cp -pr src/site/* target/generated-site
  
  mvn-jpp \
***************
*** 159,163 ****
          -Dmaven2.jpp.depmap.file=%{SOURCE3} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         ant:ant install javadoc:javadoc
  
  %else
--- 155,160 ----
          -Dmaven2.jpp.depmap.file=%{SOURCE3} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven.test.failure.ignore=true \
!         ant:ant install javadoc:javadoc site
  
  %else
***************
*** 195,204 ****
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
  mkdir -p $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
  
--- 192,201 ----
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
  mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/xsite/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
***************
*** 207,212 ****
  cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %if %{with_maven}
! rm -rf target/xsite/javadoc
! cp -pr target/xsite $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %endif
  
--- 204,208 ----
  cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %if %{with_maven}
! cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %endif
  
***************
*** 219,231 ****
  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
--- 215,218 ----
***************
*** 249,256 ****
  %defattr(0644,root,root,0755)
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_javadir}/%{name}.jar
! %{_javadir}/%{name}-%{version}.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 236,242 ----
  %defattr(0644,root,root,0755)
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 260,273 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %if %{with_maven}
  %files manual
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}/xsite
  %endif
  
  %changelog
  * Fri Sep 17 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5
  - Restore to devel
--- 246,261 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/*
  
  %if %{with_maven}
  %files manual
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}
  %endif
  
  %changelog
+ * Sat Dec 11 2010 Ralph Apel <r.apel at r-apel.de> 0:1.9.2-1
+ - 1.9.2
+ 
  * Fri Sep 17 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5
  - Restore to devel

--- NEW FILE: qdox-1.9.2-pom.patch ---
--- pom.xml.sav0	2009-07-09 01:22:33.000000000 +0200
+++ pom.xml	2010-12-10 17:44:04.000000000 +0100
@@ -310,6 +310,7 @@
           </execution>
         </executions>
       </plugin>
+<!--
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.3</version>
@@ -350,6 +351,7 @@
           </execution>
         </executions>
       </plugin>
+-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
@@ -528,4 +530,4 @@
   <properties>
     <xsite.sourceDirectoryPath>${project.build.directory}/generated-site</xsite.sourceDirectoryPath>
   </properties>
-</project>
\ No newline at end of file
+</project>

Index: qdox-build.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox/devel/qdox-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** qdox-build.xml	28 May 2008 19:40:59 -0000	1.1
--- qdox-build.xml	14 Dec 2010 11:32:03 -0000	1.2
***************
*** 2,6 ****
    <property name="maven.build.output" value="target/classes"/>
    <property name="maven.build.directory" value="target"/>
!   <property name="maven.build.final.name" value="qdox-1.6.3"/>
    <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
    <property name="maven.test.output" value="target/test-classes"/>
--- 2,6 ----
    <property name="maven.build.output" value="target/classes"/>
    <property name="maven.build.directory" value="target"/>
!   <property name="maven.build.final.name" value="qdox-1.9.2"/>
    <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
    <property name="maven.test.output" value="target/test-classes"/>
***************
*** 70,74 ****
      </tstamp>
      <property name="copyright" value="Copyright &copy;  . All Rights Reserved."></property>
!     <property name="title" value="QDox 1.6.3 API"></property>
      <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.thoughtworks.qdox.*">
        <classpath>
--- 70,74 ----
      </tstamp>
      <property name="copyright" value="Copyright &copy;  . All Rights Reserved."></property>
!     <property name="title" value="QDox 1.9.2 API"></property>
      <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.thoughtworks.qdox.*">
        <classpath>

--- qdox-1.6.3-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list