Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix - compatibility with JCasC fails #478

Merged
merged 4 commits into from
May 25, 2021
Merged

Conversation

Or-Geva
Copy link

@Or-Geva Or-Geva commented May 21, 2021


Fixes: #476

@Or-Geva Or-Geva requested a review from eyalbe4 May 21, 2021 06:25
@Or-Geva Or-Geva requested a review from yahavi May 24, 2021 14:17
@Or-Geva Or-Geva merged commit ec9959f into jfrog:master May 25, 2021
basil added a commit to basil/configuration-as-code-plugin that referenced this pull request May 28, 2021
timja pushed a commit to jenkinsci/configuration-as-code-plugin that referenced this pull request May 28, 2021
* 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>
JosephMancusoa added a commit to JosephMancusoa/configuration-as-code-plugin that referenced this pull request Dec 26, 2022
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

artifactory plugin 3.11.0 not compatible with JCasC?
2 participants