debian/0000775000000000000000000000000012322125062007163 5ustar debian/orig-tar.sh0000775000000000000000000000070412322042142011244 0ustar #!/bin/sh -e VERSION=$2 TAR=../doxia_$VERSION.orig.tar.gz DIR=doxia-$VERSION TAG=$(echo "doxia-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/${TAG}/ $DIR GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout mv $TAR $origDir && echo "moved $TAR to $origDir" fi debian/compat0000664000000000000000000000000212322042142010356 0ustar 7 debian/maven.cleanIgnoreRules0000664000000000000000000000150112322042142013446 0ustar # Maven clean ignore rules - ignore some Maven dependencies and plugins # during the clean phase of a Maven build # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM before mvn clean is called # junit junit jar s/3\\..*/3.x/ debian/maven.ignoreRules0000664000000000000000000000147112322042142012511 0ustar # Maven ignore rules - ignore some Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM # junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-project-info-reports-plugin * * * * debian/changelog0000664000000000000000000001222212322125040011030 0ustar doxia (1.1.4-1ubuntu4) trusty; urgency=medium * debian/rules: make sure we run in offline mode in the install:install-file step too by forcing maven in offline mode and specifying the local repository path in relation to the debian dir. (LP: #935070) -- Mathieu Trudel-Lapierre Fri, 11 Apr 2014 22:50:59 -0400 doxia (1.1.4-1ubuntu3) precise; urgency=low * debian/patches/0008-doxia-logging-deps.patch: slightly adjust java package dependencies in doxia-modules and doxia-book pom files to include doxia-logging-api. * debian/rules: import the jar files we just build back into the temporary maven repository so they're accessible as we try to build docs. * debian/control: add a Build-Depends on libmaven-install-plugin-java. -- Mathieu Trudel-Lapierre Wed, 23 Nov 2011 11:44:25 -0500 doxia (1.1.4-1ubuntu2) precise; urgency=low * debian/maven.properties: set maven to offline mode to avoid trying to download file from the web, which would fail the build. -- Mathieu Trudel-Lapierre Tue, 22 Nov 2011 15:00:40 -0500 doxia (1.1.4-1ubuntu1) precise; urgency=low * debian/control: add Build-Depends for libjaxen-java. -- Mathieu Trudel-Lapierre Mon, 21 Nov 2011 10:28:04 -0500 doxia (1.1.4-1) unstable; urgency=low [Gabriele Giacone] * Replaced classpath-doc/openjdk-6-doc with default-jdk-doc (Closes: #567272) [tony mancill] * Correct minor typos in long description (Closes: #612365) [ Torsten Werner ] * Newer but not newest upstream release. - Add Build-Depends: libhttpcore-java and switch to httpclient 4. - Do not remove maven-plugin from orig tarball. * Remove Trygve and Paul from Uploaders list. * Update Standards-Version: 3.9.2. * Improve short descriptions. * Use Maven to build the package. - Disable tests because there are issues with Maven finding a test-jar. - Add several (too many) patches. -- Torsten Werner Fri, 09 Sep 2011 17:33:03 +0200 doxia (1.1.2-1) unstable; urgency=low * New upstream release. * Standards-Version to 3.8.4. * Source format 3.0 (quilt) - removed quilt as build dependency - removed README.source -- Gabriele Giacone <1o5g4r8o@gmail.com> Fri, 26 Feb 2010 00:58:38 +0100 doxia (1.1.1-1) unstable; urgency=low * New upstream release. * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6). * Build-Depends on debhelper (>= 7). * Updated to Standards-Version 3.8.3. -- Michael Koch Thu, 01 Oct 2009 08:03:40 +0200 doxia (1.1-3) unstable; urgency=low * Upload to unstable. -- Torsten Werner Sun, 09 Aug 2009 10:47:26 +0200 doxia (1.1-2) experimental; urgency=low [ Ludovic Claude ] * Remove test dependencies from Maven POM descriptors [ Torsten Werner ] * Remove extra Build-Depends-Indep: ant. -- Torsten Werner Mon, 03 Aug 2009 21:33:12 +0200 doxia (1.1-1) experimental; urgency=low [ Ludovic Claude ] * New upstream version (Closes: #520760) * Add myself to uploaders * Add the Maven POMs to the package, * Add a Build-Depends-Indep dependency on maven-repo-helper * Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository * Remove the patch itext.diff, use a dependency on libitext1-java instead to keep using version 1.x of iText. * Add a dependency on fop and libcommons-configuration-java to build the new doxia-module-fo * Remove the dependency on libplexus-container-default-java, it's replaced by a transitive dependency on libplexus-containers-java (from libplexus-i18n-java) * Remove the dependency on classpath-doc on the java-doc package, it's not needed * Remove full text of the Apache 2.0 license from debian/copyright [ Torsten Werner ] * Add missing Build-Depends: libcommons-lang-java. * Upload to experimental. -- Torsten Werner Mon, 13 Jul 2009 19:55:39 +0200 doxia (1.0-alpha-11-4) unstable; urgency=low * Change debian/rules to really use default-jdk. (Closes: #535919) -- Torsten Werner Mon, 06 Jul 2009 22:12:34 +0200 doxia (1.0-alpha-11-3) unstable; urgency=low * Add missing Depends: ${misc:Depends}. * Change Section: java. * Update Standards-Version: 3.8.2 (no changes). * Switch to default-jdk. (Closes: #526278) -- Torsten Werner Wed, 01 Jul 2009 22:34:46 +0200 doxia (1.0-alpha-11-2) experimental; urgency=low * Improve patch itext.diff. -- Torsten Werner Fri, 28 Nov 2008 16:49:47 +0100 doxia (1.0-alpha-11-1) experimental; urgency=low [ Michael Koch ] * Added watch file. * Added Homepage, Vcs-Svn and Vcs-Browser fields. * Added myself to Uploaders. [ Torsten Werner ] * new upstream version * Added myself to Uploaders. * Updated Standards-Version to 3.8.0. * Add patch itext.diff. -- Torsten Werner Thu, 27 Nov 2008 20:37:58 +0100 doxia (1.0-alpha-7-1) unstable; urgency=low * Initial release. (Closes: #413554) -- Paul Cager Thu, 12 Jul 2007 10:11:17 +0100 debian/watch0000664000000000000000000000023612322042142010212 0ustar version=3 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ \ doxia-(\d.*)/ debian debian/orig-tar.sh debian/libdoxia-java-doc.doc-base.api0000664000000000000000000000043112322042142014602 0ustar Document: libdoxia-java Title: API Javadoc for Doxia Author: Doxia developers Abstract: This is the API Javadoc provided for the libdoxia-java library. Section: Programming Format: HTML Index: /usr/share/doc/libdoxia-java/api/index.html Files: /usr/share/doc/libdoxia-java/api/* debian/libdoxia-java-doc.install0000664000000000000000000000006712322042142014030 0ustar target/site/apidocs/* usr/share/doc/libdoxia-java/api debian/README.source0000664000000000000000000000044112322042142011336 0ustar Information about doxia ------------------------------ This package was debianized using the mh_make command from the maven-debian-helper package. The build system uses Maven but prevents it from downloading anything from the Internet, making the build compliant with the Debian policy. debian/source/0000775000000000000000000000000012322125050010460 5ustar debian/source/format0000664000000000000000000000001412322042142011666 0ustar 3.0 (quilt) debian/control0000664000000000000000000000532612322042142010571 0ustar Source: doxia Section: java Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Michael Koch , Torsten Werner Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-plugin-tools-java, libmaven-shade-plugin-java, libmodello-maven-plugin-java, libplexus-component-metadata-java, fop, libcommons-configuration-java, libcommons-lang-java, libdoxia-sitetools-java, libhttpclient-java, libitext1-java, liblog4j1.2-java, libmaven-doxia-tools-java, libmaven2-core-java, libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java, libxerces2-java, junit, libxerces2-java, default-jdk-doc, libcommons-configuration-java-doc, liblog4j1.2-java-doc, libmaven2-core-java-doc, libplexus-containers-java-doc, libplexus-utils-java-doc, libmaven-javadoc-plugin-java, libjaxen-java, libmaven-install-plugin-java Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia Homepage: http://maven.apache.org/doxia/ Package: libdoxia-java Architecture: all Depends: ${misc:Depends}, ${maven:Depends} Recommends: ${maven:OptionalDepends} Suggests: libdoxia-java-doc Description: powerful content generation framework Doxia is a content generation framework which aims to provide its users with powerful techniques for generating static and dynamic content. . Doxia can be used to generate static sites in addition to being incorporated into dynamic content generation systems like blogs, wikis and content management systems. . Doxia is used extensively by Maven and it powers the entire documentation system of Maven. It gives Maven the ability to take any document that Doxia supports and output it any format. Package: libdoxia-java-doc Architecture: all Section: doc Depends: ${misc:Depends}, ${maven:DocDepends} Recommends: ${maven:DocOptionalDepends} Suggests: libdoxia-java Description: Documentation for libdoxia-java Doxia is a content generation framework which aims to provide its users with powerful techniques for generating static and dynamic content. . Doxia can be used to generate static sites in addition to being incorporated into dynamic content generation systems like blogs, wikis and content management systems. . Doxia is used extensively by Maven and it powers the entire documentation system of Maven. It gives Maven the ability to take any document that Doxia supports and output it any format. . This package provides the API documentation for Doxia. debian/libdoxia-java.poms0000664000000000000000000000501512322056647012612 0ustar # List of POM files for the package # Format of this file is: # [option]* # where option can be: # --ignore: ignore this POM or # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact # --has-package-version: to indicate that the original version of the POM is the same as the upstream part # of the version for the package. # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, # it will be installed when using the command mh_install # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java # --dest-jar=: the destination for the real jar # it will be installed with mh_install. # --classifier=: Optional, the classifier for the jar. Empty by default. # --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created # temporarily for certain artifacts such as Javadoc jars. # pom.xml --no-parent --has-package-version doxia-logging-api/pom.xml --has-package-version doxia-sink-api/pom.xml --has-package-version doxia-test-docs/pom.xml --has-package-version doxia-core/pom.xml --has-package-version doxia-modules/pom.xml --has-package-version doxia-modules/doxia-module-apt/pom.xml --has-package-version doxia-modules/doxia-module-confluence/pom.xml --has-package-version doxia-modules/doxia-module-docbook-simple/pom.xml --has-package-version doxia-modules/doxia-module-fml/pom.xml --has-package-version doxia-modules/doxia-module-fo/pom.xml --has-package-version doxia-modules/doxia-module-itext/pom.xml --has-package-version doxia-modules/doxia-module-latex/pom.xml --has-package-version doxia-modules/doxia-module-rtf/pom.xml --has-package-version doxia-modules/doxia-module-twiki/pom.xml --has-package-version doxia-modules/doxia-module-xdoc/pom.xml --has-package-version doxia-modules/doxia-module-xhtml/pom.xml --has-package-version doxia-book/pom.xml --has-package-version # the maven plugin FTBFS but we have a separate source package #doxia-maven-plugin/pom.xml --has-package-version debian/maven.properties0000664000000000000000000000017712322042142012411 0ustar # Include here properties to pass to Maven during the build. # For example: maven.test.skip=true maven.settings.offline=true debian/rules0000775000000000000000000000153112322061766010255 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename IMPORT_BINARY_JARS = \ for jar in `find $(CURDIR)/doxia-* -name "*.jar" -print`; \ do \ artifact=$$(basename $$(dirname $$(echo $$jar | sed "s/\/target//"))); \ echo "--- $$artifact ---"; \ mvn install:install-file -o \ -DgroupId=org.apache.maven.doxia \ -DartifactId=$$artifact \ -Dversion=1.1.4 \ -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \ -DlocalRepositoryPath=$(CURDIR)/debian/tmp/usr/share/maven-repo \ -Dpackaging=jar -Dfile=$$jar; \ done; binary-jars: $(call IMPORT_BINARY_JARS) touch $@ after-mvn-build:: binary-jars debian/maven.publishedRules0000664000000000000000000000164212322042142013205 0ustar # Maven published rules - additional rules to publish, to help # the packaging work of Debian maintainers using mh_make # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ debian/copyright0000664000000000000000000000612112322042142011113 0ustar This package was debianized by Trygve Laugstol Paul Cager The Debian packaging is Copyright (c) 2007 Trygve Laugstol and is licensed under the GNU General Public License version 2. On Debian systems, the complete text of the GNU General Public License version 2 can be found in '/usr/share/common-licenses/GPL-2'. Doxia was downloaded from http://maven.apache.org/doxia/ Upstream Authors: The Apache Software Foundation Brett Porter Emmanuel Venisse James Taylor Lars Trieloff Vincent Siveton Juan F. Codagnone Rod Johnson Copyright: Copyright (C) 2002-2005 The Apache Software Foundation. Copyright (C) 2005 Juan F. Codagnone Copyright (C) 2005 Zauber License: A number of source files in this package have missing or invalid license declarations. Upstream have fixed this in their SVN, and the situation discussed in http://lists.debian.org/debian-devel/2007/07/msg00042.html The consensus was that it should not prevent the package entering Debian. The source files in question are: These files have no copyright statement or license declaration: doxia-sink-api/src/main/java/org/codehaus/doxia/sink/Sink.java doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java These files have "Copyright (c) 2005 Your Corporation. All Rights Reserved" with no license declaration: doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlock.java doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java Otherwise the following license declaration is made: Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. On Debian systems, the complete text of the Apache License version 2.0 can be found in /usr/share/common-licenses/Apache-2.0 debian/maven.rules0000664000000000000000000000413712322042142011347 0ustar # Maven rules - transform Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ com.lowagie itext jar 1.4 * * junit junit jar s/3\..*/3.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/ * * org.apache.maven.doxia doxia-logging-api jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-apt jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-confluence jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-docbook-simple jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-fml jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-fo jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-itext jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-latex jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-rtf jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-twiki jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-xdoc jar s/.*/debian/ * * org.apache.maven.doxia doxia-module-xhtml jar s/.*/debian/ * * org.apache.maven.doxia doxia-modules pom s/.*/debian/ * * 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/ * * debian/patches/0000775000000000000000000000000012322125050010607 5ustar debian/patches/0008-doxia-logging-deps.patch0000664000000000000000000000274412322042142015705 0ustar From: Mathieu Trudel-Lapierre Subject: Add doxia-logging-api to dependencies for doxia-modules and doxia-book Last-Update: 2011-11-23 It appears to be required at least for building documentation, otherwise the build fails as it tries to resolve org.apache.maven.doxia.logging.LogEnabled, among other symbols provided by doxia-logging-api. Index: doxia/doxia-modules/pom.xml =================================================================== --- doxia.orig/doxia-modules/pom.xml 2011-11-21 16:55:11.277656324 -0500 +++ doxia/doxia-modules/pom.xml 2011-11-23 10:58:55.255900098 -0500 @@ -50,6 +50,10 @@ org.apache.maven.doxia + doxia-logging-api + + + org.apache.maven.doxia doxia-core Index: doxia/doxia-book/pom.xml =================================================================== --- doxia.orig/doxia-book/pom.xml 2011-11-21 16:55:15.685656130 -0500 +++ doxia/doxia-book/pom.xml 2011-11-23 11:03:28.119915934 -0500 @@ -37,6 +37,10 @@ org.apache.maven.doxia + doxia-logging-api + + + org.apache.maven.doxia doxia-core debian/patches/0005-don-t-build-doxia-maven-plugin.patch0000664000000000000000000000105412322042142020032 0ustar From: Torsten Werner Date: Sat, 10 Sep 2011 00:13:53 +0200 Subject: don't build doxia-maven-plugin It fails to build and we have a separate source package anyway. --- pom.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml index 160e2d4..26c9f8f 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,6 @@ under the License. doxia-core doxia-modules doxia-book - doxia-maven-plugin -- debian/patches/0004-remove-doxia-core-test-jar.patch0000664000000000000000000000235012322042142017265 0ustar From: Torsten Werner Date: Sat, 10 Sep 2011 00:09:54 +0200 Subject: remove doxia-core test-jar There are issues with finding the artifact. --- doxia-book/pom.xml | 7 ------- doxia-modules/pom.xml | 7 ------- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/doxia-book/pom.xml b/doxia-book/pom.xml index 4e9ea7a..94b5dac 100644 --- a/doxia-book/pom.xml +++ b/doxia-book/pom.xml @@ -85,13 +85,6 @@ under the License. plexus-utils - - - org.apache.maven.doxia - doxia-core - test-jar - test - diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml index eed8abc..1fa8d8b 100644 --- a/doxia-modules/pom.xml +++ b/doxia-modules/pom.xml @@ -57,12 +57,5 @@ under the License. doxia-sink-api - - - org.apache.maven.doxia - doxia-core - test-jar - test - -- debian/patches/0007-disable-plexus-javadoc.patch0000664000000000000000000000154712322042142016551 0ustar From: Torsten Werner 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. http://plexus.codehaus.org/plexus-utils/apidocs/ http://junit.sourceforge.net/javadoc/ - - - org.codehaus.plexus - plexus-javadoc - 1.0 - - -- debian/patches/0006-specificy-source-and-target-version.patch0000664000000000000000000000126612322042142021203 0ustar From: Torsten Werner Date: Sat, 10 Sep 2011 00:14:48 +0200 Subject: specificy source and target version --- pom.xml | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pom.xml b/pom.xml index 26c9f8f..22ad945 100644 --- a/pom.xml +++ b/pom.xml @@ -347,6 +347,14 @@ under the License. + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + -- debian/patches/0002-add-version-to-plexus-container-default.patch0000664000000000000000000000117212322042142021763 0ustar From: Torsten Werner Date: Fri, 9 Sep 2011 21:16:55 +0200 Subject: add version to plexus-container-default --- doxia-logging-api/pom.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doxia-logging-api/pom.xml b/doxia-logging-api/pom.xml index 2267734..71ff169 100644 --- a/doxia-logging-api/pom.xml +++ b/doxia-logging-api/pom.xml @@ -37,6 +37,7 @@ under the License. org.codehaus.plexus plexus-container-default + 1.0-beta-3.0.7 -- debian/patches/0003-switch-to-plexus-component-metadata.patch0000664000000000000000000001370412322042142021232 0ustar From: Torsten Werner 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. org.codehaus.plexus - plexus-maven-plugin + plexus-component-metadata - - src/main/components/components.xml - target/generated-resources/plexus/META-INF/plexus/components.xml - + ${basedir}/src/main/components/ - merge-descriptors + generate-metadata - \ No newline at end of file + 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. org.codehaus.plexus - plexus-maven-plugin + plexus-component-metadata - - src/main/components/components.xml - target/generated-resources/plexus/META-INF/plexus/components.xml - + ${basedir}/src/main/components/ - merge-descriptors + generate-metadata 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. org.codehaus.plexus - plexus-maven-plugin + plexus-component-metadata - - src/main/components/components.xml - target/generated-resources/plexus/META-INF/plexus/components.xml - + ${basedir}/src/main/components - merge-descriptors + generate-metadata 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. org.codehaus.plexus - plexus-maven-plugin + plexus-component-metadata - - src/main/components/components.xml - target/generated-resources/plexus/META-INF/plexus/components.xml - + ${basedir}/src/main/components/components.xml - merge-descriptors + generate-metadata 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. org.codehaus.plexus - plexus-maven-plugin - - 1.3.5 + plexus-component-metadata + 1.0-beta-3.0.7 org.codehaus.modello @@ -328,11 +327,11 @@ under the License. org.codehaus.plexus - plexus-maven-plugin + plexus-component-metadata - descriptor + generate-metadata -- debian/patches/series0000664000000000000000000000046412322042142012030 0ustar 0001-modello.patch 0002-add-version-to-plexus-container-default.patch 0003-switch-to-plexus-component-metadata.patch 0004-remove-doxia-core-test-jar.patch 0005-don-t-build-doxia-maven-plugin.patch 0006-specificy-source-and-target-version.patch 0007-disable-plexus-javadoc.patch 0008-doxia-logging-deps.patch debian/patches/0001-modello.patch0000664000000000000000000000612312322042142013643 0ustar From: Torsten Werner Date: Fri, 9 Sep 2011 21:14:55 +0200 Subject: modello --- doxia-core/src/main/mdo/document.mdo | 15 ++++++++++----- .../maven/doxia/module/fo/FoAggregateSink.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/doxia-core/src/main/mdo/document.mdo b/doxia-core/src/main/mdo/document.mdo index a338c49..1807f42 100644 --- a/doxia-core/src/main/mdo/document.mdo +++ b/doxia-core/src/main/mdo/document.mdo @@ -500,7 +500,7 @@ return ISO_8601_FORMAT.format( getCreationDate() ); } - return this.creationdate; + return this.creationDate.toString(); } /** @@ -518,7 +518,7 @@ return ISO_8601_FORMAT.format( getDate() ); } - return this.modifydate; + return this.date.toString(); } /** @@ -536,7 +536,7 @@ return ISO_8601_FORMAT.format( getPrintDate() ); } - return this.printdate; + return this.printDate.toString(); } ]]> @@ -701,10 +701,12 @@ */ public String getFullName() { + /* if ( getName() != null && getName().trim().length() > 0 ) { return getName().trim(); } + */ return ( getFirstName() != null ? getFirstName().trim() : "null" ) + " " + ( getLastName() != null ? getLastName().trim() : "null" ); @@ -783,7 +785,7 @@ return ISO_8601_FORMAT.format( getDate() ); } - return this.modifydate; + return this.date.toString(); } ]]> @@ -1124,10 +1126,13 @@ public String getAllAuthorNames() { StringBuffer sb = new StringBuffer(); + + /* if ( getAuthor() != null && getAuthor().trim().length() > 0 ) { return getAuthor().trim(); } + */ if ( getAuthors() != null ) { @@ -1165,7 +1170,7 @@ return ISO_8601_FORMAT.format( getCoverDate() ); } - return this.coverdate; + return this.coverDate.toString(); } ]]> diff --git 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 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 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 ); writeEndTag( BLOCK_TAG ); writeEndTag( TABLE_CELL_TAG ); --