Skip to content

Commit 57dde41

Browse files
authored
Remove unnecessary workarounds (#836)
1 parent bedc316 commit 57dde41

File tree

1 file changed

+0
-71
lines changed

1 file changed

+0
-71
lines changed

pom.xml

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -580,78 +580,7 @@
580580
</bannedDependencies>
581581
<requireUpperBoundDeps>
582582
<excludes>
583-
<exclude>com.google.code.findbugs:annotations</exclude>
584583
<exclude>com.google.code.findbugs:jsr305</exclude>
585-
<exclude>com.google.guava:guava</exclude>
586-
<exclude>commons-logging:commons-logging</exclude>
587-
<exclude>javax.servlet:javax.servlet-api</exclude>
588-
<exclude>javax.servlet:servlet-api</exclude>
589-
<exclude>net.java.dev.jna:jna</exclude>
590-
<exclude>org.kohsuke:access-modifier-annotation</exclude>
591-
<!--
592-
Work around the following require upper bound dependencies error on 2.222.x
593-
and 2.235.x:
594-
595-
Require upper bound dependencies error for com.github.spotbugs:spotbugs-annotations:3.1.11 [provided] paths to dependency are:
596-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
597-
+-com.github.spotbugs:spotbugs-annotations:3.1.11 [provided]
598-
and
599-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
600-
+-org.jenkins-ci.main:jenkins-core:2.222 [provided]
601-
+-org.jenkins-ci.main:remoting:4.2 [provided] (managed) ← org.jenkins-ci.main:remoting:4.2 [provided]
602-
+-com.github.spotbugs:spotbugs-annotations:3.1.11 [provided] (managed) ← com.github.spotbugs:spotbugs-annotations:3.1.12 [provided]
603-
and
604-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
605-
+-org.jenkins-ci.main:jenkins-core:2.222 [provided]
606-
+-org.jenkins-ci.main:cli:2.222 [provided]
607-
+-com.github.spotbugs:spotbugs-annotations:3.1.11 [provided] (managed) ← com.github.spotbugs:spotbugs-annotations:3.1.12 [provided]
608-
609-
In the long term, this ought to be mitigated by jenkinsci/remoting#495 (which
610-
makes Remoting's dependency on spotbugs-annotations optional) and by
611-
jenkinsci/jenkins#6066 (which makes cli's dependency on spotbugs-annotations
612-
optional).
613-
-->
614-
<exclude>com.github.spotbugs:spotbugs-annotations</exclude>
615-
<!--
616-
Work around the following require upper bound dependencies error on 2.289.x:
617-
618-
Require upper bound dependencies error for org.ow2.asm:asm:9.0 [provided] paths to dependency are:
619-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
620-
+-org.kohsuke:access-modifier-annotation:1.21 [provided]
621-
+-org.ow2.asm:asm:9.0 [provided]
622-
and
623-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
624-
+-org.jenkins-ci.main:jenkins-core:2.289 [provided]
625-
+-com.github.jnr:jnr-posix:3.1.5 [provided] (managed) ← com.github.jnr:jnr-posix:3.1.5 [provided]
626-
+-com.github.jnr:jnr-ffi:2.2.2 [provided]
627-
+-org.ow2.asm:asm:9.1 [provided]
628-
and
629-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
630-
+-org.jenkins-ci.main:jenkins-core:2.289 [provided]
631-
+-com.github.jnr:jnr-posix:3.1.5 [provided] (managed) ← com.github.jnr:jnr-posix:3.1.5 [provided]
632-
+-com.github.jnr:jnr-ffi:2.2.2 [provided]
633-
+-org.ow2.asm:asm-commons:9.1 [provided]
634-
+-org.ow2.asm:asm:9.1 [provided]
635-
and
636-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
637-
+-org.jenkins-ci.main:jenkins-core:2.289 [provided]
638-
+-com.github.jnr:jnr-posix:3.1.5 [provided] (managed) ← com.github.jnr:jnr-posix:3.1.5 [provided]
639-
+-com.github.jnr:jnr-ffi:2.2.2 [provided]
640-
+-org.ow2.asm:asm-tree:9.1 [provided]
641-
+-org.ow2.asm:asm:9.1 [provided]
642-
and
643-
+-org.jenkins-ci.plugins:plugin:4.32-SNAPSHOT
644-
+-org.jenkins-ci.main:jenkins-core:2.289 [provided]
645-
+-com.github.jnr:jnr-posix:3.1.5 [provided] (managed) ← com.github.jnr:jnr-posix:3.1.5 [provided]
646-
+-com.github.jnr:jnr-ffi:2.2.2 [provided]
647-
+-org.ow2.asm:asm-util:9.1 [provided]
648-
+-org.ow2.asm:asm:9.1 [provided]
649-
650-
In the long term, this ought to be mitigated by jenkinsci/jenkins#6014 (which
651-
explicitly aligns ASM dependencies) and by jenkinsci/jenkins#5979 (which
652-
removes JNR).
653-
-->
654-
<exclude>org.ow2.asm:asm</exclude>
655584
</excludes>
656585
</requireUpperBoundDeps>
657586
</rules>

0 commit comments

Comments
 (0)