get changes from upstream

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [khmarbaise]

.sdkmanrc

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.252.hs-adpt

ReleaseNotes.md

@@ -1,8 +1,89 @@
 # Release Notes
 
-## Release 0.3.9 (NOT RELEASED YET)
+## Release 0.4.0 (NOT RELEASED YET)
+
+ * [Fixed Issue 465][issue-465]
+
+   * Remove asciidoctor site parts
+     * AS preparation for user guide.
+
+ * [Fixed Issue 464][issue-464]
+
+   * Replaced xml-apis with xerces-xmlParserAPI.
+
+ * [Fixed Issue 309][issue-309]
+
+   * Added possibility to get mode detailed data from Maven Modules from Jobs/Builds
+
+     Thanks for that to [Jakub Zacek](https://github.com/dawon).
+
+ * [Fixed Issue 395][issue-395]
+
+   * Remove google guava lib
+   * Removed also the creation of the shaded artifact `stash`
+     cause we do not rely on Guava anymore. So you 
+     can use the original artifact directly.
+   * This results in a bumping of the version
+     number cause it is a change which is breaking 
+     with previous version 0.3.8.
+
+ * [Fixed Issue 405][issue-405]
+
+	* CVE-2018-14718
+	* CVE-2018-14719
+	* CVE-2018-14720
+	* CVE-2018-14721
+	* CVE-2018-19360
+	* CVE-2018-19361
+	* CVE-2018-19362
+
+ * [Fixed Issue 402][issue-402]
+
+   Upgrade httpclient/httpmine/httpcore.
+
+ * [Fixed Issue 401][issue-401]
+
+   Upgrade JUnit
+
+ * [Fixed Issue 400][issue-400]
+
+   Upgrade assertj-core.
+
+ * [Fixed Issue 399][issue-399]
+
+   Upgrade Maven Plugins
+
+ * [Fixed Issue 397][issue-397]
+
+   Refactored Code Replaced UrlEscapers calls with EncodingUtils.
+
+ * [Fixed Issue 396][issue-396]
+
+   Add Unit Test for EncodingUtils.
+
+ * [Fixed Issue 394][issue-394]
+
+   Replace `Strings.isNullOrEmpty()` with self implemented code. 
+
+ * [Pull Request #386][pull-386] 
+
+   Add the crumbFlag as the 2nd parameter of getConsoleOutputText method 
+
+ * [JENKINS-56186][jissue-56186]
+
+   Added labels to computers
+
+   ```java
+    ComputerWithDetails computer = ...
+    for (ComputerLabel assignedLabel : computer.getAssignedLabels()) {
+      assignedLabel.getName()
+    }
+   ```
+
+ * [JENKINS-56585][jissue-56585]
+
+   Change request method of `QuietDown()` to POST
 
- * ...
 
 ## Release 0.3.8
 
@@ -121,7 +202,7 @@
     Added new methods to JenkinsServer for stopping and restarting Jenkins. The methods are restart(Boolean crumbFlag), safeRestart(Boolean crumbFlag), exit(Boolean crumbFlag) and safeExit(Boolean crumbFlag)
 
 	Thanks for that to [Chids](https://github.com/Chids-gs).
-	
+
 ## Release 0.3.7
 
  * Changed Eclipse Formatting configuration.
@@ -1070,8 +1151,21 @@ TestReport testReport = mavenJob.getLastSuccessfulBuild().getTestReport();
 [issue-244]: https://github.com/jenkinsci/java-client-api/issues/244
 [issue-268]: https://github.com/jenkinsci/java-client-api/issues/268
 [issue-289]: https://github.com/jenkinsci/java-client-api/issues/289
+[issue-282]: https://github.com/jenkinsci/java-client-api/issues/282
+[issue-291]: https://github.com/jenkinsci/java-client-api/issues/291
 [issue-298]: https://github.com/jenkinsci/java-client-api/issues/298
 [issue-301]: https://github.com/jenkinsci/java-client-api/issues/301
+[issue-309]: https://github.com/jenkinsci/java-client-api/issues/309
+[issue-394]: https://github.com/jenkinsci/java-client-api/issues/394
+[issue-395]: https://github.com/jenkinsci/java-client-api/issues/395
+[issue-396]: https://github.com/jenkinsci/java-client-api/issues/396
+[issue-397]: https://github.com/jenkinsci/java-client-api/issues/397
+[issue-399]: https://github.com/jenkinsci/java-client-api/issues/399
+[issue-400]: https://github.com/jenkinsci/java-client-api/issues/400
+[issue-401]: https://github.com/jenkinsci/java-client-api/issues/401
+[issue-402]: https://github.com/jenkinsci/java-client-api/issues/402
+[issue-405]: https://github.com/jenkinsci/java-client-api/issues/405
+[issue-464]: https://github.com/jenkinsci/java-client-api/issues/464
 [pull-123]: https://github.com/jenkinsci/java-client-api/pull/123
 [pull-149]: https://github.com/jenkinsci/java-client-api/pull/149
 [pull-158]: https://github.com/jenkinsci/java-client-api/pull/158
@@ -1083,10 +1177,13 @@ TestReport testReport = mavenJob.getLastSuccessfulBuild().getTestReport();
 [pull-240]: https://github.com/jenkinsci/java-client-api/pull/240
 [pull-247]: https://github.com/jenkinsci/java-client-api/pull/247
 [pull-262]: https://github.com/jenkinsci/java-client-api/pull/262
+[pull-386]: https://github.com/jenkinsci/java-client-api/pull/386
 [jissue-35002]: https://issues.jenkins-ci.org/browse/JENKINS-35002
 [jissue-35108]: https://issues.jenkins-ci.org/browse/JENKINS-35108
 [jissue-38787]: https://issues.jenkins-ci.org/browse/JENKINS-38787
 [jissue-38816]: https://issues.jenkins-ci.org/browse/JENKINS-38816
 [jissue-38823]: https://issues.jenkins-ci.org/browse/JENKINS-38823
-[jissue-46445]: https://issues.jenkins-ci.org/browse/JENKINS-46445)
-[jissue-46472]: https://issues.jenkins-ci.org/browse/JENKINS-46472)
+[jissue-46445]: https://issues.jenkins-ci.org/browse/JENKINS-46445
+[jissue-46472]: https://issues.jenkins-ci.org/browse/JENKINS-46472
+[jissue-56186]: https://issues.jenkins-ci.org/browse/JENKINS-56186
+[jissue-56585]: https://issues.jenkins-ci.org/browse/JENKINS-56585

jenkins-client-it-docker/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.offbytwo.jenkins</groupId>
     <artifactId>jenkins-client-parent</artifactId>
-    <version>0.3.9-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-client-it-docker</artifactId>
@@ -43,11 +43,6 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobIT.java

@@ -7,7 +7,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Joiner;
 import com.offbytwo.jenkins.model.Build;
 import com.offbytwo.jenkins.model.BuildResult;
 import com.offbytwo.jenkins.model.BuildWithDetails;
@@ -50,7 +49,7 @@ private void checkJob(BuildWithDetails details) throws IOException {
                 "Building in workspace /var/jenkins_home/jobs/test/workspace",
                 "[workspace] $ /bin/sh -xe /tmp/hudson2556403647634111927.sh", "+ echo test", "test",
                 "Finished: SUCCESS", "" };
-        String expectedOutput = Joiner.on("\r\n").join(expectedOutputLines);
+        String expectedOutput = String.join("\r\n", expectedOutputLines);
         // Hint: It looks like the consoleOutputText contains CR+LF
         String resultingOutput = details.getConsoleOutputText();
         assertThat(resultingOutput).isEqualTo(expectedOutput);

jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobXmlIT.java

@@ -7,8 +7,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Joiner;
-
 @Test(groups = { Groups.NO_EXECUTOR_GROUP })
 public class NoExecutorStartedGetJobXmlIT extends AbstractJenkinsIntegrationCase {
 
@@ -47,7 +45,7 @@ public void beforeMethod() throws IOException {
 
     @Test
     public void getJobXmlShouldReturnTheExpectedConfigXml() {
-        String expectedXml = Joiner.on("\n").join(CONFIG_XML);
+        String expectedXml = String.join("\n", CONFIG_XML);
         assertThat(jobXml).isEqualTo(expectedXml);
     }
 

jenkins-client/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.offbytwo.jenkins</groupId>
     <artifactId>jenkins-client-parent</artifactId>
-    <version>0.3.9-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-client</artifactId>
@@ -34,7 +34,7 @@
     </dependency>
 
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>org.dom4j</groupId>
       <artifactId>dom4j</artifactId>
     </dependency>
 
@@ -51,11 +51,6 @@
     </dependency>
 
     <!-- Musties -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -114,10 +109,9 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
     </dependency>
   </dependencies>
 
@@ -127,28 +121,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
-          <execution>
-            <id>stash</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.google.guava:guava</include>
-                </includes>
-              </artifactSet>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>stash</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.common</pattern>
-                  <shadedPattern>com.google.common.jenkins_client_jarjar</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
           <execution>
             <id>httpclient</id>
             <phase>package</phase>
@@ -164,12 +136,6 @@
               </artifactSet>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>apachehttp</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.common</pattern>
-                  <shadedPattern>com.google.common.jenkins_client_jarjar</shadedPattern>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>