[RPM (6.0)] [DIST generic] docbkx-2.0.14-1.jpp6
Ralph Apel <[email protected]> Thu, 24 Jan 2013 19:17:04 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : docbkx Relocations: (not relocatable) Version : 2.0.14 Vendor: JPackage Project Release : 1.jpp6 Build Date: Thu 24 Jan 2013 07:12:59 PM CET Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Java Source RPM: (none) Size : 930506 License: ASL 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://agilejava.com/docbkx/ Summary : Docbkx Tools Description : The Docbkx Tools project provides a number of tools for supporting DocBook in a Maven environment. This may seem odd to you, since 1) Maven 2 is supposed to support DocBook natively, relying on Doxia, and 2) there is already another DocBook plugin at mojo.codehaus.org. The thruth however is that DocBook support in Doxia is fairly limited, mainly because Doxia as a framework supports only a small fraction of the concepts found in DocBook. The subset of DocBook supported by Doxia is not even close to simplified DocBook. The DocBook plugin at mojo.codehaus.org is supporting a wider range of DocBook markup, and is in fact more similar to the DocBook tools provided with this project. There are however some significant differences. --------------- Ralph Apel <[email protected]> 0:2.0.14-1 - 2.0.14 --------------- docbkx.src: W: source-or-patch-not-bzipped docbkx-AbstractTransformerMojo.patch docbkx.src: W: source-or-patch-not-bzipped docbkx-pom.patch docbkx.src: W: source-or-patch-not-bzipped docbkx-samples-pom.patch docbkx.src: W: source-or-patch-not-bzipped docbkx-maven-plugin-components.patch docbkx.src: W: source-or-patch-not-bzipped docbkx-2.0.14.tgz docbkx.src: W: source-or-patch-not-bzipped docbkx-quickstart-archetype-pom.patch docbkx.src: W: source-or-patch-not-bzipped docbkx-maven-base-pom.patch docbkx.src: W: non-standard-group Development/Java docbkx.src: W: no-signature docbkx.src: W: name-repeated-in-summary Docbkx docbkx.src: W: invalid-license ASL 2.0 1 packages and 0 specfiles checked; 0 errors, 11 warnings. --------------- Index: docbkx-AbstractTransformerMojo.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/docbkx/docbkx-AbstractTransformerMojo.patch,v retrieving revision 1.2 diff -u -r1.2 docbkx-AbstractTransformerMojo.patch --- docbkx-AbstractTransformerMojo.patch 17 Nov 2010 23:32:17 -0000 1.2 +++ docbkx-AbstractTransformerMojo.patch 24 Jan 2013 18:17:02 -0000 @@ -1,19 +1,20 @@ ---- docbkx-maven-base/src/main/java/com/agilejava/docbkx/maven/AbstractTransformerMojo.java.sav0 2008-01-08 20:58:23.000000000 +0100 -+++ docbkx-maven-base/src/main/java/com/agilejava/docbkx/maven/AbstractTransformerMojo.java 2010-09-18 08:21:40.000000000 +0200 -@@ -23,6 +23,7 @@ - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Enumeration; -+import java.util.HashSet; - import java.util.Iterator; - import java.util.List; - import java.util.Map; -@@ -387,7 +388,7 @@ - Project antProject = antTasks.getProject(); - PropertyHelper propertyHelper = PropertyHelper - .getPropertyHelper(antProject); -- propertyHelper.setNext(new AntPropertyHelper(exprEvaluator, -+ propertyHelper.setNext(new AntPropertyHelper(exprEvaluator, new HashSet(), - getLog())); - DefaultLogger antLogger = new DefaultLogger(); - antLogger.setOutputPrintStream(System.out); +--- docbkx-maven-base/src/main/java/com/agilejava/docbkx/maven/AbstractTransformerMojo.java.sav1 2012-01-09 23:40:54.000000000 +0100 ++++ docbkx-maven-base/src/main/java/com/agilejava/docbkx/maven/AbstractTransformerMojo.java 2013-01-21 21:17:05.461814460 +0100 +@@ -28,7 +28,7 @@ + import org.apache.maven.plugin.AbstractMojo; + import org.apache.maven.plugin.MojoExecutionException; + import org.apache.maven.plugin.MojoFailureException; +-import org.apache.maven.plugin.antrun.AntPropertyHelper; ++import org.jvnet.maven.plugin.antrun.AntPropertyHelper; + import org.apache.maven.project.MavenProject; + import org.apache.tools.ant.DefaultLogger; + import org.apache.tools.ant.Project; +@@ -565,7 +565,7 @@ + "maven.expressionEvaluator"); + Project antProject = antTasks.getProject(); + PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(antProject); +- propertyHelper.setNext(new AntPropertyHelper(exprEvaluator, getLog())); ++ propertyHelper.setNext(new AntPropertyHelper(exprEvaluator, (Set) null, getLog())); + DefaultLogger antLogger = new DefaultLogger(); + antLogger.setOutputPrintStream(System.out); + antLogger.setErrorPrintStream(System.err); Index: docbkx-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/docbkx/docbkx-jpp-depmap.xml,v retrieving revision 1.2 diff -u -r1.2 docbkx-jpp-depmap.xml --- docbkx-jpp-depmap.xml 17 Nov 2010 23:32:17 -0000 1.2 +++ docbkx-jpp-depmap.xml 24 Jan 2013 18:17:02 -0000 @@ -1,55 +1,341 @@ <dependencies> - <dependency> +<dependency> + <maven> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.4</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.4</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>net.sourceforge.jchardet</groupId> + <artifactId>jchardet</artifactId> + <version>1.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>jchardet</artifactId> + <version>1.1</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>saxon</groupId> + <artifactId>saxon</artifactId> + <version>6.5.3</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>saxon</artifactId> + <version>6.5.5</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>jsp_2_0_api</artifactId> + <version>2.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>artifact</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>artifact-manager</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-test</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>artifact-test</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>core</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-error-diagnostics</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>error-diagnostics</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>model</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-monitor</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>monitor</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>plugin-api</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>plugin-descriptor</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-parameter-documenter</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>plugin-parameter-documenter</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-registry</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>plugin-registry</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>profile</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>project</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>repository-metadata</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>settings</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>reporting-api</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-script</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>script</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-script-ant</artifactId> + <version>2.0.8</version> + </maven> + <jpp> + <groupId>JPP/maven2</groupId> + <artifactId>script-ant</artifactId> + <version>2.0.8</version> + </jpp> +</dependency> + +<dependency> <maven> - <groupId>saxon</groupId> - <artifactId>saxon</artifactId> - <version>6.5.3</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven-script-beanshell</artifactId> + <version>2.0.8</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>saxon</artifactId> - <version>6.5.3</version> + <groupId>JPP/maven2</groupId> + <artifactId>script-beanshell</artifactId> + <version>2.0.8</version> </jpp> - </dependency> +</dependency> - <dependency> +<dependency> <maven> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>1.1</version> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting</artifactId> + <version>2.0.8</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>xml-commons-resolver11</artifactId> - <version>1.1</version> + <groupId>JPP/maven2</groupId> + <artifactId>reporting</artifactId> + <version>2.0.8</version> </jpp> - </dependency> +</dependency> - <dependency> +<dependency> <maven> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugins</artifactId> + <version>10</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>jsp_2_0_api</artifactId> - <version>2.0</version> + <groupId>JPP/maven2</groupId> + <artifactId>maven-plugins</artifactId> + <version>10</version> </jpp> - </dependency> +</dependency> - <dependency> +<dependency> <maven> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.0</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven</artifactId> + <version>2.0.8</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>xalan-j2-serializer</artifactId> - <version>2.7.1</version> + <groupId>JPP/maven2</groupId> + <artifactId>maven</artifactId> + <version>2.0.8</version> </jpp> - </dependency> +</dependency> </dependencies> Index: docbkx-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/docbkx/docbkx-pom.patch,v retrieving revision 1.1 diff -u -r1.1 docbkx-pom.patch --- docbkx-pom.patch 26 Feb 2008 13:19:37 -0000 1.1 +++ docbkx-pom.patch 24 Jan 2013 18:17:02 -0000 @@ -1,12 +1,25 @@ ---- pom.xml.sav 2008-02-22 14:47:15.000000000 +0100 -+++ pom.xml 2008-02-22 14:47:23.000000000 +0100 -@@ -66,7 +66,9 @@ - <module>docbkx-builder-maven-plugin</module> - <module>docbkx-maven-plugin</module> - <module>docbkx-maven-base</module> -+<!-- - <module>docbkx-samples</module> -+--> - <module>docbkx-fop-support</module> - </modules> - <distributionManagement> +--- pom.xml.sav 2013-01-21 16:38:30.656630940 +0100 ++++ pom.xml 2013-01-21 16:38:50.030628248 +0100 +@@ -60,6 +60,7 @@ + <target>1.4</target> + </configuration> + </plugin> ++ <!-- + <plugin> + <groupId>com.googlecode.maven-java-formatter-plugin</groupId> + <artifactId>maven-java-formatter-plugin</artifactId> +@@ -71,6 +72,7 @@ + <compilerTargetPlatform>1.4</compilerTargetPlatform> + </configuration> + </plugin> ++ --> + </plugins> + <extensions> + <extension> +@@ -149,4 +151,4 @@ + </dependency> + </dependencies> + </dependencyManagement> +-</project> +\ No newline at end of file ++</project> Index: docbkx.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/docbkx/docbkx.spec,v retrieving revision 1.3 diff -u -r1.3 docbkx.spec --- docbkx.spec 17 Nov 2010 23:32:17 -0000 1.3 +++ docbkx.spec 24 Jan 2013 18:17:02 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2010, JPackage Project +# Copyright (c) 2000-2013, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,35 +31,41 @@ %define section free Name: docbkx -Version: 2.0.8 -Release: 4%{?dist} +Version: 2.0.14 +Release: 1%{?dist} Epoch: 0 Summary: Docbkx Tools License: ASL 2.0 Group: Development/Java URL: http://agilejava.com/docbkx/ -# svn export http://docbkx-tools.googlecode.com/svn/tags/docbkx-2.0.8/ -Source0: docbkx-2.0.8.tar.gz +# svn export http://docbkx-tools.googlecode.com/svn/tags/docbkx-2.0.14/ +Source0: docbkx-2.0.14.tgz Source1: %{name}-settings.xml Source2: %{name}-jpp-depmap.xml -Source3: docbkx-fop-xsl-post.patch -Patch0: docbkx-AbstractTransformerMojo.patch -Patch1: docbkx-pom.patch -Patch2: docbkx-maven-plugin-pom.patch -Patch3: docbkx-docbkx-samples-pom.patch -Requires(post): jpackage-utils >= 0:1.7.3 -Requires(postun): jpackage-utils >= 0:1.7.3 +Patch0: docbkx-pom.patch +Patch1: docbkx-AbstractTransformerMojo.patch +Patch2: docbkx-maven-base-pom.patch +Patch3: docbkx-samples-pom.patch +Patch4: docbkx-maven-plugin-components.patch +Patch5: docbkx-quickstart-archetype-pom.patch +Requires(post): jpackage-utils >= 0:1.7.5 +Requires(postun): jpackage-utils >= 0:1.7.5 Requires: java >= 0:1.6.0 Requires: ant >= 0:1.7 Requires: excalibur-avalon-framework Requires: xmlgraphics-fop -Requires: jakarta-commons-el -Requires: jakarta-commons-io +Requires: apache-commons-el +Requires: apache-commons-io +Requires: docbook-xsl +Requires: docbook-xsl-saxon +Requires: docbook-xsl-webhelpindexer +Requires: groovy18 Requires: jaxen Requires: jpackage-utils Requires: jsp_2_0_api Requires: maven2 -Requires: maven2-plugin-antrun +Requires: maven-antrun-extended-plugin +Requires: maven-script-interpreter Requires: plexus-container-default Requires: plexus-utils Requires: saxon @@ -69,11 +75,11 @@ BuildRequires: ant >= 0:1.7 BuildRequires: ant-trax BuildRequires: java-devel >= 0:1.6.0 -BuildRequires: jpackage-utils >= 0:1.7.3 +BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: junit BuildRequires: maven2-common-poms BuildRequires: maven2 >= 0:2.0.8 -BuildRequires: maven2-plugin-antrun +BuildRequires: maven-antrun-extended-plugin BuildRequires: maven2-plugin-assembly BuildRequires: maven2-plugin-changes BuildRequires: maven2-plugin-compiler @@ -83,14 +89,21 @@ BuildRequires: maven2-plugin-plugin BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-site -BuildRequires: maven2-plugin-surefire -BuildRequires: maven2-plugin-surefire-report +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit3 +BuildRequires: maven-surefire-report-plugin +BuildRequires: maven-archetype2 +BuildRequires: maven-script-interpreter BuildRequires: maven-wagon BuildRequires: mojo-maven2-plugin-xml BuildRequires: excalibur-avalon-framework BuildRequires: xmlgraphics-fop -BuildRequires: jakarta-commons-el -BuildRequires: jakarta-commons-io +BuildRequires: apache-commons-el +BuildRequires: apache-commons-io +BuildRequires: docbook-xsl +BuildRequires: docbook-xsl-saxon +BuildRequires: docbook-xsl-webhelpindexer +BuildRequires: groovy18 BuildRequires: jaxen BuildRequires: jsp_2_0_api BuildRequires: plexus-archiver @@ -132,21 +145,16 @@ %prep %setup -q %patch0 -p0 -b .sav0 -%if 0 -# omit samples: they need mojo:xml-maven-plugin we don't have yet %patch1 -p0 -b .sav1 -%endif -# add excalibur-avalon-framework to docbkx-maven-plugin pom; should not be necessary in the future %patch2 -p0 -b .sav2 %patch3 -p0 -b .sav3 - -%{_bindir}/find -type f -name "*.jar" | %{_bindir}/xargs -t %{__rm} +%patch4 -p0 -b .sav4 +%patch5 -p0 -b .sav5 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 -ln -s $(build-classpath xslthl) docbkx-maven-plugin/lib/ mkdir external_repo ln -s %{_javadir} external_repo/JPP @@ -154,6 +162,7 @@ %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository export M2_SETTINGS=$(pwd)/settings.xml + %{_bindir}/mvn-jpp \ -e \ -s $M2_SETTINGS \ @@ -163,13 +172,6 @@ -Dmaven.test.failure.ignore=true \ install javadoc:javadoc -mkdir tmpd -pushd tmpd -%{jar} xf ../docbkx-maven-plugin/target/docbkx-maven-plugin-%{version}.jar -patch -p0 < %{SOURCE3} -%{jar} cmf META-INF/MANIFEST.MF ../docbkx-maven-plugin/target/docbkx-maven-plugin-%{version}.jar * -popd - %install rm -rf $RPM_BUILD_ROOT @@ -257,6 +259,9 @@ %{_javadocdir}/%{name} %changelog +* Wed Jan 23 2013 Ralph Apel <[email protected]> 0:2.0.14-1 +- 2.0.14 + * Fri Nov 12 2010 David Walluck <[email protected]> 0:2.0.8-4 - fix maven depmaps - add docbkx-docbkx-samples-pom.patch