From bb4edb104f3b28d38a67a8244a603d71ea67516c Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 19:44:52 +0000 Subject: [PATCH 01/13] Upgrade lombok to 1.16.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da5660b..95b2a34 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.8 4.12 3.8.0 - 1.16.18 + 1.16.20 2.10 0.5.2 From ac09994537b78f1b7fd10d9f123eaccfae7e3ee1 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 19:58:56 +0000 Subject: [PATCH 02/13] Upgrade assertj to 3.9.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 95b2a34..de422f4 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.8 4.12 - 3.8.0 + 3.9.1 1.16.20 2.10 0.5.2 @@ -42,7 +42,7 @@ org.assertj assertj-core - ${assertj-core.version} + ${assertj.version} test From bcba10a492ae7267e984454186e9ffd174f75b50 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 19:59:22 +0000 Subject: [PATCH 03/13] Upgrade kemitix-maven-tiles to 0.6.1 --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index de422f4..30a1aa3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,7 @@ 3.9.1 1.16.20 2.10 - 0.5.2 - - 2.20 + 0.6.1 net.kemitix.mon 4.0.1 From e41555e9f3dd2ee9f769c056020ec408c39ff676 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:09:38 +0000 Subject: [PATCH 04/13] Upgrade maven-{surefire,failsafe}-plugins to 2.20.1 to compile with java 9 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 30a1aa3..383e4de 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,8 @@ 1.16.20 2.10 0.6.1 + 2.20.1 + 2.20.1 net.kemitix.mon 4.0.1 From 773a428c20a5ed23dd993f63721439fbb4fe4f1b Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:22:07 +0000 Subject: [PATCH 05/13] jenkins: test on both java 8 and 9 --- Jenkinsfile | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3a55d2..6004ae8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,43 @@ +final String gitRepoUrl = 'git@github.com:kemitix/mon.git' +final String mvn = "mvn --batch-mode --update-snapshots" + pipeline { agent any stages { + stage('Prepare') { + steps { + git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix' + } + } stage('Build') { steps { - checkout([ - $class: 'GitSCM', - branches: [[name: '**']], - doGenerateSubmoduleConfigurations: false, - extensions: [[$class: 'CleanBeforeCheckout']], - submoduleCfg: [], - userRemoteConfigs: [[credentialsId: 'github-kemitix', url: 'git@github.com:kemitix/mon.git']] - ]) - sh './mvnw clean install' + parallel { + stage('Java 8') { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh 'mvn clean install' + } + } + stage('Java 9') { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + sh 'mvn clean install' + } + } + } + } + } + stage('Reporting') { + steps { junit '**/target/surefire-reports/*.xml' archiveArtifacts '**/target/*.jar' } } + stage('Deploy') { + when { expression { (env.GIT_BRANCH == 'master') } } + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} deploy --activate-profiles release" + } + } + } } } From f00492e73afada7b6eefff781cb5c27df68a5c63 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:27:11 +0000 Subject: [PATCH 06/13] CHANGELOG --- CHANGELOG | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 69e0e74..0f7e0ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,12 @@ CHANGELOG 0.5.0 ----- -* +* Add `Before`, `After` and `Around` combinators +* Use `kemitix-maven-tiles` +* Add `BeanBuilder` experiment +* Upgrade `lombok` to 1.16.20 +* Upgrade assertj to 3.9.1 +* jenkins: test on both java 8 and 9 0.4.0 ----- From b1b0a6a2c8b4f033c312498f3f081d34602b0bb0 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:29:15 +0000 Subject: [PATCH 07/13] jenkins: fix syntax --- Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6004ae8..cd4ed5d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,17 +10,15 @@ pipeline { } } stage('Build') { - steps { - parallel { - stage('Java 8') { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh 'mvn clean install' - } + parallel { + stage('Java 8') { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh 'mvn clean install' } - stage('Java 9') { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh 'mvn clean install' - } + } + stage('Java 9') { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + sh 'mvn clean install' } } } From b1d49b01f5f2dd7983675de4e6d5717602b3083e Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:31:37 +0000 Subject: [PATCH 08/13] jenkins: fix syntax #2 --- Jenkinsfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd4ed5d..5ee38ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,13 +12,17 @@ pipeline { stage('Build') { parallel { stage('Java 8') { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh 'mvn clean install' + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh 'mvn clean install' + } } } stage('Java 9') { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh 'mvn clean install' + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + sh 'mvn clean install' + } } } } From 16d83fbc746871fa5418e23160b77bbc0fb0ccc7 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 28 Feb 2018 22:37:02 +0000 Subject: [PATCH 09/13] lombok.config: added to prevent generated annotation --- lombok.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 lombok.config diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..00ebb3e --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +lombok.addGeneratedAnnotation=false From aa18564d16f3628434ac49ce1e902b5b8e1578ac Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 1 Mar 2018 17:58:27 +0000 Subject: [PATCH 10/13] jenkins: rename Jenkinsfile --- Jenkinsfile | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 5ee38ba..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,45 +0,0 @@ -final String gitRepoUrl = 'git@github.com:kemitix/mon.git' -final String mvn = "mvn --batch-mode --update-snapshots" - -pipeline { - agent any - stages { - stage('Prepare') { - steps { - git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix' - } - } - stage('Build') { - parallel { - stage('Java 8') { - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh 'mvn clean install' - } - } - } - stage('Java 9') { - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh 'mvn clean install' - } - } - } - } - } - stage('Reporting') { - steps { - junit '**/target/surefire-reports/*.xml' - archiveArtifacts '**/target/*.jar' - } - } - stage('Deploy') { - when { expression { (env.GIT_BRANCH == 'master') } } - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh "${mvn} deploy --activate-profiles release" - } - } - } - } -} From 32fc97258ec3ae6fc05246ee457a999ba17d4e32 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 1 Mar 2018 18:23:02 +0000 Subject: [PATCH 11/13] mvn: upgrade wrapper to maven 3.5.2 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 56bb016..9dda3b6 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip \ No newline at end of file +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip From ba587e63a9d8fc41049113320594774b31004048 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 1 Mar 2018 19:41:28 +0000 Subject: [PATCH 12/13] jenkins: skip test during deploy --- Jenkinsfile.groovy | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Jenkinsfile.groovy diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy new file mode 100644 index 0000000..fa90d0c --- /dev/null +++ b/Jenkinsfile.groovy @@ -0,0 +1,45 @@ +final String gitRepoUrl = 'git@github.com:kemitix/mon.git' +final String mvn = "mvn --batch-mode --update-snapshots" + +pipeline { + agent any + stages { + stage('Prepare') { + steps { + git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix' + } + } + stage('Build') { + parallel { + stage('Java 8') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh 'mvn clean install' + } + } + } + stage('Java 9') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + sh 'mvn clean install' + } + } + } + } + } + stage('Reporting') { + steps { + junit '**/target/surefire-reports/*.xml' + archiveArtifacts '**/target/*.jar' + } + } + stage('Deploy') { + when { expression { (env.GIT_BRANCH == 'master') } } + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} deploy --activate-profiles release -DskipTests=true" + } + } + } + } +} From 34b220b212f5180067c106363f753b5802bb75fa Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 1 Mar 2018 20:11:05 +0000 Subject: [PATCH 13/13] jenkins: disable java 9 build until maven-failsafe-plugin 2.21 --- Jenkinsfile.groovy | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index fa90d0c..3f87b24 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -18,13 +18,14 @@ pipeline { } } } - stage('Java 9') { - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh 'mvn clean install' - } - } - } + // requires maven-failsafe-plugin:2.21 when it is released +// stage('Java 9') { +// steps { +// withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { +// sh 'mvn clean install' +// } +// } +// } } } stage('Reporting') {