This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit 0f5087afc79808d81049f8538572c2fc622f488f Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 20:54:38 2017 +0200 Refreshed the patches --- debian/patches/0001-modello.patch | 20 +++++++++++++++++ .../0003-switch-to-plexus-component-metadata.patch | 6 +++--- debian/patches/0007-disable-plexus-javadoc.patch | 25 ---------------------- debian/patches/series | 1 - 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch index dde681b..24350a6 100644 --- a/debian/patches/0001-modello.patch +++ b/debian/patches/0001-modello.patch @@ -92,3 +92,23 @@ Subject: modello writeEndTag( BLOCK_TAG ); writeEndTag( TABLE_CELL_TAG ); +--- a/doxia-core/pom.xml ++++ b/doxia-core/pom.xml +@@ -123,6 +123,7 @@ + <models> + <model>src/main/mdo/document.mdo</model> + </models> ++ <useJava5>true</useJava5> + </configuration> + </plugin> + </plugins> +--- a/doxia-modules/doxia-module-fml/pom.xml ++++ b/doxia-modules/doxia-module-fml/pom.xml +@@ -75,6 +75,7 @@ + <model>src/main/mdo/fml.mdo</model> + </models> + <version>1.0.0</version> ++ <useJava5>true</useJava5> + </configuration> + </execution> + </executions> diff --git a/debian/patches/0003-switch-to-plexus-component-metadata.patch b/debian/patches/0003-switch-to-plexus-component-metadata.patch index 1a8755a..69703e6 100644 --- a/debian/patches/0003-switch-to-plexus-component-metadata.patch +++ b/debian/patches/0003-switch-to-plexus-component-metadata.patch @@ -112,7 +112,7 @@ plexus-component-metadata. </executions> --- a/pom.xml +++ b/pom.xml -@@ -285,9 +285,8 @@ +@@ -322,9 +322,8 @@ </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -123,8 +123,8 @@ plexus-component-metadata. + <version>1.5.5</version> </plugin> <plugin> - <groupId>org.codehaus.modello</groupId> -@@ -333,11 +332,11 @@ + <groupId>org.codehaus.mojo</groupId> +@@ -341,11 +340,11 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> diff --git a/debian/patches/0007-disable-plexus-javadoc.patch b/debian/patches/0007-disable-plexus-javadoc.patch deleted file mode 100644 index 8467a67..0000000 --- a/debian/patches/0007-disable-plexus-javadoc.patch +++ /dev/null @@ -1,25 +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(-) - ---- a/pom.xml -+++ b/pom.xml -@@ -312,13 +312,6 @@ - <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-component-javadoc</artifactId> -- <version>1.5.5</version> -- </tagletArtifact> -- </tagletArtifacts> - </configuration> - </plugin> - <plugin> diff --git a/debian/patches/series b/debian/patches/series index 5798a98..ec26a01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 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
