Separated snapshots and glassfish build
- should be much faster despite you have to build twice.
diff --git a/Jenkinsfile b/Jenkinsfile
index f426492..f1d4def 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -262,8 +262,8 @@
echo Uname
uname -a
- mvn clean install -pl :glassfish-main-aggregator,:glassfish-nucleus-parent,:nucleus-parent,:glassfish-qa-config
- mvn clean install -T4C -Pfastest,snapshots -pl :snapshotsmodule -amd
+ # temporary build of external snapshot dependencies
+ mvn clean install -f ./snapshots/pom.xml
# Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix.
mvn clean install -Pfastest,staging -T4C
./gfbuild.sh archive_bundles
diff --git a/README.md b/README.md
index 472f69b..2503293 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@
### Execution
+:warning: Because GF7 is now in intensive development and depends on external snapshot dependencies, you have to build these dependencies first: `mvn clean install -f ./snapshots/pom.xml`
+
* `mvn clean install` - Full build including automatic QA and maven managed tests. Typical time: 5 minutes.
* `mvn clean install -Pfast` - Building all distribution artifacts, running just unit tests, QA and integration tests excluded. Typical time: 3 minutes.
* `mvn clean install -Pfastest` - Building all distribution artifacts, excluded all QA and testing. Typical time: 1.5 minutes.
@@ -61,29 +63,28 @@
### Old Additional Tests
+:warning: if the script fails, sometimes it doesn't stop the domain and you have to do that manually.
+
+* `./runTests.sh 7.0.0 batch_all` - Usual time: 4 minutes
* `./runTests.sh 7.0.0 cdi_all` - Usual time: 6 minutes
-* `./runTests.sh 7.0.0 ejb_group_1` - Usual time: 8 minutes
-* `./runTests.sh 7.0.0 web_jsp` - Usual time: 6 minutes
-* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_web_profile_all` - Usual time: 2 minutes
+* `./runTests.sh 7.0.0 connector_group_1` - Usual time: 16 minutes
+* `./runTests.sh 7.0.0 connector_group_2` - Usual time: 3 minutes
+* `./runTests.sh 7.0.0 connector_group_3` - Usual time: 4 minutes
+* `./runTests.sh 7.0.0 connector_group_4` - Usual time: 16 minutes
+* `./runTests.sh 7.0.0 deployment_all` - Not fixed yet
+* `./runTests.sh 7.0.0 ejb_group_1` - Usual time: 10 minutes
+* `./runTests.sh 7.0.0 ejb_group_2` - Usual time: 7 minutes
+* `./runTests.sh 7.0.0 ejb_group_3` - Usual time: 18 minutes
+* `./runTests.sh 7.0.0 ejb_group_embedded` - Usual time: 4 minutes
+* `./runTests.sh 7.0.0 jdbc_all` - Usual time: 20 minutes
+* `./runTests.sh 7.0.0 persistence_all` - Usual time: 3 minutes
+* `./runTests.sh 7.0.0 web_jsp` - Usual time: 8 minutes
+* `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes
+* `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Not fixed yet
* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes
-
-### Half-Dead Additional Tests Waiting for a Rescue
-
-First warning: if the script fails, it doesn't stop the domain and you have to do that manually.
-* `./runTests.sh 7.0.0 batch_all` - Crashes, Derby uses different port than expected
-* `./runTests.sh 7.0.0 connector_group_1` - Crashes, ports
-* `./runTests.sh 7.0.0 connector_group_2` - Crashes, ports
-* `./runTests.sh 7.0.0 connector_group_3` - Crashes, ports
-* `./runTests.sh 7.0.0 connector_group_4` - Crashes, ports
-* `./runTests.sh 7.0.0 deployment_all` - Usual time: 1 minute, failure: still uses javax packages.
-* `./runTests.sh 7.0.0 ejb_group_2` - Usual time: 2 minutes, failure: incompatible API at TimerSessionEJB.
-* `./runTests.sh 7.0.0 ejb_group_3` - Usual time: 4 minutes, failure: still uses javax packages
-* `./runTests.sh 7.0.0 jdbc_all` - Crashes, Derby uses different port than expected
-* `./runTests.sh 7.0.0 persistence_all` - Crashes, Derby uses different port than expected
-* `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes, failure: could not create the derby database
-* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Crashes
-* `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Crashes, missing TestNG dependency
-* many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
+* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Not fixed yet
+* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_web_profile_all` - Usual time: 2 minutes
+* There are many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
## Basic Usage
diff --git a/pom.xml b/pom.xml
index 9da9de5..e0c58f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,6 @@
</activation>
<modules>
<module>qa</module>
- <module>snapshots</module> <!-- TMP -->
<module>nucleus</module>
<module>appserver</module>
</modules>
diff --git a/snapshots/hibernate-validator/pom.xml b/snapshots/hibernate-validator/pom.xml
index f7b818b..e8e86d1 100644
--- a/snapshots/hibernate-validator/pom.xml
+++ b/snapshots/hibernate-validator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main.snapshots</groupId>
<artifactId>snapshotsmodule</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>0.0.0-SNAPSHOT</version>
</parent>
<artifactId>hibernate-validator-snapshot</artifactId>
diff --git a/snapshots/jbatch/pom.xml b/snapshots/jbatch/pom.xml
index 9eb9ebe..8cd9182 100644
--- a/snapshots/jbatch/pom.xml
+++ b/snapshots/jbatch/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main.snapshots</groupId>
<artifactId>snapshotsmodule</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jbatch-snapshot</artifactId>
diff --git a/snapshots/pom.xml b/snapshots/pom.xml
index 602fa42..6e5ff0a 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -24,15 +24,9 @@
>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.main</groupId>
- <artifactId>glassfish-nucleus-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <relativePath>../nucleus/pom.xml</relativePath>
- </parent>
-
<groupId>org.glassfish.main.snapshots</groupId>
<artifactId>snapshotsmodule</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GlassFish Snapshots Parent</name>
@@ -44,6 +38,15 @@
</modules>
<build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
