Repository: bval Updated Branches: refs/heads/bv2 3f287a7af -> 1eb57573d (forced update)
BV2: pom updates Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/af6ee90d Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/af6ee90d Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/af6ee90d Branch: refs/heads/bv2 Commit: af6ee90d3c31e6503a2483a66c0b7a06a5c5129b Parents: cd050cf Author: Matt Benson <[email protected]> Authored: Wed Feb 21 14:27:41 2018 -0600 Committer: Matt Benson <[email protected]> Committed: Wed Feb 21 14:27:41 2018 -0600 ---------------------------------------------------------------------- bundle/pom.xml | 2 +- bval-core/pom.xml | 2 +- bval-extras/pom.xml | 4 ++-- bval-json/pom.xml | 2 +- bval-jsr/pom.xml | 19 +++++++++++++------ bval-tck11/pom.xml | 8 ++++---- bval-xstream/pom.xml | 2 +- pom.xml | 39 ++++++++++++++++++++++++--------------- 8 files changed, 47 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/bundle/pom.xml b/bundle/pom.xml index 80cd95d..2f57116 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <!-- use fully qualified naming for OSGi bundles --> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-core/pom.xml ---------------------------------------------------------------------- diff --git a/bval-core/pom.xml b/bval-core/pom.xml index 48026d4..b7a7f8b 100644 --- a/bval-core/pom.xml +++ b/bval-core/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-core</artifactId> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-extras/pom.xml ---------------------------------------------------------------------- diff --git a/bval-extras/pom.xml b/bval-extras/pom.xml index 7a3edff..3dc7982 100644 --- a/bval-extras/pom.xml +++ b/bval-extras/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-extras</artifactId> @@ -69,7 +69,7 @@ <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.1_spec</artifactId> + <artifactId>geronimo-validation_2.0_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-json/pom.xml ---------------------------------------------------------------------- diff --git a/bval-json/pom.xml b/bval-json/pom.xml index a489071..59dcb17 100644 --- a/bval-json/pom.xml +++ b/bval-json/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-json</artifactId> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-jsr/pom.xml ---------------------------------------------------------------------- diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml index e716645..561d2d4 100644 --- a/bval-jsr/pom.xml +++ b/bval-jsr/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-jsr</artifactId> @@ -38,7 +38,7 @@ </properties> <profiles> <!-- - default profile using geronimo-validation_1.0_spec.jar active when + default profile using geronimo-validation_2.0_spec.jar active when property "ri" is not present. --> <profile> @@ -51,7 +51,7 @@ <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.1_spec</artifactId> + <artifactId>geronimo-validation_2.0_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> @@ -215,6 +215,10 @@ <version>1.0</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>javafx</artifactId> + </dependency> <!-- Testing dependencies --> <dependency> @@ -244,10 +248,10 @@ </resources> <plugins> - <plugin> <!-- http://jira.codehaus.org/browse/MJAXB-37 --> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>1.4</version> + <version>2.3.1</version> <executions> <execution> <goals> @@ -258,8 +262,11 @@ <configuration> <packageName>org.apache.bval.jsr.xml</packageName> <extension>true</extension> - <schemaFiles>validation-configuration-1.1.xsd,validation-mapping-1.1.xsd</schemaFiles> <enableIntrospection>true</enableIntrospection> + <sources> + <source>${project.basedir}/src/main/xsd/validation-configuration-2.0.xsd</source> + <source>${project.basedir}/src/main/xsd/validation-mapping-2.0.xsd</source> + </sources> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-tck11/pom.xml ---------------------------------------------------------------------- diff --git a/bval-tck11/pom.xml b/bval-tck11/pom.xml index fb2ae65..63611b9 100644 --- a/bval-tck11/pom.xml +++ b/bval-tck11/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <artifactId>bval-parent</artifactId> <groupId>org.apache.bval</groupId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-tck11-runner</artifactId> @@ -32,15 +32,15 @@ under the License. <properties> <tck.version>1.1.4.Final</tck.version> - <owb.version>1.7.2</owb.version> - <arquillian.version>1.1.13.Final</arquillian.version> + <owb.version>1.6.0</owb.version> + <arquillian.version>1.1.8.Final</arquillian.version> <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider> </properties> <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.1_spec</artifactId> + <artifactId>geronimo-validation_2.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/bval-xstream/pom.xml ---------------------------------------------------------------------- diff --git a/bval-xstream/pom.xml b/bval-xstream/pom.xml index 67ac48d..bf90180 100644 --- a/bval-xstream/pom.xml +++ b/bval-xstream/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.bval</groupId> <artifactId>bval-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>bval-xstream</artifactId> http://git-wip-us.apache.org/repos/asf/bval/blob/af6ee90d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 470ddd0..42e8d80 100644 --- a/pom.xml +++ b/pom.xml @@ -35,14 +35,16 @@ <artifactId>bval-parent</artifactId> <name>Apache BVal :: bval-parent (Parent POM)</name> <packaging>pom</packaging> - <version>1.1.3-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <description>Apache BVal parent pom</description> <properties> <site.deploy.url>sftp://people.apache.org/home/${user.name}/public_html/bval/${project.version}/staging-site</site.deploy.url> <commons.weaver.version>1.3</commons.weaver.version> - <privilizer.policy>DYNAMIC</privilizer.policy> +<!-- temporarily disable privilizer due to Java 8 incompatibility --> +<!-- <privilizer.policy>DYNAMIC</privilizer.policy> --> + <privilizer.policy>NEVER</privilizer.policy> </properties> <inceptionYear>2010</inceptionYear> @@ -257,10 +259,10 @@ <configuration> <show>package</show> <quiet>true</quiet> - <source>1.6</source> + <source>1.8</source> <links> - <link>http://docs.oracle.com/javase/6/docs/api</link> - <link>http://docs.oracle.com/javaee/7/api</link> + <link>http://docs.oracle.com/javase/8/docs/api</link> +<!-- <link>http://docs.oracle.com/javaee/7/api</link> --> </links> </configuration> <reportSets> @@ -292,8 +294,8 @@ <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.1_spec</artifactId> - <version>1.0</version> + <artifactId>geronimo-validation_2.0_spec</artifactId> + <version>1.0-SNAPSHOT</version> </dependency> <!-- Optional profile to use Spec RI API --> <dependency> @@ -367,6 +369,13 @@ <version>7.0.72</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>javafx</artifactId> + <version>8.0</version> + <systemPath>${java.home}/lib/ext/jfxrt.jar</systemPath> + <scope>system</scope> + </dependency> </dependencies> </dependencyManagement> @@ -391,8 +400,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.8</source> + <target>1.8</target> <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> @@ -406,9 +415,9 @@ </manifest> <manifestEntries> <Implementation-Build>${buildNumber}</Implementation-Build> - <Specification-Title>JSR-349 Bean Validation</Specification-Title> + <Specification-Title>JSR-380 Bean Validation</Specification-Title> <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor> - <Specification-Version>1.1</Specification-Version> + <Specification-Version>2.0</Specification-Version> </manifestEntries> </archive> </configuration> @@ -424,8 +433,8 @@ <verbose>false</verbose> <maxmemory>512m</maxmemory> <links> - <link>http://docs.oracle.com/javase/6/docs/api</link> - <link>http://docs.oracle.com/javaee/7/api</link> + <link>http://docs.oracle.com/javase/8/docs/api</link> +<!-- <link>http://docs.oracle.com/javaee/7/api</link> --> </links> </configuration> </plugin> @@ -459,7 +468,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.1</version> + <version>3.3.0</version> <extensions>true</extensions> <configuration> <instructions> @@ -626,7 +635,7 @@ <version>[2.2.1,)</version> </requireMavenVersion> <requireJavaVersion> - <version>[1.6,)</version> + <version>[1.8,)</version> </requireJavaVersion> </rules> </configuration>
