[libhibernate-validator-java] 09/14: Updated the build for the new project layout

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libhibernate-validator-java.

commit b7626199947fa0dfe9679ba4282b3ce9963905f8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 31 22:09:53 2016 +0200

    Updated the build for the new project layout
---
 debian/changelog                        |  1 +
 debian/libhibernate-validator-java.poms | 13 ++++++++-----
 debian/rules                            | 24 ++++++++++++++++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78f1b75..644c200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libhibernate-validator-java (4.3.2-1) UNRELEASED; urgency=medium
     - New build dependency on groovy2
     - New dependency on libjboss-logging-tools-java
     - Removed jaxb-binding-fixes.patch (fixed upstream)
+    - Updated the build for the new project layout
   * Added the missing Maven rule for log4j
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
diff --git a/debian/libhibernate-validator-java.poms b/debian/libhibernate-validator-java.poms
index 2490b29..e0ac196 100644
--- a/debian/libhibernate-validator-java.poms
+++ b/debian/libhibernate-validator-java.poms
@@ -1,6 +1,9 @@
 pom.xml
-hibernate-validator/pom.xml --java-lib
-hibernate-validator-annotation-processor/pom.xml --ignore
-hibernate-validator-archetype/pom.xml --ignore
-hibernate-validator-tck-runner/pom.xml --ignore
-hibernate-validator-distribution/pom.xml --ignore
+engine/pom.xml --java-lib
+annotation-processor/pom.xml --ignore
+archetype/pom.xml --ignore
+tck-runner/pom.xml --ignore
+distribution/pom.xml --ignore
+documentation/pom.xml --ignore
+performance/pom.xml --ignore
+integration/pom.xml --ignore
diff --git a/debian/rules b/debian/rules
index 06806e6..f64dddc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,32 @@ JAVA_HOME            := /usr/lib/jvm/default-java
 clean::
 	mh_clean
 	rm -f mvn-build
-	rm -rf $(CURDIR)/hibernate-validator/src/main/java/org/jboss
 	find ./ -name *.class |xargs rm -rf
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/AnnotationType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/BeanType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ClassType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ConstraintDefinitionType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ConstraintMappingsType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ConstraintType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ElementType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/FieldType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/GetterType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/GroupSequenceType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/GroupsType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ObjectFactory.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/PayloadType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/PropertyType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ValidatedByType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ValidationConfigType.java
+	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/package-info.java
 
 configure/libhibernate-validator-java::
-	cd $(CURDIR)/hibernate-validator/src/main/java && $(JAVA_HOME)/bin/xjc -extension -b ../xjb/binding-customization.xjb ../xsd/validation-mapping-1.0.xsd
-	cd $(CURDIR)/hibernate-validator/src/main/java && $(JAVA_HOME)/bin/xjc ../xsd/validation-configuration-1.0.xsd
+	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -p org.hibernate.validator.internal.xml -extension -b ../xjb/binding-customization.xjb ../xsd/validation-mapping-1.0.xsd
+	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -p org.hibernate.validator.internal.xml ../xsd/validation-configuration-1.0.xsd
 
 binary/libhibernate-validator-java::
 	cp pom.xml.save pom.xml
-	cp hibernate-validator/pom.xml.save hibernate-validator/pom.xml
+	cp engine/pom.xml.save engine/pom.xml
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

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