package init

2020-08-25 12:11:46 +08:00 · 2020-08-25 12:11:46 +08:00 · 17fc97b452
commit 17fc97b452
parent 13221efe06
4 changed files with 291 additions and 0 deletions
--- a/hibernate-validator-5.2.4.Final-jaxb.patch
+++ b/hibernate-validator-5.2.4.Final-jaxb.patch
@ -0,0 +1,153 @@
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java	2016-06-07 11:53:45.568875613 +0200
+@@ -107,10 +107,10 @@
+ 			ExecutableElement methodExecutableElement = ExecutableElement.forMethod( method );
+ 
+ 			// ignore annotations
+-			if ( methodType.getIgnoreAnnotations() != null ) {
+			if ( methodType.isIgnoreAnnotations() != null ) {
+ 				annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
+ 						method,
+-						methodType.getIgnoreAnnotations()
+						methodType.isIgnoreAnnotations()
+ 				);
+ 			}
+ 
+@@ -166,10 +166,10 @@
+ 			ExecutableElement constructorExecutableElement = ExecutableElement.forConstructor( constructor );
+ 
+ 			// ignore annotations
+-			if ( constructorType.getIgnoreAnnotations() != null ) {
+			if ( constructorType.isIgnoreAnnotations() != null ) {
+ 				annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
+ 						constructor,
+-						constructorType.getIgnoreAnnotations()
+						constructorType.isIgnoreAnnotations()
+ 				);
+ 			}
+ 
+@@ -251,10 +251,10 @@
+ 		}
+ 
+ 		// ignore annotations
+-		if ( crossParameterType.getIgnoreAnnotations() != null ) {
+		if ( crossParameterType.isIgnoreAnnotations() != null ) {
+ 			annotationProcessingOptions.ignoreConstraintAnnotationsForCrossParameterConstraint(
+ 					executableElement.getMember(),
+-					crossParameterType.getIgnoreAnnotations()
+					crossParameterType.isIgnoreAnnotations()
+ 			);
+ 		}
+ 
+@@ -289,10 +289,10 @@
+ 		);
+ 
+ 		// ignore annotations
+-		if ( returnValueType.getIgnoreAnnotations() != null ) {
+		if ( returnValueType.isIgnoreAnnotations() != null ) {
+ 			annotationProcessingOptions.ignoreConstraintAnnotationsForReturnValue(
+ 					executableElement.getMember(),
+-					returnValueType.getIgnoreAnnotations()
+					returnValueType.isIgnoreAnnotations()
+ 			);
+ 		}
+ 
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java	2016-06-07 11:53:45.580874986 +0200
+@@ -84,10 +84,10 @@
+ 
+ 
+ 			// ignore annotations
+-			if ( fieldType.getIgnoreAnnotations() != null ) {
+			if ( fieldType.isIgnoreAnnotations() != null ) {
+ 				annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
+ 						field,
+-						fieldType.getIgnoreAnnotations()
+						fieldType.isIgnoreAnnotations()
+ 				);
+ 			}
+ 		}
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java	2016-06-07 11:53:45.581874934 +0200
+@@ -88,10 +88,10 @@
+ 			constrainedExecutables.add( constrainedGetter );
+ 
+ 			// ignore annotations
+-			if ( getterType.getIgnoreAnnotations() != null ) {
+			if ( getterType.isIgnoreAnnotations() != null ) {
+ 				annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
+ 						getter,
+-						getterType.getIgnoreAnnotations()
+						getterType.isIgnoreAnnotations()
+ 				);
+ 			}
+ 		}
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java	2016-06-07 11:53:45.582874882 +0200
+@@ -71,11 +71,11 @@
+ 			);
+ 
+ 			// ignore annotations
+-			if ( parameterType.getIgnoreAnnotations() != null ) {
+			if ( parameterType.isIgnoreAnnotations() != null ) {
+ 				annotationProcessingOptions.ignoreConstraintAnnotationsOnParameter(
+ 						executableElement.getMember(),
+ 						i,
+-						parameterType.getIgnoreAnnotations()
+						parameterType.isIgnoreAnnotations()
+ 				);
+ 			}
+ 
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java	2016-06-07 11:53:45.582874882 +0200
+@@ -67,10 +67,10 @@
+ 		}
+ 
+ 		// ignore annotation
+-		if ( classType.getIgnoreAnnotations() != null ) {
+		if ( classType.isIgnoreAnnotations() != null ) {
+ 			annotationProcessingOptions.ignoreClassLevelConstraintAnnotations(
+ 					beanClass,
+-					classType.getIgnoreAnnotations()
+					classType.isIgnoreAnnotations()
+ 			);
+ 		}
+ 
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java	2016-06-07 11:53:45.583874830 +0200
+@@ -156,7 +156,7 @@
+ 		EnumSet<ExecutableType> defaultValidatedExecutableTypes = executableValidationType == null
+ 				? getValidatedExecutableTypes( null )
+ 				: getValidatedExecutableTypes( executableValidationType.getDefaultValidatedExecutableTypes() );
+-		boolean executableValidationEnabled = executableValidationType == null || executableValidationType.getEnabled();
+		boolean executableValidationEnabled = executableValidationType == null || executableValidationType.isEnabled();
+ 
+ 		return new BootstrapConfigurationImpl(
+ 				config.getDefaultProvider(),
+diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java
+--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java	2016-02-17 16:11:40.000000000 +0100
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java	2016-06-07 11:53:45.584874777 +0200
+@@ -208,7 +208,7 @@
+ 		// update annotation ignores
+ 		annotationProcessingOptions.ignoreAnnotationConstraintForClass(
+ 				beanClass,
+-				bean.getIgnoreAnnotations()
+				bean.isIgnoreAnnotations()
+ 		);
+ 
+ 		ConstrainedType constrainedType = constrainedTypeBuilder.buildConstrainedType(
+@@ -293,7 +293,7 @@
+ 		constraintHelper.putValidatorClasses(
+ 				annotationClass,
+ 				constraintValidatorClasses,
+-				Boolean.TRUE.equals( validatedByType.getIncludeExistingValidators() )
+				Boolean.TRUE.equals( validatedByType.isIncludeExistingValidators() )
+ 		);
+ 	}
+ 
--- a/hibernate-validator-5.2.4.Final.tar.gz
+++ b/hibernate-validator-5.2.4.Final.tar.gz
--- a/hibernate-validator.spec
+++ b/hibernate-validator.spec
@ -0,0 +1,134 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+%global majorversion 5
+
+Name:                hibernate-validator
+Version:             5.2.4
+Release:             1
+Summary:             Bean Validation 1.1 (JSR 349) Reference Implementation
+License:             ASL 2.0
+URL:                 http://www.hibernate.org/subprojects/validator.html
+Source0:             https://github.com/hibernate/hibernate-validator/archive/%{namedversion}/hibernate-validator-%{namedversion}.tar.gz
+# JAXB2 and JDK7+ problems see https://hibernate.atlassian.net/browse/HV-528
+Patch0:              %{name}-5.2.4.Final-jaxb.patch
+
+BuildRequires:       maven-local mvn(com.fasterxml:classmate) mvn(com.sun.xml.bind:jaxb-impl)
+BuildRequires:       mvn(com.thoughtworks.paranamer:paranamer)
+BuildRequires:       mvn(javax.annotation:javax.annotation-api) mvn(javax.el:javax.el-api)
+BuildRequires:       mvn(javax.enterprise:cdi-api) mvn(javax.validation:validation-api)
+BuildRequires:       mvn(javax.xml.bind:jaxb-api) mvn(joda-time:joda-time) mvn(junit:junit)
+BuildRequires:       mvn(log4j:log4j:1.2.17) mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:       mvn(org.codehaus.mojo:jaxb2-maven-plugin) mvn(org.glassfish.web:javax.el)
+BuildRequires:       mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api)
+BuildRequires:       mvn(org.jboss.arquillian:arquillian-bom:pom:)
+BuildRequires:       mvn(org.jboss.maven.plugins:maven-injection-plugin)
+BuildRequires:       mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
+BuildRequires:       mvn(org.jboss.logging:jboss-logging) >= 3.1.1
+BuildRequires:       mvn(org.jboss.logging:jboss-logging-processor:1)
+BuildRequires:       mvn(org.jboss.maven.plugins:maven-injection-plugin)
+BuildRequires:       mvn(org.jboss.shrinkwrap:shrinkwrap-bom:pom:)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-bom:pom:)
+BuildRequires:       mvn(org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom:pom:)
+BuildRequires:       mvn(org.jsoup:jsoup) mvn(org.testng:testng)
+BuildArch:           noarch
+
+%description
+This is the reference implementation of JSR-349 - Bean Validation 1.1.
+Bean Validation defines a meta-data model and API for JavaBean as well
+as method validation. The default meta-data source are annotations,
+with the ability to override and extend the meta-data through the
+use of XML validation descriptors.
+
+%package annotation-processor
+Summary:             Hibernate Validator Annotation Processor
+%description annotation-processor
+Hibernate Validator Annotation Processor.
+
+%package cdi
+Summary:             Hibernate Validator Portable Extension
+%description cdi
+Hibernate Validator CDI Portable Extension.
+
+%package parent
+Summary:             Hibernate Validator Parent POM
+%description parent
+Aggregator of the Hibernate Validator modules.
+
+%package performance
+Summary:             Hibernate Validator Performance Tests
+%description performance
+Hibernate Validator performance tests.
+
+%package test-utils
+Summary:             Hibernate Validator Test Utils
+%description test-utils
+Hibernate Validator Test Utils.
+
+%package javadoc
+Summary:             Javadoc for %{name}
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{namedversion}
+find . -name "*.jar" -delete
+%patch0 -p1
+%pom_disable_module distribution
+%pom_disable_module documentation
+%pom_disable_module engine-jdk8-tests
+%pom_disable_module integration
+%pom_disable_module osgi
+%pom_disable_module tck-runner
+%pom_remove_dep :fest-assert test-utils
+rm -r test-utils/src/main/java/org/hibernate/validator/testutil/ConstraintViolationAssert.java \
+ test-utils/src/main/java/org/hibernate/validator/testutil/DescriptorAssert.java \
+ test-utils/src/main/java/org/hibernate/validator/testutil/MessageLoggedAssertionLogger.java
+%pom_remove_plugin :maven-jdocbook-plugin
+%pom_remove_plugin org.zanata:zanata-maven-plugin
+%pom_remove_plugin -r org.codehaus.gmaven:gmaven-plugin
+%pom_remove_plugin -r org.codehaus.mojo:clirr-maven-plugin
+%pom_remove_plugin -r org.codehaus.mojo:chronos-jmeter-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:chronos-report-maven-plugin performance
+%pom_xpath_remove "pom:build/pom:extensions"
+%pom_remove_plugin -r :maven-dependency-plugin
+%pom_remove_plugin -r :maven-surefire-report-plugin
+%pom_remove_plugin -r :animal-sniffer-maven-plugin
+%pom_xpath_inject "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" " <excludePackageNames>*.internal.*</excludePackageNames>"
+%pom_xpath_set "pom:maven.javadoc.skip" false
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" \
+ "<useIncrementalCompilation>false</useIncrementalCompilation>"
+%pom_xpath_set "pom:properties/pom:jboss.logging.processor.version" 1
+%pom_change_dep :jboss-logging-processor ::'${jboss.logging.processor.version}' engine
+rm engine/src/main/java/org/hibernate/validator/internal/engine/valuehandling/JavaFXPropertyValueUnwrapper.java
+
+%build
+%mvn_build -f -s -- -Pdist
+
+%install
+%mvn_install
+
+%files -f .mfiles-%{name}
+%doc CONTRIBUTING.md README.md changelog.txt
+%license copyright.txt license.txt
+
+%files annotation-processor -f .mfiles-%{name}-annotation-processor
+%license copyright.txt license.txt
+
+%files cdi -f .mfiles-%{name}-cdi
+
+%files parent -f .mfiles-%{name}-parent
+%license copyright.txt license.txt
+
+%files performance -f .mfiles-%{name}-performance
+%license copyright.txt license.txt
+
+%files test-utils -f .mfiles-%{name}-test-utils
+%license copyright.txt license.txt
+
+%files javadoc -f .mfiles-javadoc
+%license copyright.txt license.txt
+
+%changelog
+* Wed Aug 12 2020 maminjie <maminjie1@huawei.com> - 5.2.4-1
+- package init
--- a/hibernate-validator.yaml
+++ b/hibernate-validator.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: hibernate/hibernate-validator
+tag_prefix: ^
+seperator: "."