From aaf7564d6e3a2084adedf00a26d34f31e44cbb8a Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Thu, 6 Jun 2019 16:16:19 +0200 Subject: [PATCH 1/4] Java 11 readiness: use recommended build configurations --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..87a086da --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ +buildPlugin(configurations: buildPlugin.recommendedConfigurations()) From aa4ede47e463428e8751c582be5e2e70f09e7941 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Thu, 6 Jun 2019 16:22:31 +0200 Subject: [PATCH 2/4] Facelift tool: artifactId names and inheriting Jenkins org pom --- plugin-management-cli/pom.xml | 8 ++++---- plugin-management-library/pom.xml | 8 ++++---- pom.xml | 12 ++++++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/plugin-management-cli/pom.xml b/plugin-management-cli/pom.xml index f0f140a1..57a6cfe0 100644 --- a/plugin-management-cli/pom.xml +++ b/plugin-management-cli/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - plugin-manager - jenkins + io.jenkins.plugin-management + jenkins-plugin-management-parent-pom 1.0-SNAPSHOT 4.0.0 - plugin-management-cli + jenkins-plugin-management-cli - \ No newline at end of file + diff --git a/plugin-management-library/pom.xml b/plugin-management-library/pom.xml index 6a644bae..a50ac288 100644 --- a/plugin-management-library/pom.xml +++ b/plugin-management-library/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - plugin-manager - jenkins + io.jenkins.plugin-management + jenkins-plugin-management-parent-pom 1.0-SNAPSHOT 4.0.0 - plugin-management-library + jenkins-plugin-management-library - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 622dc964..978f5b21 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - jenkins - plugin-management + + org.jenkins-ci + jenkins + 1.51 + pom + io.jenkins.plugin-management + jenkins-plugin-management-parent-pom 1.0-SNAPSHOT plugin-management-cli plugin-management-library - - \ No newline at end of file + From 3ad52ed97c2ff2845ac164055920e895b9afc0cb Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Sat, 8 Jun 2019 14:25:32 +0200 Subject: [PATCH 3/4] Add first dummy test for CI Surefire check --- plugin-management-cli/pom.xml | 7 +++++++ plugin-management-cli/src/test/java/SomeTest.java | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 plugin-management-cli/src/test/java/SomeTest.java diff --git a/plugin-management-cli/pom.xml b/plugin-management-cli/pom.xml index 57a6cfe0..f29a8b3e 100644 --- a/plugin-management-cli/pom.xml +++ b/plugin-management-cli/pom.xml @@ -10,6 +10,13 @@ 4.0.0 jenkins-plugin-management-cli + + + junit + junit + test + + diff --git a/plugin-management-cli/src/test/java/SomeTest.java b/plugin-management-cli/src/test/java/SomeTest.java new file mode 100644 index 00000000..0ef6f9dd --- /dev/null +++ b/plugin-management-cli/src/test/java/SomeTest.java @@ -0,0 +1,8 @@ +import org.junit.Test; + +public class SomeTest { + @Test + public void some() { + + } +} From 0a6fc22b37474a5d237d737b9dc433925a28353a Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Sat, 8 Jun 2019 14:35:54 +0200 Subject: [PATCH 4/4] Add source encoding specification to remove warning --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 978f5b21..1db25080 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,9 @@ io.jenkins.plugin-management jenkins-plugin-management-parent-pom 1.0-SNAPSHOT + + UTF-8 + plugin-management-cli plugin-management-library