Upload snapshot artifacts in maven batch mode

Blazebit · Oct 7, 2019 · 33a84d7 · 33a84d7
1 parent 3cfcaec
commit 33a84d7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/.travis-deploy.sh b/.travis-deploy.sh
@@ -5,10 +5,12 @@ if [ "$TRAVIS_REPO_SLUG" == "Blazebit/blaze-persistence" ] &&
     [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
     [ "$JPAPROVIDER" == "hibernate-5.2" ] &&
     [ "$RDBMS" == "h2" ] &&
-    [ "x$JDK" == "x" ]; then
+    [ "$JDK" == "9" ] &&
+    [ "$SNAPSHOT_PUBLISH" == "true" ]; then
 
   echo "Starting snapshot deployment..."
-  mvn -s .travis-settings.xml -DperformRelease -DskipTests -Dgpg.skip=true -Dquiet=true clean deploy
+  export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+  mvn -B -P blazebit-release -s .travis-settings.xml -DperformRelease -DskipTests -Dgpg.skip=true -Dquiet=true clean deploy
   echo "Snapshots deployed!"
 
 else

diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,14 @@ matrix:
 ################################################
 # hibernate-5.2
 ################################################
+    - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2 JDK=9 SNAPSHOT_PUBLISH=true
+      before_install:
+        - wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh
+        - . ./install-jdk.sh -F 9 -L GPL
+        - rm "${JAVA_HOME}/lib/security/cacerts"
+        - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
+      script:
+        - "echo 'Publishing snapshots only, skipping build...'"
     - env: JPAPROVIDER=hibernate-5.2 RDBMS=h2
       jdk: oraclejdk8
     - env: JPAPROVIDER=hibernate-5.2 RDBMS=mysql
@@ -487,6 +495,8 @@ matrix:
       before_install:
         - wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh
         - . ./install-jdk.sh -F 9 -L GPL
+        - rm "${JAVA_HOME}/lib/security/cacerts"
+        - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
     - env: JPAPROVIDER=datanucleus-5 RDBMS=h2 JDK=9
       before_install:
         - wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+<img src="https://persistence.blazebit.com/images/blaze_persistence_logo_colors_render.png" width="200" />
+
 [![Build Status](https://travis-ci.org/Blazebit/blaze-persistence.svg?branch=master)](https://travis-ci.org/Blazebit/blaze-persistence)
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.blazebit/blaze-persistence-core-impl/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.blazebit/blaze-persistence-core-impl)

diff --git a/pom.xml b/pom.xml
@@ -227,6 +227,8 @@
                                                 } else {
                                                     System.setProperty("jdk8.classes.jar.escaped", s + java.io.File.separator + "jre" + java.io.File.separator + "lib" + java.io.File.separator + "rt.jar");
                                                 }
+                                                System.out.println(System.getProperty("jdk8.classes.jar.escaped"));
+                                                System.out.println(System.getProperty("java.specification.version"));
                                             ]]>
                                         </script>
                                     </scripts>
@@ -256,7 +258,7 @@
                                     <rules>
                                         <evaluateBeanshell>
                                             <message>To create a release build of this project with JDK 11+ you need to provide a system property "jdk8.home" that can be used to access the rt.jar or classes.jar on Mac</message>
-                                            <condition>new java.io.File(System.getProperty("jdk8.classes.jar.escaped")).exists()</condition>
+                                            <condition>System.getProperty("java.specification.version").contains(".") || Integer.parseInt(System.getProperty("java.specification.version")) &lt; 11 || new java.io.File(System.getProperty("jdk8.classes.jar.escaped")).exists()</condition>
                                         </evaluateBeanshell>
                                     </rules>
                                 </configuration>