[resteasy] 04/05: Updated the Maven rules

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository resteasy.

commit 5545faf3b042959b83617178fa13e84f8ecbd9aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 18 01:02:17 2017 +0100

    Updated the Maven rules
---
 debian/changelog             |  1 +
 debian/libresteasy-java.poms | 77 +++++++++++++++++++++-----------------------
 debian/maven.ignoreRules     |  3 +-
 debian/maven.properties      |  3 ++
 debian/maven.rules           |  4 +--
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c27377..3b067d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ resteasy (3.1.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Updated the Maven rules
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 18 Jan 2017 00:33:19 +0100
 
diff --git a/debian/libresteasy-java.poms b/debian/libresteasy-java.poms
index 3bc3635..c2d29a4 100644
--- a/debian/libresteasy-java.poms
+++ b/debian/libresteasy-java.poms
@@ -25,44 +25,39 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml
-jaxrs/pom.xml --no-parent --has-package-version
-jaxrs/arquillian/pom.xml --ignore
-jaxrs/async-http-servlet-3.0/pom.xml --ignore
-jaxrs/eagledns/pom.xml --ignore
-jaxrs/examples/pom.xml --ignore
-jaxrs/jboss-modules/pom.xml --ignore
-jaxrs/profiling-tests/pom.xml --ignore
-jaxrs/providers/pom.xml --has-package-version
-jaxrs/providers/fastinfoset/pom.xml --ignore
-jaxrs/providers/jaxb/pom.xml --has-package-version
-jaxrs/providers/jettison/pom.xml --has-package-version
-jaxrs/providers/jackson/pom.xml --has-package-version
-jaxrs/providers/jackson2/pom.xml --ignore
-jaxrs/providers/json-p-ee7/pom.xml --ignore
-jaxrs/providers/multipart/pom.xml --ignore
-jaxrs/providers/resteasy-atom/pom.xml --has-package-version
-jaxrs/providers/resteasy-hibernatevalidator-provider/pom.xml --ignore
-jaxrs/providers/resteasy-html/pom.xml --has-package-version
-jaxrs/providers/resteasy-validator-provider-11/pom.xml --ignore
-jaxrs/providers/test-all-jaxb/pom.xml --ignore
-jaxrs/providers/test-jackson-jaxb-coexistence/pom.xml --ignore
-jaxrs/providers/test-resteasy-html/pom.xml --ignore
-jaxrs/providers/yaml/pom.xml --has-package-version
-jaxrs/resteasy-bom/pom.xml --ignore
-jaxrs/resteasy-cache/pom.xml --ignore
-jaxrs/resteasy-cdi/pom.xml --ignore
-jaxrs/resteasy-client/pom.xml --has-package-version
-jaxrs/resteasy-guice/pom.xml --ignore
-jaxrs/resteasy-jaxrs/pom.xml --has-package-version
-jaxrs/resteasy-jaxrs-testsuite/pom.xml --ignore
-jaxrs/resteasy-jsapi/pom.xml --ignore
-jaxrs/resteasy-links/pom.xml --ignore
-jaxrs/resteasy-spring/pom.xml --ignore
-jaxrs/resteasy-servlet-initializer/pom.xml --ignore
-jaxrs/resteasy-test-data/pom.xml --ignore
-jaxrs/resteasy-wadl/pom.xml --ignore
-jaxrs/security/pom.xml --ignore
-jaxrs/server-adapters/pom.xml --ignore
-jaxrs/tjws/pom.xml --ignore
-jaxrs/war-tests/pom.xml --ignore
+pom.xml --no-parent --has-package-version
+arquillian/pom.xml --ignore
+eagledns/pom.xml --ignore
+jboss-modules/pom.xml --ignore
+profiling-tests/pom.xml --ignore
+providers/pom.xml --has-package-version
+providers/fastinfoset/pom.xml --ignore
+providers/jaxb/pom.xml --has-package-version
+providers/jettison/pom.xml --has-package-version
+providers/jackson/pom.xml --has-package-version
+providers/jackson2/pom.xml --ignore
+providers/json-p-ee7/pom.xml --ignore
+providers/multipart/pom.xml --ignore
+providers/resteasy-atom/pom.xml --has-package-version
+providers/resteasy-html/pom.xml --has-package-version
+providers/resteasy-validator-provider-11/pom.xml --ignore
+providers/yaml/pom.xml --has-package-version
+resteasy-bom/pom.xml --ignore
+resteasy-cache/pom.xml --ignore
+resteasy-cdi/pom.xml --ignore
+resteasy-client/pom.xml --has-package-version
+resteasy-dependencies-bom/pom.xml --no-parent --has-package-version
+resteasy-guice/pom.xml --ignore
+resteasy-jaxrs/pom.xml --has-package-version
+resteasy-jaxrs-services/pom.xml --has-package-version
+resteasy-jsapi/pom.xml --ignore
+resteasy-legacy/pom.xml --ignore
+resteasy-links/pom.xml --ignore
+resteasy-spring/pom.xml --ignore
+resteasy-servlet-initializer/pom.xml --ignore
+resteasy-wadl/pom.xml --ignore
+resteasy-wadl-undertow-connector/pom.xml --ignore
+security/pom.xml --ignore
+server-adapters/pom.xml --ignore
+tjws/pom.xml --ignore
+testsuite/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index f5eb41b..2283c41 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,12 +1,11 @@
 
-org.jboss.resteasy asynch-http-servlet-3.0-pom pom * * *
+org.jboss.arquillian arquillian-bom pom * * *
 org.jboss.resteasy eagledns-fork jar * * *
 org.jboss.resteasy http-adapter-pom pom * * *
 org.jboss.resteasy profiling-tests jar * * *
 org.jboss.resteasy resteasy-cache-pom pom * * *
 org.jboss.resteasy resteasy-cdi jar * * *
 org.jboss.resteasy resteasy-guice jar * * *
-org.jboss.resteasy resteasy-hibernatevalidator-provider jar * * *
 org.jboss.resteasy resteasy-jaxrs-testsuite jar * * *
 org.jboss.resteasy resteasy-jsapi jar * * *
 org.jboss.resteasy resteasy-spring jar * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 1f2d8b0..86c3834 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -5,3 +5,6 @@
 maven.test.skip=true
 project.build.sourceEncoding=UTF-8
 maven.compiler.useIncrementalCompilation=false
+
+maven.compiler.source=1.8
+maven.compiler.target=1.8
diff --git a/debian/maven.rules b/debian/maven.rules
index f867e25..9536578 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,12 +3,12 @@ s/msv-msv/net.java.dev.msv/ s/msv-msv/msv/ jar debian * *
 com.fasterxml.jackson.core jackson-annotations jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+junit junit jar s/.*/4.x/ * *
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
 org.yaml snakeyaml * s/.*/1.x/ * *
 com.sun.istack istack-commons-runtime * s/debian/2.17/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
-log4j log4j * s/1\.2\..*/1.2.x/ * *
+log4j log4j * s/.*/1.2.x/ * *
 s/org.jboss.spec.javax.annotation/org.apache.tomcat/ s/jboss-annotations-api_1.2_spec/tomcat-annotations-api/ * s/.*/8.x/ * *
 s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax.servlet-api/ * s/.*/3.1/ * *
 s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/3.0/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git