[hibernate-commits] Hibernate SVN: r18001 - in validator/trunk: hibernate-validator and 2 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Nov 18 07:05:35 EST 2009
Author: hardy.ferentschik
Date: 2009-11-18 07:05:34 -0500 (Wed, 18 Nov 2009)
New Revision: 18001
Modified:
validator/trunk/hibernate-validator/pom.xml
validator/trunk/hibernate-validator/readme.txt
validator/trunk/hibernate-validator/src/main/assembly/dist.xml
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
validator/trunk/pom.xml
Log:
HV-272
Removed the jaxb profile and made the dependencies provided
Updated the readme and assembly configuration
Added enforcer to parent pom to force JDK
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/hibernate-validator/pom.xml 2009-11-18 12:05:34 UTC (rev 18001)
@@ -44,6 +44,24 @@
</dependency>
<!--
+ Provided dependencies.
+ JAXB is needed when running on Java5. In this environment these dependencies have to be added
+ On Java6 jaxb is part of the runtime environment
+ -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.12</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--
Optional dependencies
-->
<dependency>
@@ -131,7 +149,6 @@
<outputName>test-report</outputName>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -246,6 +263,13 @@
<artifactId>maven-cli-plugin</artifactId>
<version>0.6.3.CR3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:generate assembly:assembly deploy</goals>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -257,24 +281,4 @@
</plugin>
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>jaxb</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.3</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: validator/trunk/hibernate-validator/readme.txt
===================================================================
--- validator/trunk/hibernate-validator/readme.txt 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/hibernate-validator/readme.txt 2009-11-18 12:05:34 UTC (rev 18001)
@@ -16,11 +16,6 @@
is not based on JSR 303. This code can be accessed via
http://anonsvn.jboss.org/repos/hibernate/validator/trunk/hibernate-validator-legacy
- Status
- ------
-
- This is the first GA release of Hibernate Validator 4.
-
Documentation
-------------
@@ -41,9 +36,9 @@
Using Hibernate Validator
-------------------------
- - Copy hibernate-validator-*.jar together will all jar files from lib into the
- classpath of your application. In case you are running on JDK5 you have to also include
- all the jar files from the jdk5 subdirectory.
+ - In case you use the distribution archive from the download sire, copy hibernate-validator-*.jar together
+ with all jar files from lib into the classpath of your application.
+ In case you are using Java 5 you have to also include all the jar files from the jdk5 subdirectory.
or
@@ -55,7 +50,7 @@
<version>${project.version}</version>
</dependency>
- Hibernate Validator can be found in this repository: http://repository.jboss.com/maven2/
+ Hibernate Validator can be found in the JBoss Maven repository: http://repository.jboss.com/maven2/
Licensing
---------
Modified: validator/trunk/hibernate-validator/src/main/assembly/dist.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2009-11-18 12:05:34 UTC (rev 18001)
@@ -42,7 +42,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib/jdk5</outputDirectory>
- <scope>runtime</scope>
+ <scope>provided</scope>
<includes>
<include>javax.xml.bind:jaxb-api</include>
<include>com.sun.xml.bind:jaxb-impl</include>
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java 2009-11-18 12:05:34 UTC (rev 18001)
@@ -124,15 +124,15 @@
}
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 );
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java 2009-11-18 12:05:34 UTC (rev 18001)
@@ -168,10 +168,10 @@
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 +368,8 @@
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 +601,8 @@
}
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 +614,8 @@
}
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" );
}
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-11-18 10:49:30 UTC (rev 18000)
+++ validator/trunk/pom.xml 2009-11-18 12:05:34 UTC (rev 18001)
@@ -76,6 +76,28 @@
<version>1.0-beta-2</version>
</extension>
</extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <!-- require JDK 1.6 to run the build -->
+ <version>[1.6,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -143,7 +165,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
<remoteTagging>true</remoteTagging>
- <goals>package site assembly:assembly deploy</goals>
+ <goals>deploy</goals>
</configuration>
</plugin>
</plugins>
More information about the hibernate-commits
mailing list