second commit :D

Hillelmed · Mar 28, 2024 · 05510aa · 05510aa
1 parent bfbd8db
commit 05510aa
Show file tree

Hide file tree

Showing 164 changed files with 6,519 additions and 7,404 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.cdancy/jenkins-rest/badge.png)](https://maven-badges.herokuapp.com/maven-central/io.github.cdancy/jenkins-rest)
 [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-jenkins&#8211;rest-4183C4.svg)](https://stackoverflow.com/questions/tagged/jenkins+rest)
 
-# jenkins-rest
+# jenkins-client-java
 
 Java client is built on the top of jclouds for working with Jenkins REST API.
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### Version 2.0.0 (April 1, 2024)
+* Fix to java 17 and change to use HttpClient with Spring
+
 ### Version 1.0.2 (September 29, 2022)
 * ADDED: extensive build info. - [Pull Request 259](https://github.com/cdancy/jenkins-rest/pull/259)
 

diff --git a/build.gradle b/build.gradle
@@ -15,31 +15,28 @@ repositories {
 }
 
 dependencies {
-    ext.jcloudsVersion = '2.5.0'
-    ext.autoValueVersion = '1.10.4'
-    ext.autoServiceVersion = '1.1.1'
-    ext.guiceVersion = '5.1.0'
+    implementation 'org.jetbrains:annotations:24.0.0'
+    ext.autoValueVersion = '2.0.0'
+    ext.autoServiceVersion = '2.0.0'
 
-    implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation ("org.apache.jclouds:jclouds-core:${jcloudsVersion}")
-    implementation ("com.google.inject:guice:${guiceVersion}")
-    implementation ("com.google.inject.extensions:guice-assistedinject:${guiceVersion}")
-    implementation ("com.google.auto.service:auto-service-annotations:${autoServiceVersion}")
-    annotationProcessor ("com.google.auto.service:auto-service:${autoServiceVersion}")
-    implementation ("com.google.auto.value:auto-value-annotations:${autoValueVersion}")
-    annotationProcessor ("com.google.auto.value:auto-value:${autoValueVersion}")
+    implementation group: 'org.springframework', name: 'spring-context', version: '6.1.5'
+    implementation group: 'org.springframework', name: 'spring-webflux', version: '6.1.5'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.0'
+
+    compileOnly 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+
+    testCompileOnly 'org.projectlombok:lombok:1.18.32'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.32'
 
-    testImplementation ("org.apache.jclouds:jclouds-core:${jcloudsVersion}:tests")
-    testImplementation ("org.apache.jclouds.driver:jclouds-slf4j:${jcloudsVersion}")
     testImplementation ('org.assertj:assertj-core:3.25.1')
     testImplementation ('ch.qos.logback:logback-core:1.4.14')
     testImplementation ('com.squareup.okhttp3:mockwebserver:4.12.0')
     testImplementation ('org.testng:testng:7.9.0')
     testImplementation ('ch.qos.logback:logback-classic:1.4.14')
 }
 
-ext.compatibilityVersion = JavaVersion.VERSION_11
+ext.compatibilityVersion = JavaVersion.VERSION_17
 ext.javadocPath = compatibilityVersion.isJava8() ? '' : 'en/java/'
 sourceCompatibility = compatibilityVersion
 targetCompatibility = compatibilityVersion
@@ -106,7 +103,6 @@ javadoc {
     source = sourceSets.main.allJava
     options.with {
         links "https://docs.oracle.com/${javadocPath}javase/${compatibilityVersion.toString().replaceAll(/.*\./,"")}/docs/api"
-        links "https://google.github.io/guice/api-docs/${dependencies.guiceVersion}/javadoc/"
         addStringOption('Xdoclint:none', '-quiet')
         addStringOption('source', compatibilityVersion.toString().replaceAll(/.*\./,""))
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-group = io.github.cdancy
+group = io.github.hillelmed
 version = 1.0.2
 
 artifactoryURL = http://127.0.0.1:8080/artifactory

diff --git a/settings.gradle b/settings.gradle
@@ -5,4 +5,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = "jenkins-rest"
+rootProject.name = "jenkins-client-java"
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG jenkins_tag=2.401.3-lts-jdk17
+ARG jenkins_tag=2.440.2-jdk17
 FROM jenkins/jenkins:$jenkins_tag
 
 COPY --chown=jenkins:jenkins init.groovy.d/ /usr/share/jenkins/ref/init.groovy.d/

diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ pluginManagement { @@
         }
     }
-    rootProject.name = "jenkins-rest"
+    rootProject.name = "jenkins-client-java"