[libhibernate-validator-java] 03/04: New upstream release (4.2.1)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Nov 19 13:09:26 GMT 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch experimental
in repository libhibernate-validator-java.
commit abe23b8ec1b5d0295cf75ceec71d46e82ff852ec
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 19 12:36:55 2014 +0100
New upstream release (4.2.1)
---
debian/changelog | 7 +-
debian/control | 6 ++
debian/libhibernate-validator-java.poms | 3 +-
debian/maven.ignoreRules | 8 +-
debian/maven.rules | 2 +-
...on-t-build-sources-the-depend-on-jaxb-xjc.patch | 34 ---------
...0002-disable-maven-surefire-report-plugin.patch | 24 ------
debian/patches/disable-jpa-persistence-check.patch | 17 -----
debian/patches/jaxb-binding-fixes.patch | 86 +++-------------------
debian/patches/pom_modules.diff | 18 -----
debian/patches/pom_testng_classifier.patch | 35 ---------
debian/patches/series | 5 --
12 files changed, 32 insertions(+), 213 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bf8c480..14dfedf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-libhibernate-validator-java (4.0.2.GA-9) UNRELEASED; urgency=medium
+libhibernate-validator-java (4.2.1-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Fixes CVE-2014-3558 (Closes: #762690)
+ - Refreshed the patches
+ - Added libjaxb-java, libgeronimo-jpa-2.0-spec-java, libjoda-time-java,
+ libjavassist-java and libmaven-bundle-plugin-java to the build deps
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index eaa9544..3f08372 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,14 @@ Build-Depends: cdbs,
default-jdk,
glassfish-javaee,
libgeronimo-validation-1.0-spec-java,
+ libgeronimo-jpa-2.0-spec-java,
libhibernate3-java,
+ libjavassist-java,
+ libjaxb-java,
+ libjoda-time-java,
libjtype-java,
liblog4j1.2-java,
+ libmaven-bundle-plugin-java,
libmaven-reporting-impl-java,
libmaven-shade-plugin-java,
maven-debian-helper,
@@ -25,6 +30,7 @@ Architecture: all
Depends: glassfish-javaee,
libgeronimo-validation-1.0-spec-java,
libhibernate3-java,
+ libjoda-time-java,
libjtype-java,
${misc:Depends}
Description: Hibernate Validator
diff --git a/debian/libhibernate-validator-java.poms b/debian/libhibernate-validator-java.poms
index 2d1c3af..2490b29 100644
--- a/debian/libhibernate-validator-java.poms
+++ b/debian/libhibernate-validator-java.poms
@@ -1,5 +1,6 @@
pom.xml
hibernate-validator/pom.xml --java-lib
+hibernate-validator-annotation-processor/pom.xml --ignore
hibernate-validator-archetype/pom.xml --ignore
-hibernate-validator-legacy/pom.xml --ignore
hibernate-validator-tck-runner/pom.xml --ignore
+hibernate-validator-distribution/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 765f903..44d12f2 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,9 +15,15 @@
# junit junit jar s/3\..*/3.x/
org.apache.maven.wagon wagon-webdav jar *
+org.jboss.maven.plugins maven-injection-plugin *
org.jboss.maven.plugins maven-jdocbook-plugin maven-plugin *
org.jboss.maven.plugins maven-jdocbook-style-plugin maven-plugin *
org.codehaus.mojo jaxb2-maven-plugin maven-plugin *
-org.apache.maven.plugins maven-source-plugin maven-plugin *
org.twdata.maven maven-cli-plugin maven-plugin *
org.apache.maven.plugins maven-assembly-plugin maven-plugin *
+org.apache.maven.plugins maven-enforcer-plugin *
+org.apache.maven.plugins maven-javadoc-plugin *
+org.apache.maven.plugins maven-release-plugin *
+org.apache.maven.plugins maven-source-plugin maven-plugin *
+org.apache.maven.plugins maven-surefire-report-plugin *
+com.h2database h2 *
diff --git a/debian/maven.rules b/debian/maven.rules
index 0f3620c..4a19a10 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,6 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\..*/3.x/
-s/org.hibernate.java-persistence/javax.persistence/ s/jpa-api/persistence-api/ jar s/.*/debian/
+s/org\.hibernate\.javax\.persistence/org.apache.geronimo.specs/ s/hibernate-jpa-2\.0-api/geronimo-jpa_2.0_spec/ * s/.*/debian/ * *
s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ jar s/.*/debian/
org.testng testng jar s/.*/6.x/
diff --git a/debian/patches/0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch b/debian/patches/0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
deleted file mode 100644
index 4f536c0..0000000
--- a/debian/patches/0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 6 Jun 2010 21:25:54 +0200
-Subject: [PATCH] don't build sources the depend on jaxb-xjc
-
----
- hibernate-validator/pom.xml | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/hibernate-validator/pom.xml b/hibernate-validator/pom.xml
-index 7b00b6e..2f6b97e 100644
---- a/hibernate-validator/pom.xml
-+++ b/hibernate-validator/pom.xml
-@@ -77,6 +77,20 @@
- </resources>
- <plugins>
- <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <configuration>
-+ <excludes>
-+ <exclude>**/org/hibernate/validator/HibernateValidator.java</exclude>
-+ <exclude>**/org/hibernate/validator/engine/ConfigurationImpl.java</exclude>
-+ <exclude>**/org/hibernate/validator/engine/ValidatorFactoryImpl.java</exclude>
-+ <exclude>**/org/hibernate/validator/engine/resolver/JPATraversableResolver.java</exclude>
-+ <exclude>**/org/hibernate/validator/xml/ValidationXmlParser.java</exclude>
-+ <exclude>**/org/hibernate/validator/xml/XmlMappingParser.java</exclude>
-+ </excludes>
-+ </configuration>
-+ </plugin>
-+ <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
---
diff --git a/debian/patches/0002-disable-maven-surefire-report-plugin.patch b/debian/patches/0002-disable-maven-surefire-report-plugin.patch
deleted file mode 100644
index bd7aefc..0000000
--- a/debian/patches/0002-disable-maven-surefire-report-plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Disable maven-surefire-report-plugin reports tests
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-10-12
-
---- libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/pom.xml
-+++ libhibernate-validator-java-4.0.2.GA/hibernate-validator/pom.xml
-@@ -128,6 +128,8 @@
- </suiteXmlFiles>
- </configuration>
- </plugin>
-+ <!-- maven-surefire-report-plugin is disabled during build time
-+ because it is not compatible with libdoxia-java 1.1.4
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
-@@ -145,6 +146,7 @@
- <outputName>test-report</outputName>
- </configuration>
- </plugin>
-+ -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/disable-jpa-persistence-check.patch b/debian/patches/disable-jpa-persistence-check.patch
deleted file mode 100644
index 8dd1d49..0000000
--- a/debian/patches/disable-jpa-persistence-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Always return null as method used for persitence check does not exist in Debian version of API
-Author: Brian Thomason <brian.thomason at eucalytpus.com>
-
---- libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java
-+++ libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java
-@@ -30,8 +30,9 @@ public class JPATraversableResolver impl
-
- // TODO Check the call to PersistenceUtil. traversableProperty.getName() is this correct?
- public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) {
-- return traversableObject == null ||
-- Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName() );
-+ return traversableObject == null;
-+//||
-+// Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName() );
- }
-
- public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) {
diff --git a/debian/patches/jaxb-binding-fixes.patch b/debian/patches/jaxb-binding-fixes.patch
index 59fcbf7..41a4662 100644
--- a/debian/patches/jaxb-binding-fixes.patch
+++ b/debian/patches/jaxb-binding-fixes.patch
@@ -3,11 +3,11 @@ Description: JAXB binding fixes
intentionally disabled before as JAXB was not a part of OpenJDK.
Author: Brian Thomason <brian.thomason at eucalytpus.com>
---- libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
-+++ libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
-@@ -41,6 +41,9 @@ import org.hibernate.validator.util.Load
- import org.hibernate.validator.util.LoggerFactory;
- import org.hibernate.validator.util.NewInstance;
+--- a/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
++++ b/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
+@@ -45,6 +45,9 @@
+ import org.hibernate.validator.util.privilegedactions.NewSchema;
+ import org.hibernate.validator.util.privilegedactions.Unmarshal;
+import org.jboss.xml.ns.javax.validation.configuration.ValidationConfigType;
+import org.jboss.xml.ns.javax.validation.configuration.PropertyType;
@@ -15,31 +15,11 @@ Author: Brian Thomason <brian.thomason at eucalytpus.com>
/**
* Parser for <i>validation.xml</i> using JAXB.
*
-@@ -124,15 +127,15 @@ public class ValidationXmlParser {
- }
-
- private void setMappingStreamsFromXml(ValidationConfigType config, ValidationBootstrapParameters xmlParameters) {
-- for ( JAXBElement<String> mappingFileName : config.getConstraintMapping() ) {
-+ for ( String mappingFileName : config.getConstraintMapping() ) {
- if ( log.isDebugEnabled() ) {
- log.debug(
-- "Trying to open input stream for {}.", mappingFileName.getValue()
-+ "Trying to open input stream for {}.", mappingFileName
- );
- }
-- InputStream in = getInputStreamForPath( mappingFileName.getValue() );
-+ InputStream in = getInputStreamForPath( mappingFileName );
- if ( in == null ) {
-- throw new ValidationException( "Unable to open input stream for mapping file " + mappingFileName.getValue() + "." );
-+ throw new ValidationException( "Unable to open input stream for mapping file " + mappingFileName + "." );
- }
- xmlParameters.mappings.add( in );
- }
---- libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
-+++ libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
-@@ -65,6 +65,22 @@ import org.hibernate.validator.util.Logg
- import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor;
- import org.hibernate.validator.util.annotationfactory.AnnotationFactory;
+--- a/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
++++ b/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
+@@ -67,6 +67,22 @@
+ import static org.hibernate.validator.util.CollectionHelper.newHashMap;
+ import static org.hibernate.validator.util.CollectionHelper.newHashSet;
+import org.jboss.xml.ns.javax.validation.mapping.ConstraintDefinitionType;
+import org.jboss.xml.ns.javax.validation.mapping.ClassType;
@@ -60,49 +40,3 @@ Author: Brian Thomason <brian.thomason at eucalytpus.com>
/**
* @author Hardy Ferentschik
*/
-@@ -168,10 +184,10 @@ public class XmlMappingParser {
- if ( validatedByType.isIncludeExistingValidators() != null && validatedByType.isIncludeExistingValidators() ) {
- constraintValidatorClasses.addAll( findConstraintValidatorClasses( annotationClass ) );
- }
-- for ( JAXBElement<String> validatorClassName : validatedByType.getValue() ) {
-+ for ( String validatorClassName : validatedByType.getValue() ) {
- Class<? extends ConstraintValidator<?, ?>> validatorClass;
- validatorClass = ( Class<? extends ConstraintValidator<?, ?>> ) loadClass(
-- validatorClassName.getValue(),
-+ validatorClassName,
- this.getClass()
- );
-
-@@ -368,8 +384,8 @@ public class XmlMappingParser {
- private List<Class<?>> createGroupSequence(GroupSequenceType groupSequenceType, String defaultPackage) {
- List<Class<?>> groupSequence = new ArrayList<Class<?>>();
- if ( groupSequenceType != null ) {
-- for ( JAXBElement<String> groupName : groupSequenceType.getValue() ) {
-- Class<?> group = getClass( groupName.getValue(), defaultPackage );
-+ for ( String groupName : groupSequenceType.getValue() ) {
-+ Class<?> group = getClass( groupName, defaultPackage );
- groupSequence.add( group );
- }
- }
-@@ -601,8 +617,8 @@ public class XmlMappingParser {
- }
-
- List<Class<?>> groupList = new ArrayList<Class<?>>();
-- for ( JAXBElement<String> groupClass : groupsType.getValue() ) {
-- groupList.add( getClass( groupClass.getValue(), defaultPackage ) );
-+ for ( String groupClass : groupsType.getValue() ) {
-+ groupList.add( getClass( groupClass, defaultPackage ) );
- }
- return groupList.toArray( new Class[groupList.size()] );
- }
-@@ -614,8 +630,8 @@ public class XmlMappingParser {
- }
-
- List<Class<? extends Payload>> payloadList = new ArrayList<Class<? extends Payload>>();
-- for ( JAXBElement<String> groupClass : payloadType.getValue() ) {
-- Class<?> payload = getClass( groupClass.getValue(), defaultPackage );
-+ for ( String groupClass : payloadType.getValue() ) {
-+ Class<?> payload = getClass( groupClass, defaultPackage );
- if ( !Payload.class.isAssignableFrom( payload ) ) {
- throw new ValidationException( "Specified payload class " + payload.getName() + " does not implement javax.validation.Payload" );
- }
diff --git a/debian/patches/pom_modules.diff b/debian/patches/pom_modules.diff
deleted file mode 100644
index fd6e184..0000000
--- a/debian/patches/pom_modules.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable some modules from pom.xml
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-05-02
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -37,9 +37,11 @@
-
- <modules>
- <module>hibernate-validator</module>
-+<!--
- <module>hibernate-validator-archetype</module>
- <module>hibernate-validator-legacy</module>
- <module>hibernate-validator-tck-runner</module>
-+-->
- </modules>
-
- <dependencyManagement>
diff --git a/debian/patches/pom_testng_classifier.patch b/debian/patches/pom_testng_classifier.patch
deleted file mode 100644
index bb82d4d..0000000
--- a/debian/patches/pom_testng_classifier.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: removes jdk15 classifier from testng dependency
- * remove jdk15 classifier from testng dependency in pom.xml
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: 2013-10-04
-
---- a/hibernate-validator-tck-runner/pom.xml
-+++ b/hibernate-validator-tck-runner/pom.xml
-@@ -27,7 +27,6 @@
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
-- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.hibernate.jsr303.tck</groupId>
---- a/hibernate-validator/pom.xml
-+++ b/hibernate-validator/pom.xml
-@@ -60,7 +60,6 @@
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
-- <classifier>jdk15</classifier>
- </dependency>
- </dependencies>
- <build>
---- a/pom.xml
-+++ b/pom.xml
-@@ -63,7 +63,6 @@
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
-- <classifier>jdk15</classifier>
- </dependency>
- </dependencies>
- </dependencyManagement>
diff --git a/debian/patches/series b/debian/patches/series
index 3de461c..188b801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-#pom_modules.diff
-#0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
-0002-disable-maven-surefire-report-plugin.patch
-disable-jpa-persistence-check.patch
jaxb-binding-fixes.patch
-pom_testng_classifier.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libhibernate-validator-java.git
More information about the pkg-java-commits
mailing list