From c602b83282ce0123c5a2bc3d5b52f3c425307251 Mon Sep 17 00:00:00 2001 From: Philipp Pixel Date: Thu, 30 Apr 2020 09:36:22 +0200 Subject: [PATCH 1/7] Support Java 11 JDK: replace maven plugin and legacy runtime libs Cobertura is a maven plugin for test reporting. Cobertura is going to be abandoned in terms of supporting Java versions >= 8. In order to natively support Java 11 a different maven plugin was already used in the Jenkinsfile, Jacoco. Jacoco is supports Java 11 out of the box. Only the already used version needed a small upgrade to work. Additionally, some runtime libraries are no longer bundled with Java 11 (like com.sun.* or Java EE libraries). These dependencies are now added as explicit dependencies in the pom file. --- Jenkinsfile | 4 +--- pom.xml | 49 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29f8660e2..8022f4e39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,18 +27,16 @@ node { archiveArtifacts artifacts: '**/target/*.jar' } - String jacoco = "org.jacoco:jacoco-maven-plugin:0.8.1" + String jacoco = "org.jacoco:jacoco-maven-plugin:0.8.5" stage('Test') { mvn "${jacoco}:prepare-agent test ${jacoco}:report" } - stage('Integration Test') { mvn "${jacoco}:prepare-agent-integration failsafe:integration-test failsafe:verify ${jacoco}:report-integration" } - stage('Static Code Analysis') { def sonarQube = new SonarQube(this, [usernamePassword: credentialsId, sonarHostUrl: "${cesUrl}/sonar"]) diff --git a/pom.xml b/pom.xml index 776cd1a43..709a44d40 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ 1.8 + 8 UTF-8 UTF-8 @@ -25,14 +26,33 @@ 3.3.6 1.11.4 2.2.4 - 1.8.0 + 1.9.0 3.0.6.RELEASE - 2.7 + 0.8.5 + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + com.sun.activation + jakarta.activation + 1.2.1 + org.springframework.boot @@ -120,6 +140,14 @@ spring-petclinic + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.0 + + 8 + + org.springframework.boot spring-boot-maven-plugin @@ -157,20 +185,9 @@ - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura.version} - - - - - - - clean - check - - - + org.jacoco + jacoco-maven-plugin + ${jacoco.version} - 1.8 - 8 + 11 + ${java.version} + ${java.version} UTF-8 UTF-8 @@ -45,7 +46,7 @@ org.glassfish.jaxb jaxb-runtime - 2.3.2 + 2.3.3 From 8cd5fcc46721ece3afb2a48a83bdc5accc9d9000 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Thu, 24 Sep 2020 09:29:24 +0200 Subject: [PATCH 3/7] Update java version to 11 --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4e74747a..291f833ec 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,9 @@ - 1.8 + 11 + ${java.version} + ${java.version} UTF-8 UTF-8 From 124eeb4f6ca7293d7da89f067c6db9cff40bc431 Mon Sep 17 00:00:00 2001 From: Christian Beyer Date: Thu, 29 Oct 2020 09:15:43 +0100 Subject: [PATCH 4/7] fix code format issue --- .../owner/OwnerControllerITCase.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerITCase.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerITCase.java index 3ffd69ce0..c6e4f8e7d 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerITCase.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerITCase.java @@ -14,16 +14,17 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class OwnerControllerITCase { - @Autowired - private TestRestTemplate restTemplate; + @Autowired + private TestRestTemplate restTemplate; + + /** + * Note: This test exists only for the purpose of serving as an example! Please write + * tests more sensible than this for your own applications. + */ + @Test + public void assertsUser1IsGeorgeFranklin() { + String body = this.restTemplate.getForObject("/owners/1", String.class); + assertThat(body).contains("George Franklin"); + } - /** - * Note: This test exists only for the purpose of serving as an example! Please write tests more sensible - * than this for your own applications. - */ - @Test - public void assertsUser1IsGeorgeFranklin() { - String body = this.restTemplate.getForObject("/owners/1", String.class); - assertThat(body).contains("George Franklin"); - } } From 507a53522ddc54c31fec65d6ca187ee908e84705 Mon Sep 17 00:00:00 2001 From: Christian Beyer Date: Thu, 29 Oct 2020 10:21:08 +0100 Subject: [PATCH 5/7] add junit test dependency --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 291f833ec..a21a81bed 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,11 @@ spring-boot-devtools true + + junit + junit + test + From 85745ddaa513507e134c7d48302b75a77a720a21 Mon Sep 17 00:00:00 2001 From: Christian Beyer Date: Thu, 29 Oct 2020 13:05:11 +0100 Subject: [PATCH 6/7] remove snapshot repositories --- pom.xml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/pom.xml b/pom.xml index a21a81bed..ce02939bd 100644 --- a/pom.xml +++ b/pom.xml @@ -294,44 +294,6 @@ - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - m2e From ec81d5a71ef8f61fd4bcd9f4891b1246871f00ec Mon Sep 17 00:00:00 2001 From: Phil-Ah Date: Wed, 2 Dec 2020 17:00:34 +0100 Subject: [PATCH 7/7] Update README.md Add footer with description of Cloudogu EcoSystem, website, email adress, link to public forum. --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 2eb1f149a..35f41781a 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,17 @@ We extended it by * a Jenkinsfile for building, testing and SonarQube analysis. For more details on petclinic, see also [original spring petclinci readme.md](readme-petclinic.md). + +--- +### What is the Cloudogu EcoSystem? +The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry. We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus. The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [MIT License](https://cloudogu.com/license.html). + +### How to get in touch? +Want to talk to the Cloudogu team? Need help or support? There are several ways to get in touch with us: + +* [Website](https://cloudogu.com) +* [myCloudogu-Forum](https://forum.cloudogu.com/topic/34?ctx=1) +* [Email hello@cloudogu.com](mailto:hello@cloudogu.com) + +--- +© 2020 Cloudogu GmbH - MADE WITH :heart: FOR DEV ADDICTS. [Legal notice / Impressum](https://cloudogu.com/imprint.html)