Commit 8742a8ed authored by Christopher Hoskin's avatar Christopher Hoskin Committed by Emmanuel Bourg

New upstream release (1.7).

* New upstream release (1.7). Update:
  - patches
  - build dependencies
  - Maven properties, rules and ignoreRules
  - debian/libdoxia-java.poms
parent 417d6d92
doxia (1.1.4-8) 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 <christopher.hoskin@gmail.com> Sun, 30 Oct 2016 18:03:43 +0000
-- Christopher Hoskin <christopher.hoskin@gmail.com> Sun, 30 Oct 2016 20:10:01 +0000
doxia (1.1.4-7) unstable; urgency=medium
......
......@@ -30,7 +30,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
......
......@@ -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
......@@ -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 * * * *
......@@ -2,4 +2,5 @@
# For example:
maven.test.skip=true
useJava5=true
project.build.sourceEncoding=UTF-8
......@@ -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/ * *
......@@ -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 );
......
From: Torsten Werner <twerner@debian.org>
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>
--
From: Torsten Werner <twerner@debian.org>
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>
--
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment