debian/changelog

+libhibernate-validator-java (4.3.3-5) unstable; urgency=medium
+
+  * Team upload.
+  * Use the maven-jaxb2-plugin instead of invoking xjc directly to fix the build
+    failure with Java 11 (Closes: #905359)
+  * Added the missing build dependency on libeasymock-java
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 19 Sep 2018 10:39:24 +0200
+
 libhibernate-validator-java (4.3.3-4) unstable; urgency=high
 
   * Team upload.

debian/control

@@ -2,10 +2,14 @@ Source: libhibernate-validator-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner@debian.org>, Varun Hiremath <varun@debian.org>
-Build-Depends: debhelper (>= 11),
+Uploaders:
+ Torsten Werner <twerner@debian.org>,
+ Varun Hiremath <varun@debian.org>
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
  groovy,
+ libeasymock-java,
  libgeronimo-validation-1.0-spec-java,
  libhibernate3-java,
  libjavassist-java,
@@ -17,14 +21,15 @@ Build-Depends: debhelper (>= 11),
  libjtype-java,
  liblog4j1.2-java,
  libmaven-bundle-plugin-java,
+ libmaven-jaxb2-plugin-java,
  libmaven-processor-plugin-java,
  libmaven-reporting-impl-java,
  libmaven-shade-plugin-java,
  maven-debian-helper,
  testng (>= 6.8.7)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libhibernate-validator-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libhibernate-validator-java.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/libhibernate-validator-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libhibernate-validator-java
 Homepage: http://validator.hibernate.org
 
 Package: libhibernate-validator-java

debian/patches/02-jaxb-plugin.patch

+Description: Use org.jvnet.jaxb2.maven2:maven-jaxb2-plugin instead of org.codehaus.mojo:jaxb2-maven-plugin
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/engine/pom.xml
++++ b/engine/pom.xml
+@@ -136,6 +136,34 @@
+         </testResources>
+         <plugins>
+             <plugin>
++                <groupId>org.jvnet.jaxb2.maven2</groupId>
++                <artifactId>maven-jaxb22-plugin</artifactId>
++                <executions>
++                    <execution>
++                        <id>jaxb-generate</id>
++                        <phase>generate-sources</phase>
++                        <goals>
++                            <goal>generate</goal>
++                        </goals>
++                        <configuration>
++                            <schemaDirectory>${basedir}/src/main/xsd/</schemaDirectory>
++                            <schemaIncludes>
++                                <schemaInclude>validation-mapping-1.0.xsd</schemaInclude>
++                                <schemaInclude>validation-configuration-1.0.xsd</schemaInclude>
++                            </schemaIncludes>
++                            <bindingDirectory>${basedir}/src/main/xjb/</bindingDirectory>
++                            <bindingIncludes>
++                                <bindingInclude>binding-customization.xjb</bindingInclude>
++                            </bindingIncludes>
++                            <generateDirectory>${project.build.directory}/generated-sources/jaxb/</generateDirectory>
++                            <generatePackage>org.hibernate.validator.internal.xml</generatePackage>
++                            <extension>true</extension>
++                            <enableIntrospection>true</enableIntrospection>
++                        </configuration>
++                    </execution>
++                </executions>
++            </plugin>
++            <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>jaxb2-maven-plugin</artifactId>
+                 <executions>

debian/patches/series

 01-workaround-maven-repo-helper-bug.patch
+02-jaxb-plugin.patch
 jboss-logging-tools.patch
 CVE-2017-7536.patch

debian/rules

 #!/usr/bin/make -f
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
 %:
 	dh $@
 
@@ -10,31 +8,3 @@ override_dh_auto_configure:
 	# See jboss-logging-tools.patch
 	cp -r $(CURDIR)/jboss/classes $(CURDIR)/engine/target/
 	cp -r $(CURDIR)/jboss/generated-sources $(CURDIR)/engine/target/
-	# Invoke xjc manually due to the lack of jaxb2-maven-plugin in Debian
-	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -enableIntrospection -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 -enableIntrospection -p org.hibernate.validator.internal.xml ../xsd/validation-configuration-1.0.xsd
-
-override_dh_clean:
-	dh_clean
-
-	# Remove the files generated by xjc
-	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
-
-get-orig-source:
-	uscan --download-current-version --force-download

debian/watch

-version=3
-opts=uversionmangle=s/\.(Final|GA)//;s/.((?i)alpha|beta|cr)/~\L$1/;s/_/./g \
+version=4
+opts=repack,compression=xz,uversionmangle=s/\.(Final|GA)//;s/.((?i)alpha|beta|cr)/~\L$1/;s/_/./g \
 https://github.com/hibernate/hibernate-validator/releases .*/([\d\.]+).(?:Final|GA).tar.gz