Using snapshot dependency of the hibernate-validator (temporarily)
diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml
index 43cf342..77f1dcf 100644
--- a/appserver/distributions/glassfish/pom.xml
+++ b/appserver/distributions/glassfish/pom.xml
@@ -81,41 +81,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>do stuff</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <macrodef name="jarupdate">
- <attribute name="basedir"/>
- <attribute name="includes"/>
- <attribute name="destfile"/>
- <sequential>
- <zip destfile="@{destfile}.tmp">
- <zipfileset src="@{destfile}" excludes="@{includes}"/>
- </zip>
- <move file="@{destfile}.tmp" tofile="@{destfile}" />
- <zip update="true" basedir="@{basedir}" includes="@{includes}" destfile="@{destfile}" />
- </sequential>
- </macrodef>
-
- <jarupdate
- basedir="${patches}/hibernate-validator" includes="META-INF/MANIFEST.MF"
- destfile="${glassfish.modules}/hibernate-validator.jar"
- />
-
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/appserver/distributions/glassfish/src/main/patches/hibernate-validator/META-INF/MANIFEST.MF b/appserver/distributions/glassfish/src/main/patches/hibernate-validator/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e66404..0000000
--- a/appserver/distributions/glassfish/src/main/patches/hibernate-validator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,91 +0,0 @@
-Implementation-Title: hibernate-validator
-Bundle-Description: Hibernate's Jakarta Bean Validation reference impl
- ementation.
-Automatic-Module-Name: org.hibernate.validator
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-SymbolicName: org.hibernate.validator
-Implementation-Version: 7.0.1.Final
-Built-By: jenkins
-Bnd-LastModified: 1612635996812
-Bundle-ManifestVersion: 2
-Implementation-Vendor-Id: org.hibernate.validator
-Specification-Title: Jakarta Bean Validation
-Import-Package: jakarta.persistence;version="[3.0.0,4.0.0)";resolution
- :=optional,jakarta.validation;version="[3.0.0,4.0.0)",jakarta.validat
- ion.constraints;version="[3.0.0,4.0.0)",jakarta.validation.constraint
- validation;version="[3.0.0,4.0.0)",jakarta.validation.executable;vers
- ion="[3.0.0,4.0.0)",jakarta.validation.groups;version="[3.0.0,4.0.0)"
- ,jakarta.validation.metadata;version="[3.0.0,4.0.0)",jakarta.validati
- on.spi;version="[3.0.0,4.0.0)",jakarta.validation.valueextraction;ver
- sion="[3.0.0,4.0.0)",javax.script;version=0,javax.xml.namespace;versi
- on=0,javax.xml.stream;version=0,javax.xml.stream.events;version=0,jav
- ax.xml.transform;version=0,javax.xml.transform.stream;version=0,javax
- .xml.validation;version=0,jakarta.el;version="[4.0.0,6.0.0)";resoluti
- on:=optional,com.sun.el;version="[4.0.0,6.0.0)";resolution:=optional,
- org.xml.sax;version=0,org.jboss.logging;version="[3.1.0,4.0.0)",com.f
- asterxml.classmate;version="[1.3,2.0.0)",com.fasterxml.classmate.memb
- ers;version="[1.3,2.0.0)",org.joda.time;version="[2.0.0,3.0.0)";resol
- ution:=optional,javax.money;version="[1.0.0,2.0.0)";resolution:=optio
- nal,com.thoughtworks.paranamer;version="[2.5.5,3.0.0)";resolution:=op
- tional
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Tool: Bnd-3.5.0.201709291849
-Implementation-Vendor: org.hibernate.validator
-Export-Package: org.hibernate.validator;version="7.0.1.Final";uses:="j
- akarta.validation,jakarta.validation.spi,jakarta.validation.valueextr
- action,org.hibernate.validator.cfg,org.hibernate.validator.messageint
- erpolation,org.hibernate.validator.metadata,org.hibernate.validator.s
- pi.messageinterpolation,org.hibernate.validator.spi.nodenameprovider,
- org.hibernate.validator.spi.properties,org.hibernate.validator.spi.re
- sourceloading,org.hibernate.validator.spi.scripting",org.hibernate.va
- lidator.cfg;version="7.0.1.Final";uses:="jakarta.validation,org.hiber
- nate.validator.cfg.context",org.hibernate.validator.cfg.context;versi
- on="7.0.1.Final";uses:="jakarta.validation,org.hibernate.validator.cf
- g,org.hibernate.validator.spi.group",org.hibernate.validator.cfg.defs
- ;version="7.0.1.Final";uses:="jakarta.validation.constraints,org.hibe
- rnate.validator.cfg,org.hibernate.validator.constraints,org.hibernate
- .validator.constraints.time",org.hibernate.validator.cfg.defs.br;vers
- ion="7.0.1.Final";uses:="org.hibernate.validator.cfg,org.hibernate.va
- lidator.constraints.br",org.hibernate.validator.cfg.defs.pl;version="
- 7.0.1.Final";uses:="org.hibernate.validator.cfg,org.hibernate.validat
- or.constraints.pl",org.hibernate.validator.cfg.defs.ru;version="7.0.1
- .Final";uses:="org.hibernate.validator.cfg,org.hibernate.validator.co
- nstraints.ru",org.hibernate.validator.constraints;version="7.0.1.Fina
- l";uses:="jakarta.validation,jakarta.validation.constraints,jakarta.v
- alidation.constraintvalidation",org.hibernate.validator.constraints.b
- r;version="7.0.1.Final";uses:="jakarta.validation,jakarta.validation.
- constraints,jakarta.validation.constraintvalidation,org.hibernate.val
- idator.constraints",org.hibernate.validator.constraints.pl;version="7
- .0.1.Final";uses:="jakarta.validation",org.hibernate.validator.constr
- aints.ru;version="7.0.1.Final";uses:="jakarta.validation",org.hiberna
- te.validator.constraints.time;version="7.0.1.Final";uses:="jakarta.va
- lidation",org.hibernate.validator.constraintvalidation;version="7.0.1
- .Final";uses:="jakarta.validation,jakarta.validation.metadata,org.hib
- ernate.validator.messageinterpolation,org.hibernate.validator.spi.scr
- ipting",org.hibernate.validator.constraintvalidators;version="7.0.1.F
- inal";uses:="jakarta.validation,org.hibernate.validator.constraints",
- org.hibernate.validator.engine;version="7.0.1.Final";uses:="jakarta.v
- alidation",org.hibernate.validator.group;version="7.0.1.Final";uses:=
- "org.hibernate.validator.spi.group",org.hibernate.validator.messagein
- terpolation;version="7.0.1.Final";uses:="jakarta.el,jakarta.validatio
- n,org.hibernate.validator.spi.messageinterpolation,org.hibernate.vali
- dator.spi.resourceloading",org.hibernate.validator.metadata;version="
- 7.0.1.Final",org.hibernate.validator.parameternameprovider;version="7
- .0.1.Final";uses:="com.thoughtworks.paranamer,jakarta.validation",org
- .hibernate.validator.path;version="7.0.1.Final";uses:="jakarta.valida
- tion",org.hibernate.validator.resourceloading;version="7.0.1.Final";u
- ses:="org.hibernate.validator.spi.resourceloading",org.hibernate.vali
- dator.spi.cfg;version="7.0.1.Final";uses:="org.hibernate.validator.cf
- g",org.hibernate.validator.spi.group;version="7.0.1.Final",org.hibern
- ate.validator.spi.messageinterpolation;version="7.0.1.Final",org.hibe
- rnate.validator.spi.nodenameprovider;version="7.0.1.Final",org.hibern
- ate.validator.spi.properties;version="7.0.1.Final",org.hibernate.vali
- dator.spi.resourceloading;version="7.0.1.Final",org.hibernate.validat
- or.spi.scripting;version="7.0.1.Final";uses:="jakarta.validation,java
- x.script"
-Bundle-Name: Hibernate Validator Engine
-Bundle-Version: 7.0.1.Final
-Created-By: Apache Maven Bundle Plugin
-Build-Jdk: 1.8.0_221
-Implementation-URL: http://hibernate.org/validator/
-Specification-Version: 3.0
\ No newline at end of file
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 2b58231..78047fc 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -91,7 +91,7 @@
<!-- Jakarta Validation -->
<jakarta.validation-api.version>3.0.1</jakarta.validation-api.version>
- <hibernate-validator.version>7.0.2.Final</hibernate-validator.version>
+ <hibernate-validator.version>7.0.3-SNAPSHOT</hibernate-validator.version>
<!-- Jakarta Web Services -->
<webservices.version>4.0.0-M2</webservices.version>
@@ -949,12 +949,6 @@
</executions>
</plugin>
- <!-- force cleaning of the local repository <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions>
- <execution> <id>purge-local-dependencies</id> <phase>initialize</phase> <goals> <goal>purge-local-repository</goal> </goals>
- <configuration> <resolutionFuzziness>groupId</resolutionFuzziness> <includes> <include>jakarta.ejb</include> <include>jakarta.transaction</include>
- <include>jakarta.resource</include> <include>jakarta.enterprise.concurrent</include> <include>jakarta.ws.rs</include> <include>javax.xml.registry</include>
- <include>jakarta.websocket</include> <include>org.glassfish.jersey</include> </includes> </configuration> </execution> </executions>
- </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/snapshots/hibernate-validator/pom.xml b/snapshots/hibernate-validator/pom.xml
new file mode 100644
index 0000000..f7b818b
--- /dev/null
+++ b/snapshots/hibernate-validator/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.snapshots</groupId>
+ <artifactId>snapshotsmodule</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>hibernate-validator-snapshot</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <snapshots.sources.url>https://github.com/jakartaredhat/hibernate-validator/archive/refs/heads/main.zip</snapshots.sources.url>
+ <snapshots.sources.directory>${project.build.directory}/hibernate-validator-main</snapshots.sources.directory>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/snapshots/jbatch/pom.xml b/snapshots/jbatch/pom.xml
index b8d8297..9eb9ebe 100644
--- a/snapshots/jbatch/pom.xml
+++ b/snapshots/jbatch/pom.xml
@@ -32,7 +32,8 @@
<name>jBatch master SNAPSHOT</name>
<properties>
- <jbatch.url>https://github.com/WASdev/standards.jsr352.jbatch/archive/refs/heads/master.zip</jbatch.url>
+ <snapshots.sources.url>https://github.com/WASdev/standards.jsr352.jbatch/archive/refs/heads/master.zip</snapshots.sources.url>
+ <snapshots.sources.directory>${project.build.directory}/standards.jsr352.jbatch-master</snapshots.sources.directory>
</properties>
<build>
@@ -40,44 +41,10 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-jbatch</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <url>${jbatch.url}</url>
- <unpack>true</unpack>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.1</version>
- <executions>
- <execution>
- <id>tags-api</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <streamLogs>true</streamLogs>
- <projectsDirectory>${project.build.directory}/standards.jsr352.jbatch-master/</projectsDirectory>
- <pomIncludes>
- <pomInclude>pom.xml</pomInclude>
- </pomIncludes>
- <goals>clean install -P staging -DskipTests -Dmaven.test.skip=true</goals>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
-
</project>
diff --git a/snapshots/pom.xml b/snapshots/pom.xml
index 4412e76..bc9a567 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -18,7 +18,10 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,5 +40,55 @@
<modules>
<module>jbatch</module>
- </modules>
+ <module>hibernate-validator</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>download-jbatch</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <url>${snapshots.sources.url}</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>3.2.1</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>snapshots.execute-build</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <streamLogs>true</streamLogs>
+ <projectsDirectory>${snapshots.sources.directory}</projectsDirectory>
+ <pomIncludes>
+ <pomInclude>pom.xml</pomInclude>
+ </pomIncludes>
+ <goals>clean install -Pstaging -DskipTests -Dmaven.test.skip=true</goals>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
</project>
