Bump artifactory from 3.4.0 to 3.11.2 (#1610)

* Bump artifactory from 3.4.0 to 3.11.0

Bumps [artifactory](https://github.com/jenkinsci/artifactory-plugin) from 3.4.0 to 3.11.0.
- [Release notes](https://github.com/jenkinsci/artifactory-plugin/releases)
- [Commits](jenkinsci/artifactory-plugin@artifactory-3.4.0...artifactory-3.11.0)

Signed-off-by: dependabot[bot] <[email protected]>

* Require upper bound dependencies error for org.jenkins-ci.main:maven-plugin:3.1.2 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.1.2 (managed) <-- org.jenkins-ci.main:maven-plugin:3.4

* Require upper bound dependencies error for org.codehaus.plexus:plexus-classworlds:2.5.2 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.codehaus.plexus:plexus-classworlds:2.5.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.codehaus.plexus:plexus-classworlds:2.6.0
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven3-agent:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.4.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven31-agent:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.4.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven32-agent:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.5.1
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven33-agent:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.5.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven35-agent:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.6.0
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.main.maven:maven32-interceptor:1.13
        +-org.codehaus.plexus:plexus-classworlds:2.5.1
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-core:3.5.4
        +-org.codehaus.plexus:plexus-classworlds:2.5.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-embedder:3.5.4
        +-org.codehaus.plexus:plexus-classworlds:2.5.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.3
        +-org.codehaus.plexus:plexus-classworlds:2.5.2
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.lib:lib-jenkins-maven-embedder:3.14
        +-org.codehaus.plexus:plexus-classworlds:2.6.0

* Require upper bound dependencies error for org.apache.maven:maven-artifact:3.5.0 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:jira:3.0.8
    +-org.apache.maven:maven-artifact:3.5.0
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-core:3.5.4
        +-org.apache.maven:maven-artifact:3.5.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-compat:3.5.4
        +-org.apache.maven:maven-artifact:3.5.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.jenkins-ci.lib:lib-jenkins-maven-embedder:3.14
        +-org.apache.maven:maven-artifact:3.5.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-core:3.5.4
        +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4
          +-org.apache.maven:maven-artifact:3.3.3
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-core:3.5.4
        +-org.apache.maven:maven-model-builder:3.5.4
          +-org.apache.maven:maven-artifact:3.5.4

* Require upper bound dependencies error for org.apache.maven:maven-plugin-api:3.3.3 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-core:3.5.4
        +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jenkins-ci.main:maven-plugin:3.4
      +-org.apache.maven:maven-embedder:3.5.4
        +-org.apache.maven:maven-plugin-api:3.3.3 (managed) <-- org.apache.maven:maven-plugin-api:3.5.4

* Require upper bound dependencies error for com.github.docker-java:docker-java:3.1.1 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0
      +-com.github.docker-java:docker-java:3.1.1 (managed) <-- com.github.docker-java:docker-java:3.1.5
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-io.jenkins.docker:docker-plugin:1.1.2
    +-org.jenkins-ci.plugins:docker-java-api:3.0.14
      +-com.github.docker-java:docker-java:3.1.1 (managed) <-- com.github.docker-java:docker-java:3.0.14

* Require upper bound dependencies error for com.kohlschutter.junixsocket:junixsocket-common:2.0.4 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-io.jenkins.docker:docker-plugin:1.1.2
    +-com.kohlschutter.junixsocket:junixsocket-common:2.0.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-io.jenkins.docker:docker-plugin:1.1.2
    +-com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
      +-com.kohlschutter.junixsocket:junixsocket-common:2.0.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0
      +-com.github.docker-java:docker-java:3.1.5
        +-com.kohlschutter.junixsocket:junixsocket-common:2.2.0

Require upper bound dependencies error for com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 paths to dependency are:
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-io.jenkins.docker:docker-plugin:1.1.2
    +-com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
and
+-io.jenkins.configuration-as-code:integrations:1.52-SNAPSHOT
  +-org.jenkins-ci.plugins:artifactory:3.11.0
    +-org.jfrog.buildinfo:build-info-extractor-docker:2.26.0
      +-com.github.docker-java:docker-java:3.1.5
        +-com.kohlschutter.junixsocket:junixsocket-native-common:2.2.0

* Update docs and tests for Artifactory >= 3.11.0

* More syntax updates

* Pull in jfrog/jenkins-artifactory-plugin#455

* Apparently jfrog/jenkins-artifactory-plugin#478 fixed the export problem.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

demos/artifactory/README.md

@@ -4,6 +4,24 @@ Artifactory plugin configuration belongs under `unclassified` root element
 
 ## sample configuration
 
+Since 3.11.0:
+
+```yaml
+unclassified:
+  artifactorybuilder:
+    useCredentialsPlugin: true
+    jfrogInstances:
+      - instanceId: artifactory
+        url: http://acme.com/artifactory
+        deployerCredentialsConfig:
+          credentialsId: "artifactory"
+        resolverCredentialsConfig:
+          username: artifactory_user
+          password: "${ARTIFACTORY_PASSWORD}"
+```
+
+Before 3.11.0:
+
 ```yaml
 unclassified:
   artifactorybuilder:

demos/jenkins/jenkins.yaml

@@ -53,9 +53,9 @@ tool:
 unclassified:
   artifactorybuilder:
     useCredentialsPlugin: true
-    artifactoryServers:
-      - serverId: artifactory
-        artifactoryUrl: http://acme.com/artifactory
+    jfrogInstances:
+      - instanceId: artifactory
+        url: http://acme.com/artifactory
         resolverCredentialsConfig:
           username: artifactory_user
           password: "${ARTIFACTORY_PASSWORD}"

integrations/pom.xml

@@ -16,6 +16,7 @@
     <jackson.version>2.11.3</jackson.version>
     <netty.version>4.1.52.Final</netty.version>
     <jenkins.version>2.289</jenkins.version>
+    <junixsocket.version>2.2.0</junixsocket.version>
   </properties>
 
   <dependencies>
@@ -61,7 +62,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>artifactory</artifactId>
-      <version>3.4.0</version>
+      <version>3.11.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion> <!-- Found Banned Dependency: org.sonatype.sisu:sisu-guice:jar:no_aop:3.2.5 -->
@@ -530,14 +531,24 @@
       <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.5</version>
         <exclusions>
           <exclusion> <!-- https://issues.jenkins-ci.org/browse/JENKINS-39689 -->
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>com.kohlschutter.junixsocket</groupId>
+        <artifactId>junixsocket-common</artifactId>
+        <version>${junixsocket.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.kohlschutter.junixsocket</groupId>
+        <artifactId>junixsocket-native-common</artifactId>
+        <version>${junixsocket.version}</version>
+      </dependency>
       <!-- force upper bound dependencies -->
       <dependency>
         <groupId>com.amazonaws</groupId>
@@ -652,6 +663,11 @@
         <artifactId>httpmime</artifactId>
         <version>4.5.13</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>3.5.4</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
@@ -660,7 +676,12 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>3.3.3</version>
+        <version>3.5.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-classworlds</artifactId>
+        <version>2.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -685,7 +706,7 @@
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>maven-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.4</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.modules</groupId>

integrations/src/test/java/io/jenkins/plugins/casc/ArtifactoryTest.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import jenkins.model.Jenkins;
 import org.jfrog.hudson.ArtifactoryBuilder;
-import org.jfrog.hudson.ArtifactoryServer;
+import org.jfrog.hudson.JFrogPlatformInstance;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
@@ -31,13 +31,13 @@ public void configure_artifactory() throws Exception {
         final ArtifactoryBuilder.DescriptorImpl descriptor = (ArtifactoryBuilder.DescriptorImpl) jenkins.getDescriptor(ArtifactoryBuilder.class);
         assertTrue(descriptor.getUseCredentialsPlugin());
 
-        final List<ArtifactoryServer> actifactoryServers = descriptor.getArtifactoryServers();
-        assertThat(actifactoryServers, hasSize(1));
-        assertThat(actifactoryServers.get(0).getName(), is(equalTo("artifactory")));
-        assertThat(actifactoryServers.get(0).getUrl(), is(equalTo("http://acme.com/artifactory")));
-        assertThat(actifactoryServers.get(0).getDeployerCredentialsConfig().getCredentialsId(), is(equalTo("artifactory")));
-        assertThat(actifactoryServers.get(0).getResolverCredentialsConfig().getUsername(), is(equalTo("artifactory_user")));
-        assertThat(actifactoryServers.get(0).getResolverCredentialsConfig().getPassword(), is(equalTo("password123")));
+        final List<JFrogPlatformInstance> jfrogInstances = descriptor.getJfrogInstances();
+        assertThat(jfrogInstances, hasSize(1));
+        assertThat(jfrogInstances.get(0).getId(), is(equalTo("artifactory")));
+        assertThat(jfrogInstances.get(0).getUrl(), is(equalTo("http://acme.com/artifactory")));
+        assertThat(jfrogInstances.get(0).getDeployerCredentialsConfig().getCredentialsId(), is(equalTo("artifactory")));
+        assertThat(jfrogInstances.get(0).getResolverCredentialsConfig().getUsername(), is(equalTo("artifactory_user")));
+        assertThat(jfrogInstances.get(0).getResolverCredentialsConfig().getPassword().getPlainText(), is(equalTo("password123")));
 
     }
 }

integrations/src/test/java/io/jenkins/plugins/casc/JenkinsDemoTest.java

@@ -12,7 +12,7 @@
 import org.jenkinsci.plugins.workflow.libs.GlobalLibraries;
 import org.jenkinsci.plugins.workflow.libs.LibraryConfiguration;
 import org.jfrog.hudson.ArtifactoryBuilder;
-import org.jfrog.hudson.ArtifactoryServer;
+import org.jfrog.hudson.JFrogPlatformInstance;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
@@ -71,12 +71,12 @@ public void configure_demo_yaml() throws Exception {
         final ArtifactoryBuilder.DescriptorImpl artifactory = (ArtifactoryBuilder.DescriptorImpl) jenkins.getDescriptor(ArtifactoryBuilder.class);
         assertTrue(artifactory.getUseCredentialsPlugin());
 
-        final List<ArtifactoryServer> actifactoryServers = artifactory.getArtifactoryServers();
-        assertThat(actifactoryServers, hasSize(1));
-        assertThat(actifactoryServers.get(0).getName(), is(equalTo("artifactory")));
-        assertThat(actifactoryServers.get(0).getUrl(), is(equalTo("http://acme.com/artifactory")));
-        assertThat(actifactoryServers.get(0).getResolverCredentialsConfig().getUsername(), is(equalTo("artifactory_user")));
-        assertThat(actifactoryServers.get(0).getResolverCredentialsConfig().getPassword(), is(equalTo("password123")));
+        final List<JFrogPlatformInstance> jfrogInstances = artifactory.getJfrogInstances();
+        assertThat(jfrogInstances, hasSize(1));
+        assertThat(jfrogInstances.get(0).getId(), is(equalTo("artifactory")));
+        assertThat(jfrogInstances.get(0).getUrl(), is(equalTo("http://acme.com/artifactory")));
+        assertThat(jfrogInstances.get(0).getResolverCredentialsConfig().getUsername(), is(equalTo("artifactory_user")));
+        assertThat(jfrogInstances.get(0).getResolverCredentialsConfig().getPassword().getPlainText(), is(equalTo("password123")));
     }
 
 }

test-harness/src/test/resources/io/jenkins/plugins/casc/ArtifactoryBuilderTest.yml

@@ -1,10 +1,9 @@
-jenkins:
+unclassified:
   artifactorybuilder:
     useCredentialsPlugin: true
-    artifactoryServers:
-      - name: foo
-        serverId: artifactory
-        artifactoryUrl: http://acme.com/artifactory
+    jfrogInstances:
+      - instanceId: artifactory
+        url: http://acme.com/artifactory
         resolverCredentialsConfig:
           username: artifactory_user
           password: ${ARTIFACTORY_PASSWORD}