This is an automated email from the git hooks/post-receive script. jamespage pushed a commit to branch patch-queue/master in repository jenkins.
commit 7ef82b5fd85a3b6eba0f9d22890987f4cfaf940e Author: Debian Java Maintainers <[email protected]> Date: Sun Aug 11 10:41:38 2013 +0100 build Gbp-Pq-Topic: build --- core/pom.xml | 10 ++++++++++ pom.xml | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c72677e..55078a5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -326,6 +326,16 @@ THE SOFTWARE. <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-fmt</artifactId> <version>1.0</version> + <exclusions> + <exclusion> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly</artifactId> + </exclusion> + <exclusion> + <groupId>commons-jexl</groupId> + <artifactId>commons-jexl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-jelly</groupId> diff --git a/pom.xml b/pom.xml index 9e32fca..8b43d42 100644 --- a/pom.xml +++ b/pom.xml @@ -48,10 +48,7 @@ THE SOFTWARE. <modules> <module>core</module> - <module>maven-plugin</module> - <module>ui-samples-plugin</module> <module>war</module> - <module>test</module> <module>cli</module> <module>plugins</module> </modules> @@ -621,9 +618,6 @@ THE SOFTWARE. <requireJavaVersion> <version>1.6.0-18</version> </requireJavaVersion> - <requireMavenVersion> - <version>3.0</version> - </requireMavenVersion> </rules> </configuration> </execution> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
