Merge pull request #36 from mjlodge/master

Bump to Spring Boot 2
microservices-demo · Jul 27, 2020 · 69b5cc6 · 69b5cc6
2 parents f676ca1 + 95c6209
commit 69b5cc6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 services:
   - docker
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 install: true
 
 env:
@@ -15,6 +15,10 @@ script:
 
 after_success:
   - set -e;
+  - if [ -z "$DOCKER_PASS" ] ; then
+    echo "This is a build triggered by an external PR. Skipping docker push.";
+    exit 0;
+    fi;
   - docker login -u $DOCKER_USER -p $DOCKER_PASS;
   - ./scripts/push.sh
 notifications:

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.4.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -24,7 +24,7 @@ else
 fi
 CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
-$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn -q -DskipTests package
+$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.6-jdk-11 mvn -q -DskipTests package
 
 cp $CODE_DIR/target/*.jar $CODE_DIR/docker/carts
 

diff --git a/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java b/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java
@@ -51,7 +51,7 @@ public void destroy(Item item) {
 
             @Override
             public Item findOne(String id) {
-                return itemRepository.findOne(id);
+                return itemRepository.findById(id).orElse(null);
             }
         };
     }

diff --git a/test/component.py b/test/component.py
@@ -11,7 +11,7 @@ def test_maven(self):
         code_dir = script_dir + "/.."
         home = expanduser("~")
         command = ['docker', 'run', '--rm', '-v', home + '/.m2:/root/.m2', '-v', code_dir + ':/usr/src/mymaven', '-w',
-                   '/usr/src/mymaven', 'maven:3.2-jdk-8', 'mvn', 'integration-test']
+                   '/usr/src/mymaven', 'maven:3.6-jdk-11', 'mvn', 'integration-test']
         print(Docker().execute(command))
 
 

diff --git a/test/coveralls.py b/test/coveralls.py
@@ -14,7 +14,7 @@ def test_maven(self):
                    '-v', home + '/.m2:/root/.m2',
                    '-v', code_dir + ':/usr/src/mymaven',
                    '-w', '/usr/src/mymaven',
-                   'maven:3.2-jdk-8',
+                   'maven:3.6-jdk-11',
                    'mvn',
                    '-DrepoToken=' + os.getenv('COVERALLS_TOKEN'),
                    '-DserviceJobId=' + os.getenv('TRAVIS_JOB_ID'),

diff --git a/test/unit.py b/test/unit.py
@@ -11,7 +11,7 @@ def test_maven(self):
         code_dir = script_dir + "/.."
         home = expanduser("~")
         command = ['docker', 'run', '--rm', '-v', home + '/.m2:/root/.m2', '-v', code_dir + ':/usr/src/mymaven', '-w',
-                   '/usr/src/mymaven', 'maven:3.2-jdk-8', 'mvn', '-q', 'test']
+                   '/usr/src/mymaven', 'maven:3.6-jdk-11', 'mvn', '-q', 'test']
         print(Docker().execute(command))