[pkg-java] r9399 - in trunk/maven-repo-helper: . debian src/main/bin src/main/java/org/debian/maven/repo src/test/java/org/debian/maven/repo src/test/resources
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Jul 28 18:35:00 UTC 2009
Author: ludovicc-guest
Date: 2009-07-28 18:34:59 +0000 (Tue, 28 Jul 2009)
New Revision: 9399
Added:
trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.transformed
trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.xml
Removed:
trunk/maven-repo-helper/nb-configuration.xml
Modified:
trunk/maven-repo-helper/debian/changelog
trunk/maven-repo-helper/debian/control
trunk/maven-repo-helper/src/main/bin/mh_cleanpom
trunk/maven-repo-helper/src/main/bin/mh_installjar
trunk/maven-repo-helper/src/main/bin/mh_installpom
trunk/maven-repo-helper/src/main/bin/mh_installpoms
trunk/maven-repo-helper/src/main/bin/mh_linkjar
trunk/maven-repo-helper/src/main/bin/mh_patchpoms
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Dependency.java
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRule.java
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned
trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
trunk/maven-repo-helper/src/test/resources/maven-core.transformed
trunk/maven-repo-helper/src/test/resources/maven-core.xml
trunk/maven-repo-helper/src/test/resources/maven.cleaned
trunk/maven-repo-helper/src/test/resources/maven.transformed
trunk/maven-repo-helper/src/test/resources/maven.xml
trunk/maven-repo-helper/src/test/resources/modello-core.cleaned
trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned
trunk/maven-repo-helper/src/test/resources/modello-core.transformed
trunk/maven-repo-helper/src/test/resources/modello-core.xml
trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned
trunk/maven-repo-helper/src/test/resources/plexus-active-collections.pom
trunk/maven-repo-helper/src/test/resources/plexus-archiver.cleaned
trunk/maven-repo-helper/src/test/resources/plexus-archiver.pom
trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned
trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed
trunk/maven-repo-helper/src/test/resources/slf4j.cleaned
trunk/maven-repo-helper/src/test/resources/slf4j.xml
trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned
trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.xml
Log:
* Add Recommends: debhelper as debhelper is used in some scripts
(mh_install* and mh_linkjar)
* Add --set-version to mh_cleanpom, mh_installpom, mh_installpoms
to be able to force the version of the artifact in Maven without
needing patching the original POM file.
* More errors detected in repo scan
* Use http://maven.apache.org/xsd/maven-4_0_0.xsd as the location of
the xsd in the xml namespace declaration to keep gcj happy. It should
not affect Maven or other tools, provided that the xsd is registered
in a XML catalog.
* By default, remove the test dependencies from cleaned POMs (except for
multi-module POM) as they are not useful outside building the project
itself most of the time and they make checking consistency in the
Maven repository harder.
* mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove
dependencies from the POM files
Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/debian/changelog 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,12 +1,28 @@
maven-repo-helper (0.7) unstable; urgency=low
* Install jars in /usr/share/java and create link to them from
- the Maven repository (as suggested by Marcus Better)
+ the Maven repository (as suggested by Marcus Better)
* Add a new script, mh_linkjar, which creates links to the jar into
- /usr/share/maven-repo. Unlike mh_installjar, it does not copy the
- jar into the build directory.
+ /usr/share/maven-repo. Unlike mh_installjar, it does not copy the
+ jar into the build directory.
* Use install instead of dh_install in the scripts as it can
- interfer if there is a .install file in the debian folder.
+ interfer if there is a .install file in the debian folder.
+ * Add Recommends: debhelper as debhelper is used in some scripts
+ (mh_install* and mh_linkjar)
+ * Add --set-version to mh_cleanpom, mh_installpom, mh_installpoms
+ to be able to force the version of the artifact in Maven without
+ needing patching the original POM file.
+ * More errors detected in repo scan
+ * Use http://maven.apache.org/xsd/maven-4_0_0.xsd as the location of
+ the xsd in the xml namespace declaration to keep gcj happy. It should
+ not affect Maven or other tools, provided that the xsd is registered
+ in a XML catalog.
+ * By default, remove the test dependencies from cleaned POMs (except for
+ multi-module POM) as they are not useful outside building the project
+ itself most of the time and they make checking consistency in the
+ Maven repository harder.
+ * mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove
+ dependencies from the POM files
-- Ludovic Claude <ludovic.claude at laposte.net> Thu, 16 Jul 2009 10:09:26 +0100
Modified: trunk/maven-repo-helper/debian/control
===================================================================
--- trunk/maven-repo-helper/debian/control 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/debian/control 2009-07-28 18:34:59 UTC (rev 9399)
@@ -12,6 +12,7 @@
Package: maven-repo-helper
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libstax-java
+Recommends: debhelper
Suggests: maven-debian-helper
Description: Helper tools for including Maven metatada in Debian packages
Maven is a software project management and comprehension tool. Based on the
Deleted: trunk/maven-repo-helper/nb-configuration.xml
===================================================================
--- trunk/maven-repo-helper/nb-configuration.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/nb-configuration.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
- <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
- <!--
-Properties that influence various parts of the IDE, especially code formatting and the like.
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
- <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>default</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
- <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>8</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>
- <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>
- </properties>
-</project-shared-configuration>
Modified: trunk/maven-repo-helper/src/main/bin/mh_cleanpom
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_cleanpom 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_cleanpom 2009-07-28 18:34:59 UTC (rev 9399)
@@ -23,14 +23,20 @@
echo -e "\t-o --no-parent: don't inherit from a parent POM"
echo -e "\t-k --keep-pom-version: keep the original version of the POM but,"
echo -e "\t convert all other versions in dependencies and plugins"
+ echo -e "\t-e<version>, --set-version=<version>: set the version for the POM,"
+ echo -e "\t do not use the version declared in the POM file."
echo -e "\t-k --keep-all-elements: keep all elements in the POM, do a version"
echo -e "\t transformation only, don't delete the build and other elements."
echo -e "\t-r<rules> --rules=<rules>: path to the file containing the"
echo -e "\t extra rules to apply when cleaning the POM."
echo -e "\t Optional, the default location is debian/maven.rules"
- echo -e "\t-i<rules> --published-rules=<rules>: path to the file containing the"
- echo -e "\t extra rules to publish in the property debian.mavenRules in the cleaned POM"
+ echo -e "\t-u<rules> --published-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules to publish in the property debian.mavenRules in the"
+ echo -e "\t cleaned POM."
echo -e "\t Optional, the default location is debian/maven.publishedRules"
+ echo -e "\t-i<rules> --ignore-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules use to remove certain dependencies from the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.ignoreRules"
echo -e "\t-s --no-rules: don't apply any rules for converting versions,"
echo -e "\t do not even convert versions to the default 'debian' version"
echo -e "\t-v --verbose: show more information while running"
@@ -52,47 +58,57 @@
echo -e ""
echo -e "\tYou can modify those defaults with the help of the"
echo -e "\trules file. This file should contain the lines with the format:"
- echo -e "\t<groupId> [artifactId] [type] [version]"
- echo -e "\twhere groupId, artifactId, type and version can be the explicit attribute to"
- echo -e "\tmatch, or can contain a wildcard (*) for generic matches."
+ echo -e "\t<groupId> [artifactId] [type] [version] [scope]"
+ echo -e "\twhere groupId, artifactId, type, version and scope can be the explicit"
+ echo -e "\tattribute to match, or can contain a wildcard (*) for generic matches."
echo -e ""
echo -e "\tEach one of those elements can also be a replace rule, of the form"
echo -e "\ts/<regex>/<replace>/ where regex is a regular expression, and replace"
echo -e "\tis the replacement. Substitution groups $1 $2... can be used in the"
echo -e "\treplacement if capture groups () have been used in the regex."
echo -e ""
- echo -e "\tThe first element is mandatory (groupId), but you can ignore the following"
- echo -e "\telements."
- echo -e "\tIf the version is missing, then any version will be replaced with 'debian'."
- echo -e "\tIf type is missing, then any type is matched."
- echo -e "\tIf artifactId is missing, then any artifactId is matched."
+ echo -e "\tThe first element is mandatory (groupId), but you can ignore the"
+ echo -e "\telements on the right hand side."
+ echo -e "\tIf the scope is missing, then any scope is matched and left unchanged."
+ echo -e "\tIf the version is missing, then any version will be replaced with"
+ echo -e "\t'debian'."
+ echo -e "\tIf type is missing, then any type is matched and left unchanged."
+ echo -e "\tIf artifactId is missing, then any artifactId is matched and left"
+ echo -e "\tunchanged."
echo -e ""
- echo -e "\tYou can also have comments in this file, it should be a line starting with #"
+ echo -e "\tYou can also have comments in this file, it should be a line starting"
+ echo -e "\twith #"
echo -e ""
echo -e "Example of a rules file:"
echo -e ""
echo -e "\ts/commons-(.*)/org.apache.commons.commons$1/"
echo -e "\torg.itext * * s/1\\..*/1.x/"
echo -e "\torg.itext * * s/2\\..*/2.x/"
- echo -e "\torg.codehaus.plexus plexus-container-default jar s/1\\.0-alpha-.*/1.0-alpha/"
+ echo -e "\t# use the alpha version of plexus-container-default"
+ echo -e "\torg.codehaus.plexus plexus-container-default jar s/1\\.0-alpha.*/1.0-alpha/"
echo -e ""
echo -e "\tThis rules file does the following:"
- echo -e "\t- all groupIds starting with commons- will have org.apache.commons. prefixed to them"
- echo -e "\t- any artifact in the org.itext group with a version number starting with 1. will"
- echo -e "\t use the 1.x version"
- echo -e "\t- any artifact in the org.itext group with a version number starting with 2. will"
- echo -e "\t use the 2.x version"
- echo -e "\t- the jar with groupId=org.codehaus.plexus and artifactId=plexus-container-default and a"
- echo -e "\t version starting with 1.0-alpha- will use the 1.0-alpha version"
+ echo -e "\t- all groupIds starting with commons- will have"
+ echo -e "\t- org.apache.commons. prefixed to them"
+ echo -e "\t- any artifact in the org.itext group with a version number starting"
+ echo -e "\t with 1. will use the 1.x version"
+ echo -e "\t- any artifact in the org.itext group with a version number starting"
+ echo -e "\t with 2. will use the 2.x version"
+ echo -e "\t- the jar with groupId=org.codehaus.plexus and"
+ echo -e "\t artifactId=plexus-container-default and a version starting with"
+ echo -e "\t 1.0-alpha- will use the 1.0-alpha version"
echo -e ""
- echo -e "\tThe default rule (* * * s/.*/debian/) replaces any version number with"
- echo -e "\tthe 'debian' version and always applies last if there was no other matches."
- echo -e "\tAnother default rule (* * maven-plugin *) keep the version for all plugins"
- echo -e "\tas the plugin mechanism requires a version in Maven."
+ echo -e "\tThe default rule (* * * s/.*/debian/ *) replaces any version number with"
+ echo -e "\tthe 'debian' version and always applies last if there was no other"
+ echo -e "\tmatches."
+ echo -e "\tAnother default rule (* * maven-plugin * *) keep the version for all"
+ echo -e "\tplugins as the plugin mechanism requires a version in Maven."
+ echo -e ""
+ echo -e "See also: mh_installpom(1), mh_installpoms(1)"
exit 1
}
-ARGS="p package o no-parent k keep-pom-version r rules i published-rules s no-rules v verbose n no-act" parseargs "$@"
+ARGS="p package o no-parent k keep-pom-version e set-version r rules u published-rules i ignore-rules s no-rules v verbose n no-act" parseargs "$@"
if [ "$ARGC" -lt "1" ]; then
syntax
@@ -100,8 +116,10 @@
NOPARENT=$(getarg o no-parent)
KEEPVERSION=$(getarg k keep-pom-version)
+SETVERSION=$(getarg e set-version)
RULES=$(getarg r rules)
-PUBLISHED_RULES=$(getarg i published-rules)
+PUBLISHED_RULES=$(getarg u published-rules)
+IGNORE_RULES=$(getarg i ignore-rules)
NORULES=$(getarg s no-rules)
PACKAGE=$(getarg p package)
PACKAGE=${PACKAGE:?"Package parameter (-p) is mandatory"}
@@ -123,6 +141,11 @@
PUBLISHED_RULES="debian/maven.publishedRules"
fi
fi
+if [ -z "$IGNORE_RULES" ]; then
+ if [ -f debian/maven.ignoreRules ]; then
+ IGNORE_RULES="debian/maven.ignoreRules"
+ fi
+fi
if [ -z "$RULES" ]; then
if [ -f debian/maven.rules ]; then
@@ -130,7 +153,7 @@
fi
fi
-CLEAN_ARGS="--package=${PACKAGE} ${VERBOSE:+--verbose} ${NOPARENT:+--no-parent} ${KEEPVERSION:+--keep-pom-version} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${NORULES:+--no-rules}"
+CLEAN_ARGS="--package=${PACKAGE} ${VERBOSE:+--verbose} ${NOPARENT:+--no-parent} ${KEEPVERSION:+--keep-pom-version} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${IGNORE_RULES:+--ignore-rules=$IGNORE_RULES} ${NORULES:+--no-rules}"
if [ -z "$NOACT" ]; then
java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.POMCleaner $CLEAN_ARGS $POM $TARGET $POM_PROPS
Modified: trunk/maven-repo-helper/src/main/bin/mh_installjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installjar 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_installjar 2009-07-28 18:34:59 UTC (rev 9399)
@@ -79,7 +79,7 @@
mkdir -p debian/tmp 2> /dev/null
-if [[ ! -z "$VERBOSE" || "$DH_VERBOSE"="1" ]]; then
+if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/tmp/pom.xml debian/tmp/pom.properties"
fi
Modified: trunk/maven-repo-helper/src/main/bin/mh_installpom
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installpom 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_installpom 2009-07-28 18:34:59 UTC (rev 9399)
@@ -25,15 +25,25 @@
echo -e "\t-V --version: show the version"
echo -e "\t-p<package> --package=<package>: package to act on "
echo -e "\t-o --no-parent: don't inherit from a parent POM"
+ echo -e "\t-e<version>, --set-version=<version>: set the version for the POM,"
+ echo -e "\t do not use the version declared in the POM file."
echo -e "\t-r<rules> --rules=<rules>: gives the location of the rules file for"
echo -e "\t special properties. Optional, the default location is"
echo -e "\t debian/maven.rules"
+ echo -e "\t-u<rules> --published-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules to publish in the property debian.mavenRules in the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.publishedRules"
+ echo -e "\t-i<rules> --ignore-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules use to remove certain dependencies from the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.ignoreRules"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
+ echo -e ""
+ echo -e "See also: mh_installpoms(1), mh_cleanpom(1)"
exit 1
}
-ARGS="p package o no-parent r rules v verbose n no-act" parseargs "$@"
+ARGS="p package o no-parent r rules u published-rules i ignore-rules e set-version v verbose n no-act" parseargs "$@"
if [ "$ARGC" -lt "1" ]; then
syntax
@@ -41,6 +51,9 @@
NOPARENT=$(getarg o no-parent)
RULES=$(getarg r rules)
+PUBLISHED_RULES=$(getarg u published-rules)
+IGNORE_RULES=$(getarg i ignore-rules)
+SETVERSION=$(getarg e set-version)
PACKAGE=$(getarg p package)
PACKAGE=${PACKAGE:?"Package parameter (-p) is mandatory"}
VERBOSE=$(getarg v verbose)
@@ -48,7 +61,7 @@
POM="${ARGV[0]}"
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
-CLEAN_ARGS="--package=${PACKAGE} ${NOPARENT:+--no-parent} ${RULES:+--rules=$RULES}"
+CLEAN_ARGS="--package=${PACKAGE} ${VERBOSE:+--verbose} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${IGNORE_RULES:+--ignore-rules=$IGNORE_RULES}"
mkdir -p debian/tmp 2> /dev/null
@@ -80,5 +93,5 @@
echo -e "\tinstall -m 644 -D debian/tmp/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom"
fi
- install -m 644 -D debian/tmp/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom
+ install -m 644 -D debian/tmp/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom
fi
Modified: trunk/maven-repo-helper/src/main/bin/mh_installpoms
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installpoms 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_installpoms 2009-07-28 18:34:59 UTC (rev 9399)
@@ -14,24 +14,37 @@
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: show the version"
echo -e "\t-p<package> --package=<package>: package to act on "
+ echo -e "\t-e<version>, --set-version=<version>: set the version for the POM,"
+ echo -e "\t do not use the version declared in the POM file."
echo -e "\t-r<rules> --rules=<rules>: gives the location of the rules file for"
echo -e "\t special properties. Optional, the default location is"
echo -e "\t debian/maven.rules"
+ echo -e "\t-u<rules> --published-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules to publish in the property debian.mavenRules in the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.publishedRules"
+ echo -e "\t-i<rules> --ignore-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules use to remove certain dependencies from the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.ignoreRules"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
+ echo -e ""
+ echo -e "See also: mh_installpom(1), mh_cleanpom(1)"
exit 1
}
-ARGS="p package r rules v verbose n no-act" parseargs "$@"
+ARGS="p package r rules v u published-rules i ignore-rules e set-version verbose n no-act" parseargs "$@"
RULES=$(getarg r rules)
+PUBLISHED_RULES=$(getarg u published-rules)
+IGNORE_RULES=$(getarg i ignore-rules)
+SETVERSION=$(getarg e set-version)
PACKAGE=$(getarg p package)
PACKAGE=${PACKAGE:?"Package parameter (-p) is mandatory"}
VERBOSE=$(getarg v verbose)
NOACT=$(getarg n no-act)
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
-MH_ARGS="--package=${PACKAGE} ${NOPARENT:+--no-parent} ${RULES:+--rules=$RULES}"
+MH_ARGS="--package=${PACKAGE} ${VERBOSE:+--verbose} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${IGNORE_RULES:+--ignore-rules=$IGNORE_RULES}"
cat debian/$PACKAGE.poms | while read POM OPT1 OPT2; do
if [ ! -z "$POM" ]; then
Modified: trunk/maven-repo-helper/src/main/bin/mh_linkjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_linkjar 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_linkjar 2009-07-28 18:34:59 UTC (rev 9399)
@@ -6,7 +6,7 @@
syntax()
{
- echo -e "Usage: mh_linkjar [option]... [pom] [source_jar] [link]..."
+ echo -e "Usage: mh_linkjar [option]... [pom] [dest_jar] [link]..."
echo -e "Create symlinks in package build directories, including links to the jar"
echo -e "file in /usr/share/maven-repo, at the correct location for Maven."
echo -e "It can also create additional links to the jar, usually located in"
@@ -15,8 +15,8 @@
echo -e "Where"
echo -e "\t[pom] is the location of the POM associated with the jar to install."
echo -e "\t GroupId, artifactId and version will be extracted from this file."
- echo -e "\t[source_jar] is the path to the jar to install, usually located in the build"
- echo -e "\t folder."
+ echo -e "\t[dest_jar] is the path of the installed jar, usually located in the"
+ echo -e "\t usr/share/java folder."
echo -e "\t[link] is an additional link to the jar to install, usually there should"
echo -e "\t be a link to usr/share/java/$jar.jar and"
echo -e "\t usr/share/java/$jar-$version.jar to comply with the Java packaging"
Modified: trunk/maven-repo-helper/src/main/bin/mh_patchpoms
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_patchpoms 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/bin/mh_patchpoms 2009-07-28 18:34:59 UTC (rev 9399)
@@ -19,9 +19,12 @@
echo -e "\t-r<rules> --rules=<rules>: gives the location of the rules file for"
echo -e "\t special properties. Optional, the default location is"
echo -e "\t debian/maven.rules"
- echo -e "\t-i<rules> --published-rules=<rules>: path to the file containing the"
+ echo -e "\t-u<rules> --published-rules=<rules>: path to the file containing the"
echo -e "\t extra rules to publish in the property debian.mavenRules in the cleaned POM"
echo -e "\t Optional, the default location is debian/maven.publishedRules"
+ echo -e "\t-i<rules> --ignore-rules=<rules>: path to the file containing the"
+ echo -e "\t extra rules use to remove certain dependencies from the cleaned POM"
+ echo -e "\t Optional, the default location is debian/maven.ignoreRules"
echo -e "\t-s --no-rules: don't apply any rules for converting versions,"
echo -e "\t do not even convert versions to the default 'debian' version"
echo -e "\t-k --keep-pom-version: keep the original version of the POMs but, "
@@ -31,10 +34,11 @@
exit 1
}
-ARGS="p package r rules i published-rules s no-rules k keep-pom-version v verbose n no-act" parseargs "$@"
+ARGS="p package r rules u published-rules i ignore-rules s no-rules k keep-pom-version v verbose n no-act" parseargs "$@"
RULES=$(getarg r rules)
-PUBLISHED_RULES=$(getarg i published-rules)
+PUBLISHED_RULES=$(getarg u published-rules)
+IGNORE_RULES=$(getarg i ignore-rules)
NORULES=$(getarg s no-rules)
KEEP_POM_VERSION=$(getarg k keep-pom-version)
PACKAGE=$(getarg p package)
@@ -49,7 +53,7 @@
fi
DH_OPTS="${VERBOSE:+-v}"
-MH_ARGS="--package=${PACKAGE} ${RULES:+--rules=$RULES} ${KEEP_POM_VERSION:+--keep-pom-version} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${NORULES:+--no-rules}"
+MH_ARGS="--package=${PACKAGE} ${RULES:+--rules=$RULES} ${KEEP_POM_VERSION:+--keep-pom-version} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${IGNORE_RULES:+--ignore-rules=$IGNORE_RULES} ${NORULES:+--no-rules}"
if [ -z "$NOACT" ]; then
cat debian/$PACKAGE.poms | while read POM OPT1 OPT2; do
@@ -57,6 +61,6 @@
cp $POM $POM.save
fi
done
- java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS
+ java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS
fi
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Dependency.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Dependency.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Dependency.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -30,8 +30,18 @@
this.artifactId = artifactId;
this.type = type;
this.version = version;
+ this.scope = "runtime";
}
+ public Dependency(String groupId, String artifactId, String type, String version, String scope, boolean optional) {
+ this.groupId = groupId;
+ this.artifactId = artifactId;
+ this.type = type;
+ this.version = version;
+ this.scope = scope;
+ this.optional = optional;
+ }
+
public String getArtifactId() {
return artifactId;
}
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRule.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRule.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRule.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -9,13 +9,14 @@
public class DependencyRule implements Comparable {
public static DependencyRule TO_DEBIAN_VERSION_RULE = new DependencyRule("");
- public static DependencyRule MAVEN_PLUGINS_KEEP_VERSION_RULE = new DependencyRule("* * maven-plugin *");
- public static DependencyRule NO_CHANGE_RULE = new DependencyRule("* * * *");
+ public static DependencyRule MAVEN_PLUGINS_KEEP_VERSION_RULE = new DependencyRule("* * maven-plugin * * *");
+ public static DependencyRule NO_CHANGE_RULE = new DependencyRule("* * * * * *");
private Rule groupRule;
private Rule artifactRule;
private Rule typeRule;
private Rule versionRule;
+ private Rule scopeRule;
public DependencyRule(String def) {
StringTokenizer st = new StringTokenizer(def, " \t", false);
@@ -39,17 +40,25 @@
} else {
versionRule = new Rule("s/.*/debian/");
}
+ if (st.hasMoreTokens()) {
+ scopeRule = new Rule(st.nextToken());
+ } else {
+ scopeRule = new Rule("*");
+ }
}
public boolean matches(Dependency dependency) {
- return groupRule.match(dependency.getGroupId()) && artifactRule.match(dependency.getArtifactId()) && typeRule.match(dependency.getType()) && versionRule.match(dependency.getVersion());
+ return groupRule.match(dependency.getGroupId()) && artifactRule.match(dependency.getArtifactId()) && typeRule.match(dependency.getType())
+ && versionRule.match(dependency.getVersion()) && scopeRule.match(dependency.getScope());
}
public Dependency apply(Dependency dependency) {
- return new Dependency(groupRule.apply(dependency.getGroupId()),
+ return new Dependency(groupRule.apply(dependency.getGroupId()),
artifactRule.apply(dependency.getArtifactId()),
typeRule.apply(dependency.getType()),
- versionRule.apply(dependency.getVersion()));
+ versionRule.apply(dependency.getVersion()),
+ scopeRule.apply(dependency.getScope()),
+ dependency.isOptional());
}
/**
@@ -85,6 +94,12 @@
if (!versionRule.isGeneric() && other.versionRule.isGeneric()) {
return -1;
}
+ if (scopeRule.isGeneric() && !other.scopeRule.isGeneric()) {
+ return 1;
+ }
+ if (!scopeRule.isGeneric() && other.scopeRule.isGeneric()) {
+ return -1;
+ }
return this.toPatternString().compareTo(other.toPatternString());
}
@@ -108,6 +123,9 @@
if (this.versionRule != other.versionRule && (this.versionRule == null || !this.versionRule.equals(other.versionRule))) {
return false;
}
+ if (this.scopeRule != other.scopeRule && (this.scopeRule == null || !this.scopeRule.equals(other.scopeRule))) {
+ return false;
+ }
return true;
}
@@ -117,15 +135,17 @@
hash = 73 * hash + (this.artifactRule != null ? this.artifactRule.hashCode() : 0);
hash = 73 * hash + (this.typeRule != null ? this.typeRule.hashCode() : 0);
hash = 73 * hash + (this.versionRule != null ? this.versionRule.hashCode() : 0);
+ hash = 73 * hash + (this.scopeRule != null ? this.scopeRule.hashCode() : 0);
return hash;
}
public String toPatternString() {
- return groupRule.getPattern() + ":" + artifactRule.getPattern() + ":" + typeRule.getPattern() + ":" + versionRule.getPattern();
+ return groupRule.getPattern() + ":" + artifactRule.getPattern() + ":" + typeRule.getPattern() + ":" + versionRule.getPattern()
+ + ":" + scopeRule.getPattern();
}
public String toString() {
- return groupRule + " " + artifactRule + " " + typeRule + " " + versionRule;
+ return groupRule + " " + artifactRule + " " + typeRule + " " + versionRule + " " + scopeRule;
}
}
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -39,7 +39,7 @@
}
public void cleanPom(File originalPom, File targetPom, File pomProperties,
- boolean noParent, boolean keepPomVersion, String debianPackage) {
+ boolean noParent, boolean keepPomVersion, String setVersion, String debianPackage) {
if (targetPom.getParentFile() != null) {
targetPom.getParentFile().mkdirs();
@@ -49,7 +49,7 @@
}
try {
- POMInfo info = transformPom(originalPom, targetPom, noParent, keepPomVersion, debianPackage);
+ POMInfo info = transformPom(originalPom, targetPom, noParent, keepPomVersion, setVersion, debianPackage);
Properties pomProps = new Properties();
pomProps.put("groupId", info.getThisPom().getGroupId());
@@ -77,6 +77,13 @@
return WRITE_IGNORED_ELEMENTS.contains(element);
}
+ protected boolean acceptDependency(Dependency dependency, POMInfo info) {
+ if (!super.acceptDependency(dependency, info)) {
+ return false;
+ }
+ return "pom".equals(info.getThisPom().getType()) || !"test".equals(dependency.getScope());
+ }
+
public static void main(String[] args) {
if (args.length == 0 || "-h".equals(args[0]) || "--help".equals(args[0])) {
System.out.println("Purpose: cleans a Maven POM for inclusion in the Debian/Maven repository in /usr/share/maven-repo");
@@ -89,10 +96,14 @@
System.out.println(" this library");
System.out.println(" -r<rules>, --rules=<rules>: path to the file containing the");
System.out.println(" extra rules to apply when cleaning the POM");
- System.out.println(" -i<rules>, --published-rules=<rules>: path to the file containing the");
+ System.out.println(" -u<rules>, --published-rules=<rules>: path to the file containing the");
System.out.println(" extra rules to publish in the property debian.mavenRules in the cleaned POM");
+ System.out.println(" -i<rules>, --ignore-rules=<rules>: path to the file containing the");
+ System.out.println(" extra rules use to remove certain dependencies from the cleaned POM");
System.out.println(" --no-rules: don't apply any rules for converting versions, ");
System.out.println(" do not even convert versions to the default 'debian' version");
+ System.out.println(" -e<version>, --set-version=<version>: set the version for the POM,");
+ System.out.println(" do not use the version declared in the POM file.");
System.out.println(" --keep-pom-version: keep the original version of the POM but, ");
System.out.println(" convert all other versions in dependencies and plugins");
System.out.println(" --keep-all-elements: keep all elements in the POM, do a version");
@@ -164,8 +175,10 @@
boolean keepPomVersion = false;
boolean keepAllElements = false;
String debianPackage = "";
+ String setVersion = null;
File rulesFile = null;
File publishedRulesFile = new File("debian/maven.publishedRules");
+ File ignoreRulesFile = new File("debian/maven.ignoreRules");
while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().length() == 0)) {
String arg = args[i].trim();
if ("--verbose".equals(arg) || "-v".equals(arg)) {
@@ -186,10 +199,18 @@
rulesFile = new File(arg.substring(2));
} else if (arg.startsWith("--rules=")) {
rulesFile = new File(arg.substring("--rules=".length()));
- } else if (arg.startsWith("-i")) {
+ } else if (arg.startsWith("-u")) {
publishedRulesFile = new File(arg.substring(2));
} else if (arg.startsWith("--published-rules=")) {
publishedRulesFile = new File(arg.substring("--published-rules=".length()));
+ } else if (arg.startsWith("-i")) {
+ ignoreRulesFile = new File(arg.substring(2));
+ } else if (arg.startsWith("--ignore-rules=")) {
+ ignoreRulesFile = new File(arg.substring("--ignore-rules=".length()));
+ } else if (arg.startsWith("-e")) {
+ setVersion = arg.substring(2);
+ } else if (arg.startsWith("--set-version=")) {
+ setVersion = arg.substring("--set-version=".length());
}
i = inc(i, args);
}
@@ -217,10 +238,13 @@
cleaner.addPublishedRules(publishedRulesFile);
}
}
+ if (ignoreRulesFile != null && ignoreRulesFile.exists()) {
+ cleaner.addIgnoreRules(ignoreRulesFile);
+ }
cleaner.setKeepAllElements(keepAllElements);
cleaner.cleanPom(originalPom, targetPom, pomProperties, noParent,
- keepPomVersion, debianPackage);
+ keepPomVersion, setVersion, debianPackage);
}
private static int inc(int i, String[] args) {
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -40,6 +40,7 @@
"artifactId", "packaging", "version"});
private Set rules = new TreeSet();
private Set publishedRules = new TreeSet();
+ private Set ignoreRules = new TreeSet();
private boolean verbose;
public POMTransformer() {
@@ -72,6 +73,17 @@
addRules(file, publishedRules);
}
+ public void addIgnoreRule(DependencyRule rule) {
+ if (verbose) {
+ System.out.println("Ignore rules:");
+ }
+ ignoreRules.add(rule);
+ }
+
+ public void addIgnoreRules(File file) {
+ addRules(file, ignoreRules);
+ }
+
private void addRules(File file, Set dest) {
try {
LineNumberReader lnr = new LineNumberReader(new FileReader(file));
@@ -104,12 +116,13 @@
});
}
- public void transformPoms(File poms, final String debianPackage, final boolean keepPomVersion) {
+ public void transformPoms(File poms, final String debianPackage, final boolean keepPomVersion,
+ final String setVersion) {
foreachPoms(poms, new POMHandler() {
public void handlePOM(File pomFile, boolean noParent) throws Exception {
File targetFile = new File(pomFile.getAbsolutePath() + ".new");
- transformPom(pomFile, targetFile, noParent, keepPomVersion, debianPackage);
+ transformPom(pomFile, targetFile, noParent, keepPomVersion, setVersion, debianPackage);
pomFile.delete();
targetFile.renameTo(pomFile);
}
@@ -117,11 +130,11 @@
}
public void transformPom(File originalPom, File targetPom) throws XMLStreamException, FileNotFoundException, IOException {
- transformPom(originalPom, targetPom, false, false, null);
+ transformPom(originalPom, targetPom, false, false, null, null);
}
public POMInfo transformPom(File originalPom, File targetPom,
- boolean noParent, boolean keepPomVersion, String debianPackage) throws XMLStreamException, FileNotFoundException, IOException {
+ boolean noParent, boolean keepPomVersion, String setVersion, String debianPackage) throws XMLStreamException, FileNotFoundException, IOException {
if (targetPom.getParentFile() != null) {
targetPom.getParentFile().mkdirs();
@@ -133,6 +146,10 @@
// First pass - read information for this POM
POMInfo info = readPom(originalPom);
+ if (setVersion != null) {
+ info.getThisPom().setVersion(setVersion);
+ }
+
info = info.applyRules(rules);
Dependency parent = noParent ? null : info.getParent();
Dependency pomInfo = info.getThisPom();
@@ -168,21 +185,12 @@
} else if (inIgnoredElement > 0) {
inIgnoredElement++;
} else {
- indent(writer, inLevel);
- writer.writeStartElement(element);
- copyNsAndAttributes(parser, writer);
-
inLevel++;
path.add(element);
- if ("project".equals(element) && inLevel == 1) {
- copyAndFillProjectHeader(parser, writer, inLevel, pomInfo, keepPomVersion, info, parent, debianPackage);
- } else if (inLevel == 2 && "properties".equals(element)) {
- inProperty++;
- } else if (inProperty > 0) {
- inProperty++;
- } else if ("dependency".equals(element)) {
- inDependency++;
+ // Handle the special case of dependencies which can be ignored
+ // such as test dependencies during a clean operation
+ if ("dependency".equals(element)) {
sawVersion = false;
String parentElement = (String) path.get(path.size() - 2);
String parentParentElement = (String) path.get(path.size() - 3);
@@ -211,8 +219,29 @@
int index = inc(dependencyIndexes, listSelector);
List dependencyList = info.getDependencyList(listSelector);
dependency = (Dependency) dependencyList.get(index);
+ if (!acceptDependency(dependency, info)) {
+ inIgnoredElement++;
+ inLevel--;
+ path.remove(path.size() - 1);
+ dependency = null;
+ continue;
+ }
}
}
+ }
+
+ indent(writer, inLevel - 1);
+ writer.writeStartElement(element);
+ copyNsAndAttributes(parser, writer);
+
+ if ("project".equals(element) && inLevel == 1) {
+ copyAndFillProjectHeader(parser, writer, inLevel, pomInfo, keepPomVersion, info, parent, debianPackage);
+ } else if (inLevel == 2 && "properties".equals(element)) {
+ inProperty++;
+ } else if (inProperty > 0) {
+ inProperty++;
+ } else if ("dependency".equals(element)) {
+ inDependency++;
} else if (inExclusion > 0) {
inExclusion++;
} else if (inDependency > 0) {
@@ -245,7 +274,6 @@
dependency = (Dependency) info.getExtensions().get(index);
} else if (inExtension > 0) {
inExtension++;
-
}
}
@@ -257,7 +285,7 @@
inIgnoredElement--;
} else {
// Attempt to repair missing version information on dependencies
- if (inDependency == 1 && !sawVersion && parent == null) {
+ if (dependency != null && inDependency == 1 && !sawVersion && parent == null) {
if (dependency.getVersion() == null) {
dependency.setVersion("debian");
// Give a chance to customize the version
@@ -304,7 +332,7 @@
case XMLStreamConstants.CHARACTERS: {
if (inIgnoredElement == 0) {
String value = parser.getText().trim();
- if (dependency != null && inExclusion == 0) {
+ if (dependency != null && (inDependency == 2 || inPlugin == 2 || inExtension == 2) && inExclusion == 0 ) {
if ("groupId".equals(element)) {
value = dependency.getGroupId();
} else if ("artifactId".equals(element)) {
@@ -347,7 +375,7 @@
writer.writeNamespace(null, "http://maven.apache.org/POM/4.0.0");
writer.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
writer.writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation",
- "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd");
+ "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd");
}
indent(writer, inLevel);
writer.writeStartElement("modelVersion");
@@ -442,6 +470,16 @@
return INFO_ELEMENTS.contains(element);
}
+ protected boolean acceptDependency(Dependency dependency, POMInfo info) {
+ for (Iterator i = ignoreRules.iterator(); i.hasNext();) {
+ DependencyRule ignoreRule = (DependencyRule) i.next();
+ if (ignoreRule.matches(dependency)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
private int inc(Map dependencyIndexes, String selector) {
Integer index = (Integer) dependencyIndexes.get(selector);
if (index == null) {
@@ -547,10 +585,16 @@
System.out.println(" this library");
System.out.println(" -r<rules>, --rules=<rules>: path to the file containing the");
System.out.println(" extra rules to apply when cleaning the POM");
- System.out.println(" -i<rules>, --published-rules=<rules>: path to the file containing the");
+ System.out.println(" -u<rules>, --published-rules=<rules>: path to the file containing the");
System.out.println(" extra rules to publish in the property debian.mavenRules in the cleaned POM");
+ System.out.println(" -u<rules>, --published-rules=<rules>: path to the file containing the");
+ System.out.println(" extra rules to publish in the property debian.mavenRules in the cleaned POM");
+ System.out.println(" -i<rules>, --ignore-rules=<rules>: path to the file containing the");
+ System.out.println(" extra rules use to remove certain dependencies from the transformed POM");
System.out.println(" --no-rules: don't apply any rules for converting versions, ");
System.out.println(" do not even convert versions to the default 'debian' version");
+ System.out.println(" -e<version>, --set-version=<version>: set the version for the POM,");
+ System.out.println(" do not use the version declared in the POM file.");
System.out.println(" --keep-pom-version: keep the original version of the POMs but, ");
System.out.println(" convert all other versions in dependencies and plugins");
System.out.println("");
@@ -569,9 +613,11 @@
boolean verbose = false;
boolean noRules = false;
boolean keepPomVersion = false;
+ String setVersion = null;
String debianPackage = "";
File rulesFile = null;
- File publishedRulesFile = new File("debian/maven.publishedRules");
+ File publishedRulesFile = null;
+ File ignoreRulesFile = null;
while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().length() == 0)) {
String arg = args[i].trim();
if ("--verbose".equals(arg) || "-v".equals(arg)) {
@@ -588,10 +634,18 @@
rulesFile = new File(arg.substring(2));
} else if (arg.startsWith("--rules=")) {
rulesFile = new File(arg.substring("--rules=".length()));
- } else if (arg.startsWith("-i")) {
+ } else if (arg.startsWith("-u")) {
publishedRulesFile = new File(arg.substring(2));
} else if (arg.startsWith("--published-rules=")) {
- publishedRulesFile = new File(arg.substring("--rules=".length()));
+ publishedRulesFile = new File(arg.substring("--published-rules=".length()));
+ } else if (arg.startsWith("-i")) {
+ ignoreRulesFile = new File(arg.substring(2));
+ } else if (arg.startsWith("--ignore-rules=")) {
+ ignoreRulesFile = new File(arg.substring("--ignore-rules=".length()));
+ } else if (arg.startsWith("-e")) {
+ setVersion = arg.substring(2);
+ } else if (arg.startsWith("--set-version=")) {
+ setVersion = arg.substring("--set-version=".length());
}
i = inc(i, args);
}
@@ -624,8 +678,11 @@
transformer.addPublishedRules(publishedRulesFile);
}
}
+ if (ignoreRulesFile != null && ignoreRulesFile.exists()) {
+ transformer.addIgnoreRules(ignoreRulesFile);
+ }
- transformer.transformPoms(poms, debianPackage, keepPomVersion);
+ transformer.transformPoms(poms, debianPackage, keepPomVersion, setVersion);
}
private static int inc(int i, String[] args) {
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -173,6 +173,12 @@
Entry entry = (Entry) i.next();
File pom = (File) entry.getKey();
POMInfo pomInfo = (POMInfo) entry.getValue();
+ if (pomInfo.getThisPom().getVersion() == null) {
+ issues.add("Missing version in " + pom);
+ }
+ if (pomInfo.getThisPom().getVersion().endsWith("-SNAPSHOT")) {
+ issues.add("Snapshot version in " + pom);
+ }
for (Iterator j = pomInfo.getDependencies().iterator(); j.hasNext();) {
Dependency dependency = (Dependency) j.next();
if (!dep2info.containsKey(dependency)) {
Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -39,7 +39,7 @@
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-container-default jar s/1\\.0-alpha-.*/1.0-alpha/"));
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "maven2");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "maven2");
assertXMLEqual(read("maven.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -59,7 +59,7 @@
boolean noParent = false;
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libmodello-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libmodello-java");
assertXMLEqual(read("modello-core.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -69,7 +69,7 @@
assertEquals("1.0-alpha-22", pomInfo.get("version"));
assertEquals("debian", pomInfo.get("debianVersion"));
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, true, "libmodello-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, true, null, "libmodello-java");
assertXMLEqual(read("modello-core.keep.cleaned"), read(updatedPom));
pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -90,7 +90,7 @@
boolean noParent = false;
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libwagon-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libwagon-java");
assertXMLEqual(read("wagon-http-lightweight.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -111,7 +111,7 @@
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-container-default jar s/1\\.0-alpha-.*/1.0-alpha/"));
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-container-default-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libplexus-container-default-java");
assertXMLEqual(read("plexus-container-default.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -134,7 +134,7 @@
instance.addRule(new DependencyRule("junit junit jar s/3\\..*/3.x/"));
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-container-default jar s/1\\.0-alpha.*/1.0-alpha/"));
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-maven-plugin maven-plugin s/.*/1.3.8/"));
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-active-collections-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libplexus-active-collections-java");
assertXMLEqual(read("plexus-active-collections.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -154,12 +154,12 @@
boolean noParent = true;
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-archiver-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libplexus-archiver-java");
assertXMLEqual(read("plexus-archiver.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
assertEquals("org.codehaus.plexus", pomInfo.get("groupId"));
- assertEquals("plexus-achiver", pomInfo.get("artifactId"));
+ assertEquals("plexus-archiver", pomInfo.get("artifactId"));
assertEquals("jar", pomInfo.get("type"));
assertEquals("1.0-alpha-12", pomInfo.get("version"));
assertEquals("debian", pomInfo.get("debianVersion"));
@@ -174,7 +174,7 @@
boolean noParent = true;
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libslf4j-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libslf4j-java");
assertXMLEqual(read("slf4j.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
@@ -195,7 +195,7 @@
POMCleaner instance = new POMCleaner();
instance.addDefaultRules();
instance.addRule(new DependencyRule("junit junit jar s/3\\..*/3.x/"));
- instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libcommons-validator-java");
+ instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, null, "libcommons-validator-java");
assertXMLEqual(read("commons-validator.cleaned"), read(updatedPom));
Properties pomInfo = new Properties();
pomInfo.load(new FileInputStream(pomProperties));
Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java 2009-07-28 18:34:59 UTC (rev 9399)
@@ -20,7 +20,7 @@
instance.addDefaultRules();
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-container-default jar s/1\\.0-alpha-.*/1.0-alpha/"));
instance.addRule(new DependencyRule("org.apache.maven.plugins maven-assembly-plugin maven-plugin s/.*/2.2/"));
- instance.transformPom(pom, updatedPom, noParent, false, null);
+ instance.transformPom(pom, updatedPom, noParent, false, null, null);
assertXMLEqual(read("maven.transformed"), read(updatedPom));
}
@@ -33,19 +33,35 @@
POMTransformer instance = new POMTransformer();
instance.addDefaultRules();
instance.addRule(new DependencyRule("org.codehaus.plexus plexus-container-default jar s/1\\.0-alpha-.*/1.0-alpha/"));
- instance.transformPom(pom, updatedPom, noParent, false, "maven2");
+ instance.transformPom(pom, updatedPom, noParent, false, null, "maven2");
assertXMLEqual(read("maven-core.transformed"), read(updatedPom));
}
/**
* Test of cleanPom method, of class POMCleaner.
*/
+ public void testTransformMavenJavadocPluginPom() throws Exception {
+ usePom("maven-javadoc-plugin.xml");
+ boolean noParent = true;
+ POMTransformer instance = new POMTransformer();
+ instance.addDefaultRules();
+ instance.addRule(new DependencyRule("org.codehaus.modello modello-maven-plugin maven-plugin s/.*/1.0.1/"));
+ instance.addRule(new DependencyRule("org.codehaus.mojo clirr-maven-plugin * *"));
+ instance.addRule(new DependencyRule("org.apache.bcel bcel jar s/5\\..*/5.x/"));
+ instance.addRule(new DependencyRule("* maven-plugin-plugin maven-plugin s/.*/2.5/"));
+ instance.transformPom(pom, updatedPom, noParent, false, null, null);
+ assertXMLEqual(read("maven-javadoc-plugin.transformed"), read(updatedPom));
+ }
+
+ /**
+ * Test of cleanPom method, of class POMCleaner.
+ */
public void testTransformModelloPom() throws Exception {
usePom("modello-core.xml");
boolean noParent = false;
POMTransformer instance = new POMTransformer();
instance.addDefaultRules();
- instance.transformPom(pom, updatedPom, noParent, false, "libmodello-java");
+ instance.transformPom(pom, updatedPom, noParent, false, null, "libmodello-java");
assertXMLEqual(read("modello-core.transformed"), read(updatedPom));
}
@@ -69,7 +85,7 @@
boolean noParent = false;
POMTransformer instance = new POMTransformer();
instance.addDefaultRules();
- instance.transformPom(pom, updatedPom, noParent, true, "libdoxia-java");
+ instance.transformPom(pom, updatedPom, noParent, true, null, "libdoxia-java");
assertXMLEqual(read("doxia-module-fml.transformed"), read(updatedPom));
}
Modified: trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
@@ -203,11 +203,5 @@
<version>debian</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.x</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-fml</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/maven-core.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven-core.transformed 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/maven-core.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/maven-core.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven-core.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/maven-core.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Added: trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.transformed (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -0,0 +1,441 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Javadoc Plugin</name>
+ <description>The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
+ generating javadocs for the specified project.</description>
+ <inceptionYear>2004</inceptionYear>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-2.5</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MJAVADOC</url>
+ </issueManagement>
+ <properties>
+ <doxiaVersion>1.0-alpha-11</doxiaVersion>
+ <doxia-sitetoolsVersion>1.0-alpha-11</doxia-sitetoolsVersion>
+ <wagonVersion>1.0-beta-2</wagonVersion>
+ <debian.originalVersion>2.5</debian.originalVersion>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>1.0.0</version>
+ <models>
+ <model>src/main/mdo/javadocOptions.mdo</model>
+ </models>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.2.1</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>**/MJAVADOC-110/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-126/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-137/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-172/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-180/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-194/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-206/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>l10n-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <locales>
+ <locale>de</locale>
+ <locale>fr</locale>
+ </locales>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <resolutionIds>Closed</resolutionIds>
+ <sortColumnNames>Type,Key</sortColumnNames>
+ <maxEntries>1000</maxEntries>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <taglets>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Added: trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.xml (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/maven-javadoc-plugin.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -0,0 +1,489 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugins</artifactId>
+ <version>11</version>
+ </parent>
+
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Javadoc Plugin</name>
+ <description>
+ The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
+ generating javadocs for the specified project.
+ </description>
+ <inceptionYear>2004</inceptionYear>
+
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-2.5</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MJAVADOC</url>
+ </issueManagement>
+
+ <properties>
+ <doxiaVersion>1.0-alpha-11</doxiaVersion>
+ <doxia-sitetoolsVersion>1.0-alpha-11</doxia-sitetoolsVersion>
+ <wagonVersion>1.0-beta-2</wagonVersion>
+ </properties>
+
+ <dependencies>
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+ <!-- Doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+
+ <!-- Doxia-sitetools -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>${doxia-sitetoolsVersion}</version>
+ </dependency>
+
+ <!-- wagon -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+
+ <!-- misc -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <!-- Plexus -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <!-- Using org.codehaus.plexus:plexus-utils instead of -->
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- TODO: remove when maven-plugins parent pom 12 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>1.0.0</version>
+ <models>
+ <model>src/main/mdo/javadocOptions.mdo</model>
+ </models>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.2.1</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>**/MJAVADOC-110/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-126/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-137/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-172/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-180/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-194/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-206/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>l10n-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <locales>
+ <locale>de</locale>
+ <locale>fr</locale>
+ </locales>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <!-- For JIRA-report -->
+ <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <resolutionIds>Closed</resolutionIds>
+ <sortColumnNames>Type,Key</sortColumnNames>
+ <maxEntries>1000</maxEntries> <!-- MCHANGES-124 -->
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <!-- TODO: remove when maven-plugins parent pom 12 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <taglets>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.3</version>
+ </tagletArtifact>
+ </taglet>
+
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: trunk/maven-repo-helper/src/test/resources/maven.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/maven.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/maven.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven.transformed 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/maven.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/maven.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/maven.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: trunk/maven-repo-helper/src/test/resources/modello-core.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<parent>
<artifactId>modello</artifactId>
<groupId>org.codehaus.modello</groupId>
@@ -23,11 +23,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
@@ -23,11 +23,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/maven-repo-helper/src/test/resources/modello-core.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.transformed 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/modello-core.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<parent>
<artifactId>modello</artifactId>
<groupId>org.codehaus.modello</groupId>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-active-collections</artifactId>
@@ -23,12 +23,6 @@
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.x</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<scm>
<connection>scm:svn:http://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2</connection>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-active-collections.pom
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-active-collections.pom 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-active-collections.pom 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>plexus-components</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-archiver.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-archiver.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-archiver.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-archiver.pom
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-archiver.pom 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-archiver.pom 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -8,7 +8,7 @@
<properties>
<debian.originalVersion>1.0-alpha-9-stable-1</debian.originalVersion>
<debian.package>libplexus-container-default-java</debian.package>
- <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/]]></debian.mavenRules>
+ <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/ *]]></debian.mavenRules>
</properties>
<name>Default Plexus Container</name>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -12,7 +12,7 @@
</parent>
<properties>
<debian.originalVersion>1.0-alpha-9-stable-1</debian.originalVersion>
- <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/]]></debian.mavenRules>
+ <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/ *]]></debian.mavenRules>
</properties>
<name>Default Plexus Container</name>
Modified: trunk/maven-repo-helper/src/test/resources/slf4j.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/slf4j.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/slf4j.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/slf4j.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/slf4j.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/slf4j.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
Modified: trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.xml 2009-07-28 13:33:27 UTC (rev 9398)
+++ trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.xml 2009-07-28 18:34:59 UTC (rev 9399)
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
More information about the pkg-java-commits
mailing list