This is an automated email from the git hooks/post-receive script. grinorcole-guest pushed a commit to branch master in repository doxia.
commit d8566a916de450a50a44c0b7e3136e5930ea40b0 Author: Christopher Hoskin <[email protected]> Date: Sun Oct 30 21:59:58 2016 +0000 New upstream release (1.7). * New upstream release (1.7). Update: - patches - build dependencies - Maven properties, rules and ignoreRules - debian/libdoxia-java.poms --- debian/changelog | 9 +- debian/control | 4 +- debian/libdoxia-java.poms | 3 +- debian/maven.ignoreRules | 2 + debian/maven.properties | 3 +- debian/maven.rules | 3 +- debian/patches/0001-modello.patch | 6 +- .../0003-switch-to-plexus-component-metadata.patch | 151 --------------------- debian/patches/0007-disable-plexus-javadoc.patch | 28 ---- debian/patches/series | 2 - 10 files changed, 20 insertions(+), 191 deletions(-) diff --git a/debian/changelog b/debian/changelog index 905315c..1d843cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -doxia (1.1.4-7) UNRELEASED; urgency=medium +doxia (1.7-1) UNRELEASED; urgency=medium * Team upload. * Fix debian/watch + * New upstream release (1.7). Update: + - patches + - build dependencies + - Maven properties, rules and ignoreRules + - debian/libdoxia-java.poms - -- Christopher Hoskin <[email protected]> Sun, 30 Oct 2016 18:03:43 +0000 + -- Christopher Hoskin <[email protected]> Sun, 30 Oct 2016 20:10:01 +0000 doxia (1.1.4-6) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2c8d164..7231084 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,9 @@ Build-Depends-Indep: default-jdk-doc, libplexus-i18n-java, libplexus-utils-java, libplexus-utils-java-doc, - libxerces2-java + libxerces2-java, + libxmlunit-java, + libpegdown-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/doxia.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/doxia.git diff --git a/debian/libdoxia-java.poms b/debian/libdoxia-java.poms index 03cb895..df0bf70 100644 --- a/debian/libdoxia-java.poms +++ b/debian/libdoxia-java.poms @@ -42,5 +42,4 @@ doxia-modules/doxia-module-rtf/pom.xml --has-package-version --java-lib doxia-modules/doxia-module-twiki/pom.xml --has-package-version --java-lib doxia-modules/doxia-module-xdoc/pom.xml --has-package-version --java-lib doxia-modules/doxia-module-xhtml/pom.xml --has-package-version --java-lib -doxia-book/pom.xml --has-package-version --java-lib -doxia-maven-plugin/pom.xml --ignore +doxia-modules/doxia-module-markdown/pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index fe81c92..e556f55 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -18,3 +18,5 @@ org.apache.maven.plugins maven-project-info-reports-plugin * * * * org.codehaus.mojo clirr-maven-plugin * * * * org.apache.maven.doxia doxia-core test-jar * * * org.apache.maven.doxia doxia-test-docs * * * * +org.apache.rat apache-rat-plugin * * * * +org.apache.maven.plugins maven-scm-publish-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties index 4d5df60..ceef913 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -2,4 +2,5 @@ # For example: maven.test.skip=true - +useJava5=true +project.build.sourceEncoding=UTF-8 diff --git a/debian/maven.rules b/debian/maven.rules index 3af15d6..46ff836 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,7 +17,7 @@ # junit junit jar s/3\\..*/3.x/ com.lowagie itext jar 1.4 * * -junit junit jar s/3\..*/3.x/ * * +junit junit jar s/4\..*/4.x/ * * log4j log4j jar s/1\.2\..*/1.2.x/ * * org.apache.maven.doxia doxia-book jar s/.*/debian/ * * org.apache.maven.doxia doxia-core jar s/.*/debian/ * * @@ -38,3 +38,4 @@ org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * * org.apache.maven.doxia doxia-test-docs jar s/.*/debian/ * * org.apache.maven.doxia doxia pom s/.*/debian/ * * org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * +commons-collections commons-collections jar s/3\..*/3.x/ * * diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch index 7f3cd8d..5481fad 100644 --- a/debian/patches/0001-modello.patch +++ b/debian/patches/0001-modello.patch @@ -87,12 +87,12 @@ diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/ index 72d6789..7aa1d63 100644 --- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java +++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java -@@ -1219,7 +1219,7 @@ public class FoAggregateSink +@@ -1272,7 +1272,7 @@ public class FoAggregateSink att.addAttribute( "height", "0.3in" ); att.addAttribute( "text-align", "left" ); writeStartTag( BLOCK_TAG, att ); -- write( compName == null ? ( cover.getAuthor() == null ? "" : cover.getAuthor() ) : compName ); -+ write( compName == null ? ( cover.getAllAuthorNames() == null ? "" : cover.getAllAuthorNames() ) : compName ); +- text( compName == null ? ( cover.getAuthor() == null ? "" : cover.getAuthor() ) : compName ); ++ text( compName == null ? ( cover.getAllAuthorNames() == null ? "" : cover.getAllAuthorNames() ) : compName ); writeEndTag( BLOCK_TAG ); writeEndTag( TABLE_CELL_TAG ); diff --git a/debian/patches/0003-switch-to-plexus-component-metadata.patch b/debian/patches/0003-switch-to-plexus-component-metadata.patch deleted file mode 100644 index b244e35..0000000 --- a/debian/patches/0003-switch-to-plexus-component-metadata.patch +++ /dev/null @@ -1,151 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sat, 10 Sep 2011 00:06:13 +0200 -Subject: switch to plexus-component-metadata - -The old plexus-maven-plugin fails in merge-descriptors and has been replaced by -plexus-component-metadata. ---- - doxia-modules/doxia-module-apt/pom.xml | 11 ++++------- - doxia-modules/doxia-module-docbook-simple/pom.xml | 9 +++------ - doxia-modules/doxia-module-fml/pom.xml | 9 +++------ - doxia-modules/doxia-module-xdoc/pom.xml | 9 +++------ - pom.xml | 9 ++++----- - 5 files changed, 17 insertions(+), 30 deletions(-) - -diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml -index 010c559..a652578 100644 ---- a/doxia-modules/doxia-module-apt/pom.xml -+++ b/doxia-modules/doxia-module-apt/pom.xml -@@ -49,21 +49,18 @@ under the License. - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> --</project> -\ No newline at end of file -+</project> -diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml -index 64f671a..a3bf3b2 100644 ---- a/doxia-modules/doxia-module-docbook-simple/pom.xml -+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml -@@ -45,17 +45,14 @@ under the License. - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> -diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml -index 2afafe8..2a4b94f 100644 ---- a/doxia-modules/doxia-module-fml/pom.xml -+++ b/doxia-modules/doxia-module-fml/pom.xml -@@ -77,17 +77,14 @@ under the License. - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> -diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml -index f393ef8..947d1e2 100644 ---- a/doxia-modules/doxia-module-xdoc/pom.xml -+++ b/doxia-modules/doxia-module-xdoc/pom.xml -@@ -68,17 +68,14 @@ under the License. - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/components.xml</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> -diff --git a/pom.xml b/pom.xml -index 5f9dee3..160e2d4 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -271,9 +271,8 @@ under the License. - <!-- TODO need to upgrade to last version or Maven parent version --> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -- <!-- Version 1.3.8 makes the descriptor merges fail, probably due to PLX-409 --> -- <version>1.3.5</version> -+ <artifactId>plexus-component-metadata</artifactId> -+ <version>1.5.5</version> - </plugin> - <plugin> - <groupId>org.codehaus.modello</groupId> -@@ -328,11 +327,11 @@ under the License. - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> -- <goal>descriptor</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> --- diff --git a/debian/patches/0007-disable-plexus-javadoc.patch b/debian/patches/0007-disable-plexus-javadoc.patch deleted file mode 100644 index 3412e3b..0000000 --- a/debian/patches/0007-disable-plexus-javadoc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sat, 10 Sep 2011 00:15:06 +0200 -Subject: disable plexus-javadoc - -It has some unresolved dependency. ---- - pom.xml | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 22ad945..d18ba78 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -306,13 +306,6 @@ under the License. - <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link> - <link>http://junit.sourceforge.net/javadoc/</link> - </links> -- <tagletArtifacts> -- <tagletArtifact> -- <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-javadoc</artifactId> -- <version>1.0</version> -- </tagletArtifact> -- </tagletArtifacts> - </configuration> - </plugin> - <plugin> --- diff --git a/debian/patches/series b/debian/patches/series index 5798a98..ceebdf3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 0001-modello.patch 0002-add-version-to-plexus-container-default.patch -0003-switch-to-plexus-component-metadata.patch -0007-disable-plexus-javadoc.patch 0008-fop2-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
