You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2025/08/27 22:40:09 UTC
(royale-compiler) 01/02: dependencies: instead of both commons-lang and commons-lang3, upgrade everything to commons-lang3
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit c6c45b2b6c49069ac5c4abc1de4ac434359333d2
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Aug 27 15:01:49 2025 -0700
dependencies: instead of both commons-lang and commons-lang3, upgrade everything to commons-lang3
---
README | 1 -
compiler-jx/build.xml | 4 ++--
compiler-jx/pom.xml | 8 ++++----
.../compiler/internal/codegen/js/jx/LiteralEmitter.java | 2 +-
.../internal/codegen/mxml/royale/MXMLRoyaleEmitter.java | 6 +++---
compiler/src/main/resources/downloads.xml | 17 +++++++++--------
debugger/build.properties | 2 +-
debugger/pom.xml | 8 ++++----
.../src/main/java/flex/tools/debugger/cli/DebugCLI.java | 2 +-
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/README b/README
index d6bc4d130..e23754e37 100644
--- a/README
+++ b/README
@@ -251,7 +251,6 @@ Software Dependencies
args4j - https://repo1.maven.org/maven2/args4j/args4j/2.0.28/args4j-2.0.28.jar
commons-cli - https://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar
commons-io - https://repo1.maven.org/maven2/commons-io/commons-io/2.14.0/commons-io-2.14.0.jar
- commons-lang - https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar
commons-lang3 - https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar
commons-compress - https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.jar
guava - https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 5f6b13f21..a1fd8149e 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -69,7 +69,7 @@
</filelist>
<filelist dir="${royale.lib.dir}/external">
<file name="antlr.jar" />
- <file name="commons-lang-2.6.jar" />
+ <file name="commons-lang3-3.18.0.jar" />
</filelist>
<filelist dir="${lib}">
<file name="commons-io.jar" />
@@ -104,7 +104,7 @@
<target name="main" depends="prebuild,compile">
- <property name="jar.classpath" value="commons-io.jar guava.jar failureaccess.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar" />
+ <property name="jar.classpath" value="commons-io.jar guava.jar failureaccess.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang3-3.18.0.jar ../../compiler/lib/external/commons-lang3-3.18.0.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar" />
<copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/>
<copy file="${basedir}/../NOTICE.base" tofile="${classes.dir}/META-INF/NOTICE"/>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 41df13edc..0a5da9504 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -40,7 +40,7 @@
<manifestEntries>
<Sealed>false</Sealed>
<!-- These paths are all defined the way the layout will be in the distribution -->
- <Class-Path>commons-io.jar guava.jar failureaccess.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../../lib/external/commons-lang.jar ../../lib/external/closure-compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar</Class-Path>
+ <Class-Path>commons-io.jar guava.jar failureaccess.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../../lib/external/commons-lang3.jar ../../lib/external/closure-compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
@@ -201,9 +201,9 @@
<version>1.26.0</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.18.0</version>
</dependency>
<dependency>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
index 188366779..f97d2c978 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Stack;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.royale.compiler.codegen.ISubEmitter;
import org.apache.royale.compiler.codegen.js.IJSEmitter;
import org.apache.royale.compiler.common.IMetaInfo;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index 59057960a..71023dece 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -36,7 +36,7 @@ import java.util.regex.Matcher;
import java.util.Set;
import java.util.Stack;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.royale.abc.ABCConstants;
import org.apache.royale.abc.instructionlist.InstructionList;
import org.apache.royale.abc.semantics.Instruction;
@@ -3828,7 +3828,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
write(ASEmitterTokens.SPACE);
writeToken(ASEmitterTokens.EQUAL);
write("new XML('");
- write(StringEscapeUtils.escapeJavaScript(valueString));
+ write(StringEscapeUtils.escapeEcmaScript(valueString));
write("')");
write(ASEmitterTokens.SEMICOLON);
}
@@ -3848,7 +3848,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
write(ASEmitterTokens.SPACE);
writeToken(ASEmitterTokens.EQUAL);
write("new XMLList('");
- write(StringEscapeUtils.escapeJavaScript(valueString));
+ write(StringEscapeUtils.escapeEcmaScript(valueString));
write("')");
write(ASEmitterTokens.SEMICOLON);
}
diff --git a/compiler/src/main/resources/downloads.xml b/compiler/src/main/resources/downloads.xml
index 1841b0b3f..413757d25 100644
--- a/compiler/src/main/resources/downloads.xml
+++ b/compiler/src/main/resources/downloads.xml
@@ -29,6 +29,7 @@
antlr (3) - BSD
commons-cli (1.2) - Apache 2.0
commons-io (2.14.0) - Apache 2.0
+ commons-lang3 (3.18.0) - Apache 2.0
guava (32.0.0-jre) - Apache 2.0
JBurg (1.10.2) - CPL 1.0
lzma-sdk (9.2) - Public Domain
@@ -116,17 +117,17 @@
<param name="dest.filename" value="${commons-io.name}.jar"/>
</antcall>
- <!-- commons-lang (for fdb) -->
- <property name="commons-lang.name" value="commons-lang"/>
- <property name="commons-lang.version" value="2.6"/>
+ <!-- commons-lang3 -->
+ <property name="commons-lang3.name" value="commons-lang3"/>
+ <property name="commons-lang3.version" value="3.18.0"/>
<antcall target="download-dependency">
- <param name="name" value="${commons-lang.name}-${commons-lang.version}"/>
+ <param name="name" value="${commons-lang3.name}-${commons-lang3.version}"/>
<param name="src.server" value="${maven.search.url}"/>
- <param name="src.folder" value="commons-lang/commons-lang/${commons-lang.version}"/>
- <param name="src.filename" value="${commons-lang.name}-${commons-lang.version}.jar"/>
- <param name="src.checksum" value="4d5c1693079575b362edf41500630bbd"/>
+ <param name="src.folder" value="org/apache/commons/commons-lang3/${commons-lang3.version}"/>
+ <param name="src.filename" value="${commons-lang3.name}-${commons-lang3.version}.jar"/>
+ <param name="src.checksum" value="48b9886957920a4cdb602780ca345087"/>
<param name="dest.folder" value=""/>
- <param name="dest.filename" value="${commons-lang.name}-${commons-lang.version}.jar"/>
+ <param name="dest.filename" value="${commons-lang3.name}-${commons-lang3.version}.jar"/>
</antcall>
<!-- guava -->
diff --git a/debugger/build.properties b/debugger/build.properties
index 1a65b98f8..a31882f54 100644
--- a/debugger/build.properties
+++ b/debugger/build.properties
@@ -48,7 +48,7 @@ dist=${basedir}/../compiler/lib
#JAR names
jar=fdb.jar
-jar.dependencies=compiler.jar compiler-common.jar swfutils.jar external/commons-lang-2.6.jar
+jar.dependencies=compiler.jar compiler-common.jar swfutils.jar external/commons-lang3-3.18.0.jar
# Options for <javac> tasks
javac.debug=true
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 5ca241882..a37e0fe40 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -83,7 +83,7 @@ Do all the JBurg code generation.
</manifest>
<manifestEntries>
<!-- These paths are all defined the way the layout will be in the distribution -->
- <Class-Path>compiler.jar compiler-common.jar swfutils.jar external/commons-lang.jar</Class-Path>
+ <Class-Path>compiler.jar compiler-common.jar swfutils.jar external/commons-lang3.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
@@ -103,9 +103,9 @@ Do all the JBurg code generation.
<version>0.9.13-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.18.0</version>
</dependency>
<dependency>
diff --git a/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java b/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java
index f1a942daf..4d0581ecc 100644
--- a/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java
+++ b/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java
@@ -32,7 +32,7 @@ import flash.util.FieldFormat;
import flash.util.Trace;
import flex.tools.debugger.cli.ExpressionCache.EvaluationResult;
import flex.tools.debugger.cli.FaultActions.FaultActionsBuilder;
-import org.apache.commons.lang.LocaleUtils;
+import org.apache.commons.lang3.LocaleUtils;
import java.io.*;
import java.net.SocketException;