This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven2.
commit 859db9c020b04545c960a384643611ebc606fdd0 Author: Paul Cager <[email protected]> Date: Sat Jun 21 21:39:56 2008 +0000 * Added maven-toolchain to list of sub-projects to build. (Closes: #486938). * Standards version 3.8.0 (no changes necessary). --- debian/build.xml | 9 +++++++-- debian/changelog | 10 ++++++++-- debian/control | 3 +-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 93fbae9..31c9923 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -33,8 +33,8 @@ <target name="package" depends="jar,javadoc"/> <property file="debian/build.properties"/> - <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java: [...] - <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources"/> + <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java: [...] + <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources:maven-toolchain/build/generated-sources"/> <property name="maven.sourceRoots" value="${maven.mainSourceRoots}:${maven.generatedSourceRoots}"/> <target name="init"> @@ -70,6 +70,9 @@ <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/> <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/> <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/> + <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/> + <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/> + <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/> </target> <target name="compile" depends="init, generate-sources"> @@ -106,6 +109,7 @@ <fileset dir="maven-settings/src/main/resources" /> <fileset dir="maven-script/maven-script-ant/src/main/resources" /> <fileset dir="maven-project/src/main/resources" /> + <fileset dir="maven-toolchain/src/main/resources" /> </copy> <jar jarfile="${build.dir}/${package}${jar.suffix}" @@ -127,5 +131,6 @@ <delete dir="maven-settings/build/generated-sources"/> <delete dir="maven-plugin-registry/build/generated-sources"/> <delete dir="maven-plugin-descriptor/build/generated-sources"/> + <delete dir="maven-toolchain/build/generated-sources"/> </target> </project> diff --git a/debian/changelog b/debian/changelog index 635e977..a5875b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -maven2 (2.0.9-2 UNRELEASED; urgency=low +maven2 (2.0.9-2) unstable; urgency=low + [ Michael Koch ] * Reworked watch file to support RC versions correctly. * Added myself to Uploaders. - -- Michael Koch <[email protected]> Sun, 27 Apr 2008 13:36:36 +0200 + [ Paul Cager ] + * Added maven-toolchain to list of sub-projects to build. + (Closes: #486938). + * Standards version 3.8.0 (no changes necessary). + + -- Paul Cager <[email protected]> Sat, 21 Jun 2008 20:49:29 +0000 maven2 (2.0.9-1) unstable; urgency=low diff --git a/debian/control b/debian/control index f9b57d7..ecb3abc 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libplexus-interactivity-api-java, libplexus-utils-java (>=1:1.4.8), libwagon-java, maven-ant-helper Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://maven.apache.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2 @@ -24,7 +24,6 @@ Depends: libcommons-cli-java (>= 1.1-2), libjsch-java, libxalan2-java, libplexus-utils-java (>=1:1.4.8) Conflicts: maven2-binary Replaces: maven2-binary -Homepage: http://maven.apache.org/ Description: Java software project management and comprehension tool Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
