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.

Sign up for GitHub

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

Jump to bottom

Use Enforcer 3.0.0 and matching extra enforcer rules #456

Merged
merged 8 commits into from Nov 16, 2021
Merged

Use Enforcer 3.0.0 and matching extra enforcer rules #456

merged 8 commits into from Nov 16, 2021

Conversation

basil
Copy link
Member

@basil basil commented Nov 15, 2021

Like jenkinsci/pom#196, but for plugin-pom.

dependabot bot and others added 3 commits November 15, 2021 22:25
@dependabot
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
658c1fe 
Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](apache/maven-enforcer@enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump extra-enforcer-rules from 1.3 to 1.4
e478b73 
Bumps [extra-enforcer-rules](https://github.com/mojohaus/extra-enforcer-rules) from 1.3 to 1.4.
- [Release notes](https://github.com/mojohaus/extra-enforcer-rules/releases)
- [Commits](mojohaus/extra-enforcer-rules@extra-enforcer-rules-1.3...extra-enforcer-rules-1.4)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:extra-enforcer-rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@basil
Merge remote-tracking branches 'origin/dependabot/maven/org.apache.ma…
c13c1f2 
…ven.plugins-maven-enforcer-plugin-3.0.0' and 'origin/dependabot/maven/org.codehaus.mojo-extra-enforcer-rules-1.4'
@basil basil changed the title Enforcer Use Enforcer 3.0.0 and matching extra enforcer rules Nov 15, 2021
@basil
Remove no-longer-necessary TODO comment
0eba714
@basil
Require upper bound dependencies error for javax.servlet:servlet-api:…
7d9471a 
…0 [provided] paths to dependency are:

+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:[0] [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:[0] [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jenkins-ci.plugins.icon-shim:icon-set:1.0.5 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jenkins-ci.main:cli:2.204 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:[0] [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.kohsuke.stapler:stapler-adjunct-zeroclipboard:1.3.5-1 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.kohsuke.stapler:stapler-adjunct-timeline:1.5 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.kohsuke.stapler:stapler-adjunct-codemirror:1.3 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jfree:jfreechart:1.0.19 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.5 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.springframework:spring-webmvc:2.5.6.SEC03 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.5 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-commons-fileupload:commons-fileupload:1.3.1-jenkins-2 [provided]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.main:cli:2.204:jar-with-dependencies [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:[0] [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.modules:instance-identity:2.2 [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.modules:slave-installer:1.6 [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.modules:launchd-slave-installer:1.2 [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.modules:upstart-slave-installer:1.1 [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.modules:systemd-slave-installer:1.1 [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.ui:jquery-detached:1.2.1:core-assets [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.ui:bootstrap:1.3.2:core-assets [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci.ui:handlebars:1.1.1:core-assets [test]
      +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.springframework:spring-webmvc:2.5.6.SEC03 [provided]
      +-javax.servlet:jsp-api:2.0 [provided]
        +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.springframework:spring-webmvc:2.5.6.SEC03 [provided]
      +-org.springframework:spring-web:2.5.6.SEC03 [provided]
        +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.4 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.springframework:spring-webmvc:2.5.6.SEC03 [provided]
      +-org.springframework:spring-web:2.5.6.SEC03 [provided]
        +-javax.faces:jsf-api:1.1 [provided]
          +-javax.servlet:servlet-api:0 [provided] (managed) <-- javax.servlet:servlet-api:2.3 [provided]
,
Require upper bound dependencies error for com.google.code.findbugs:annotations:3.0.0 [provided] paths to dependency are:
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jenkins-ci:version-number:1.6 [provided]
      +-com.google.code.findbugs:annotations:3.0.0 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jenkins-ci:task-reactor:1.5 [provided]
      +-com.google.code.findbugs:annotations:3.0.1 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.204 [provided]
    +-org.jvnet.winp:winp:1.28 [provided]
      +-com.google.code.findbugs:annotations:3.0.0 [provided]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-war:2.204 [test]
    +-org.jenkins-ci:executable-war:1.45 [test]
      +-com.google.code.findbugs:annotations:3.0.1 [test]
and
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-test-harness:1645.vf98fc478f846 [test]
    +-io.jenkins.lib:support-log-formatter:1.0 [test]
      +-com.google.code.findbugs:annotations:3.0.1 [test]
@basil
Ignore javax.servlet-api warning
c3dc554
@basil basil marked this pull request as ready for review November 15, 2021 23:11
@oleg-nenashev
Copy link
Member

Thanks @basil !

@oleg-nenashev oleg-nenashev merged commit 52085f9 into jenkinsci:master Nov 16, 2021
@oleg-nenashev oleg-nenashev added the dependencies Pull requests that update a dependency file label Nov 16, 2021
@basil basil deleted the enforcer branch November 16, 2021 05:39
@jglick
Copy link
Member

jglick commented Nov 16, 2021

Superseding #445?

@jglick jglick mentioned this pull request Nov 16, 2021
Closed
@basil basil mentioned this pull request Nov 27, 2021
Merged
@jglick
Copy link
Member

jglick commented Dec 28, 2021

Somehow this broke jenkinsci/mock-load-builder-plugin#19.

This was referenced Dec 28, 2021
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oleg-nenashev oleg-nenashev oleg-nenashev approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@basil @oleg-nenashev @jglick