1berry/jenkins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent Jelly version for commons-jelly-tags-xml (#10131)

Browse Source
This commit is contained in:
Basil Crow 2025-01-09 10:41:23 -08:00 committed by GitHub
parent 331c7685ca
commit 53ad7f9c20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bom/pom.xml
View File

@ -132,11 +132,6 @@ THE SOFTWARE.
<artifactId>commons-io</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@ -243,11 +238,21 @@ THE SOFTWARE.
<artifactId>annotation-indexer</artifactId>
<version>1.18</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly</artifactId>
<version>${jelly.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>${jelly.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>${jelly.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jexl</artifactId>

48
core/pom.xml
View File

@ -166,40 +166,6 @@ THE SOFTWARE.
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<exclusions>
<exclusion>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
</exclusion>
<exclusion>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-junit</artifactId>
</exclusion>
<exclusion>
<groupId>commons-jexl</groupId>
<artifactId>commons-jexl</artifactId>
</exclusion>
<exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Jenkins doesn't use this directly, but some plugins wanted to use the latest -->
<groupId>commons-lang</groupId>
@ -310,6 +276,20 @@ THE SOFTWARE.
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jexl</artifactId>

4
licenseCompleter.groovy
View File

@ -21,7 +21,6 @@ complete {
// logkit is a part of Avalon
match([
"org.apache.ant:*",
"commons-jelly:*",
"log4j:*",
"avalon-framework:*",
"logkit:logkit",
@ -30,8 +29,9 @@ complete {
"commons-beanutils:*",
"commons-net:*",
"commons-cli:*",
"*:commons-jelly",
"org.jenkins-ci:commons-jelly",
"org.jenkins-ci:commons-jelly-tags-fmt",
"org.jenkins-ci:commons-jelly-tags-xml",
"org.jvnet.hudson:commons-jelly-tags-define",
"slide:slide-webdavlib"
]) {

1
war/pom.xml
View File

@ -152,6 +152,7 @@ THE SOFTWARE.
<exclude>org.jenkins-ci:annotation-indexer</exclude>
<exclude>org.jenkins-ci:commons-jelly</exclude>
<exclude>org.jenkins-ci:commons-jelly-tags-fmt</exclude>
<exclude>org.jenkins-ci:commons-jelly-tags-xml</exclude>
<exclude>org.jenkins-ci:crypto-util</exclude>
<exclude>org.jenkins-ci.main:cli</exclude>
<exclude>org.jenkins-ci.main:jenkins-core</exclude>