Skip to content

Commit 58116b9

Browse files
authored
Merge pull request #51 from rnc/BR1
Update versions. Remove commons-lang:2.6.
2 parents 08d404e + 9c5fe40 commit 58116b9

File tree

6 files changed

+18
-28
lines changed

6 files changed

+18
-28
lines changed

.github/workflows/maven-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
servers: |
5959
[{
60-
"id": "sonatype-nexus-snapshots",
60+
"id": "central-portal-snapshots",
6161
"username": "${{ secrets.SONATYPE_BOT_USERNAME }}",
6262
"password": "${{ secrets.SONATYPE_BOT_TOKEN }}"
6363
}]

pom.xml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
<parent>
2323
<groupId>org.commonjava</groupId>
2424
<artifactId>commonjava</artifactId>
25-
<version>17</version>
25+
<version>21</version>
2626
</parent>
27-
27+
2828
<groupId>org.commonjava.rwx</groupId>
2929
<artifactId>rwx-parent</artifactId>
3030
<version>2.5-SNAPSHOT</version>
31-
31+
3232
<packaging>pom</packaging>
3333
<inceptionYear>2010</inceptionYear>
34-
34+
3535
<name>RWX XML-RPC APIs for Java</name>
3636

3737
<properties>
@@ -41,18 +41,18 @@
4141
<enforceBestPractices>false</enforceBestPractices>
4242
<plugin.jacoco.skip>false</plugin.jacoco.skip>
4343
</properties>
44-
44+
4545
<modules>
4646
<module>rwx</module>
4747
<module>rwx-test</module>
4848
</modules>
49-
49+
5050
<dependencyManagement>
5151
<dependencies>
5252
<dependency>
5353
<groupId>org.commonjava.boms</groupId>
5454
<artifactId>web-commons-bom</artifactId>
55-
<version>27</version>
55+
<version>31</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -64,17 +64,7 @@
6464
<dependency>
6565
<groupId>org.codehaus.groovy</groupId>
6666
<artifactId>groovy-templates</artifactId>
67-
<version>2.4.6</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>commons-io</groupId>
71-
<artifactId>commons-io</artifactId>
72-
<version>2.14.0</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>commons-codec</groupId>
76-
<artifactId>commons-codec</artifactId>
77-
<version>1.4</version>
67+
<version>3.0.17</version>
7868
</dependency>
7969
</dependencies>
8070
</dependencyManagement>
@@ -85,7 +75,7 @@
8575
<url>https://github.com/Commonjava/RWX</url>
8676
<tag>HEAD</tag>
8777
</scm>
88-
78+
8979
<dependencies>
9080
<dependency>
9181
<groupId>org.slf4j</groupId>
@@ -115,5 +105,5 @@
115105
<artifactId>hamcrest-core</artifactId>
116106
</dependency>
117107
</dependencies>
118-
108+
119109
</project>

rwx/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
<artifactId>rwx</artifactId>
2929

3030
<dependencies>
31+
<dependency>
32+
<groupId>org.apache.commons</groupId>
33+
<artifactId>commons-lang3</artifactId>
34+
</dependency>
3135
<dependency>
3236
<groupId>org.codehaus.groovy</groupId>
3337
<artifactId>groovy-templates</artifactId>
@@ -36,10 +40,6 @@
3640
<groupId>commons-io</groupId>
3741
<artifactId>commons-io</artifactId>
3842
</dependency>
39-
<dependency>
40-
<groupId>commons-lang</groupId>
41-
<artifactId>commons-lang</artifactId>
42-
</dependency>
4343
<dependency>
4444
<groupId>commons-codec</groupId>
4545
<artifactId>commons-codec</artifactId>

rwx/src/main/java/org/commonjava/rwx/core/XmlRpcParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.commonjava.rwx.core;
1717

18-
import org.apache.commons.lang.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919
import org.commonjava.rwx.error.CoercionException;
2020
import org.commonjava.rwx.error.XmlRpcException;
2121
import org.commonjava.rwx.vocab.ValueType;

rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.commonjava.rwx.util;
1717

18-
import org.apache.commons.lang.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919

2020
import javax.lang.model.element.Element;
2121
import java.util.ArrayList;

rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import java.util.Map;
3030

31-
import static org.apache.commons.lang.StringUtils.isNotBlank;
31+
import static org.apache.commons.lang3.StringUtils.isNotBlank;
3232
import static org.commonjava.rwx.vocab.XmlRpcConstants.*;
3333

3434
/**

0 commit comments

Comments
 (0)