Merge pull request appsody#56 from groeges/appsody-merge

Merge latest appsody/stacks:master branch
BarDweller · Sep 4, 2019 · 830fc54 · 830fc54
2 parents 71c4cd0 + 10c7cda
commit 830fc54
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,8 @@ language: generic
 go:
   - 1.12.x
 
-matrix:
-  include:
-  - os: linux
-    dist: bionic
+os: linux
+dist: bionic
 
 services:
   - docker

diff --git a/incubator/java-spring-boot2/image/Dockerfile-stack b/incubator/java-spring-boot2/image/Dockerfile-stack
@@ -53,15 +53,14 @@ ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
 
 COPY ./LICENSE /licenses/
 
-# OSGI core for version range processing
-COPY ./util /util
-RUN  /util/check_version build
-
 COPY ./project /project
 COPY ./config /config
 COPY ./mvn-stack-settings.xml /usr/share/maven/conf/settings.xml
 COPY ./mvn-stack-settings.xml /project/mvn-stack-settings.xml
 
+# OSGI core for version range processing
+RUN  /project/util/check_version build
+
 WORKDIR /project
 RUN mvn -B -N io.takari:maven:wrapper -Dmaven=$(mvn help:evaluate -Dexpression=maven.version -q -DforceStdout)
 

diff --git a/incubator/java-spring-boot2/image/project/Dockerfile b/incubator/java-spring-boot2/image/project/Dockerfile
@@ -45,6 +45,9 @@ ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
 COPY . /project
 COPY ./mvn-stack-settings.xml /usr/share/maven/conf/settings.xml
 
+# OSGI core for version range processing
+RUN  /project/util/check_version build
+
 WORKDIR /project/user-app
 
 RUN /project/java-spring-boot2-build.sh package

diff --git a/incubator/java-spring-boot2/image/project/appsody-boot2-pom.xml b/incubator/java-spring-boot2/image/project/appsody-boot2-pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>dev.appsody</groupId>
   <artifactId>spring-boot2-stack</artifactId>
-  <version>0.3.8</version>
+  <version>0.3.9</version>
   <packaging>pom</packaging>
 
   <name>Appsody Spring Boot2 stack</name>

diff --git a/incubator/java-spring-boot2/image/project/java-spring-boot2-build.sh b/incubator/java-spring-boot2/image/project/java-spring-boot2-build.sh
@@ -92,7 +92,7 @@ common() {
     exit 1
   fi
 
-  if ! /util/check_version contains "$p_version_range" "$a_version";  then
+  if ! /project/util/check_version contains "$p_version_range" "$a_version";  then
     error "Version mismatch
 
 The version of the appsody stack '${a_version}' does not match the

diff --git a/...oot2/image/util/RangeIncludesVersion.java → ...ge/project/util/RangeIncludesVersion.java b/...oot2/image/util/RangeIncludesVersion.java → ...ge/project/util/RangeIncludesVersion.java
diff --git a/...ava-spring-boot2/image/util/check_version → ...ng-boot2/image/project/util/check_version b/...ava-spring-boot2/image/util/check_version → ...ng-boot2/image/project/util/check_version
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # This is a small utility script that uses OSGi VersionRange and Version
 # classes to verify whether or not a specified version matches is contained
 # within a specified range.

diff --git a/incubator/java-spring-boot2/stack.yaml b/incubator/java-spring-boot2/stack.yaml
@@ -1,5 +1,5 @@
 name: Spring Boot®
-version: 0.3.8
+version: 0.3.9
 description: Spring Boot using OpenJ9 and Maven
 license: Apache-2.0
 language: java

diff --git a/index.yaml b/index.yaml
@@ -15,14 +15,14 @@ projects:
   java-spring-boot2:
   - updated: 2019-08-02T23:12:19+0000
     name: Spring Boot®
-    version: 0.3.8
+    version: 0.3.9
     description: Spring Boot using OpenJ9 and Maven
     license: Apache-2.0
     maintainers:
       - [email protected]
     default-template: default
     urls:
-    - https://github.com/appsody/stacks/releases/download/java-spring-boot2-v0.3.8/incubator.java-spring-boot2.v0.3.8.templates.default.tar.gz
+    - https://github.com/appsody/stacks/releases/download/java-spring-boot2-v0.3.9/incubator.java-spring-boot2.v0.3.9.templates.default.tar.gz
   nodejs-express:
   - updated: 2019-08-02T23:12:19+0000
     name: Node.js Express