[Git][java-team/libhibernate-validator-java][master] 7 commits: Standards-Version updated to 4.2.1
Emmanuel Bourg
gitlab at salsa.debian.org
Wed Sep 19 09:46:06 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libhibernate-validator-java
Commits:
8bb72214 by Emmanuel Bourg at 2018-09-19T07:52:10Z
Standards-Version updated to 4.2.1
- - - - -
b00c5b01 by Emmanuel Bourg at 2018-09-19T07:52:10Z
Switch to debhelper level 11
- - - - -
683c5c55 by Emmanuel Bourg at 2018-09-19T07:52:10Z
Use salsa.debian.org Vcs-* URLs
- - - - -
9bd3c254 by Emmanuel Bourg at 2018-09-19T07:57:33Z
Wrap and sort
- - - - -
99b11624 by Emmanuel Bourg at 2018-09-19T08:00:03Z
Added the missing build dependency on libeasymock-java
- - - - -
b417ddf2 by Emmanuel Bourg at 2018-09-19T08:43:27Z
Use the maven-jaxb2-plugin instead of invoking xjc directly to fix the build failure with Java 11 (Closes: #905359)
- - - - -
80399dd0 by Emmanuel Bourg at 2018-09-19T08:43:31Z
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/02-jaxb-plugin.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+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 at 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,29 +2,34 @@ Source: libhibernate-validator-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 11),
- default-jdk,
- groovy,
- libgeronimo-validation-1.0-spec-java,
- libhibernate3-java,
- libjavassist-java,
- libjaxb-java,
- libjboss-logging-java,
- libjboss-logging-tools-java,
- libjoda-time-java,
- libjsoup-java,
- libjtype-java,
- liblog4j1.2-java,
- libmaven-bundle-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
+Uploaders:
+ Torsten Werner <twerner at debian.org>,
+ Varun Hiremath <varun at debian.org>
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ groovy,
+ libeasymock-java,
+ libgeronimo-validation-1.0-spec-java,
+ libhibernate3-java,
+ libjavassist-java,
+ libjaxb-java,
+ libjboss-logging-java,
+ libjboss-logging-tools-java,
+ libjoda-time-java,
+ libjsoup-java,
+ 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.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
=====================================
@@ -0,0 +1,40 @@
+Description: Use org.jvnet.jaxb2.maven2:maven-jaxb2-plugin instead of org.codehaus.mojo:jaxb2-maven-plugin
+Author: Emmanuel Bourg <ebourg at 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
=====================================
@@ -1,3 +1,4 @@
01-workaround-maven-repo-helper-bug.patch
+02-jaxb-plugin.patch
jboss-logging-tools.patch
CVE-2017-7536.patch
=====================================
debian/rules
=====================================
@@ -1,7 +1,5 @@
#!/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
=====================================
@@ -1,3 +1,3 @@
-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
View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator-java/compare/555085d14e7f69819f31e814e907d43f243490f0...80399dd0412415d54f34491226505345b65b3742
--
View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator-java/compare/555085d14e7f69819f31e814e907d43f243490f0...80399dd0412415d54f34491226505345b65b3742
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180919/c1eb6b1b/attachment.html>
More information about the pkg-java-commits
mailing list