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 6700d8b4ee4b8ae21556e64addcc86becd4eb7c0 Author: Josh Tynjala <[email protected]> AuthorDate: Wed Mar 6 16:06:58 2024 -0800 update junit to 4.13.2 to make Dependabot happy Also requires hamcrest 2.2, which is BSD licensed --- compiler-externc/pom.xml | 2 +- compiler-jx/pom.xml | 2 +- compiler-jx/src/test/downloads.xml | 43 +++++++++++++++++++++++++++++++------ compiler-test-utils/pom.xml | 2 +- compiler/pom.xml | 2 +- compiler/src/test/build.xml | 12 ++++++++--- compiler/src/test/downloads.xml | 44 ++++++++++++++++++++++++++++++++------ debugger/pom.xml | 2 +- formatter/pom.xml | 2 +- linter/pom.xml | 2 +- 10 files changed, 89 insertions(+), 24 deletions(-) diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 885994de0..1b4b978b8 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -271,7 +271,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 892207633..9359cc82f 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -231,7 +231,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> diff --git a/compiler-jx/src/test/downloads.xml b/compiler-jx/src/test/downloads.xml index 310810c22..3e207213d 100644 --- a/compiler-jx/src/test/downloads.xml +++ b/compiler-jx/src/test/downloads.xml @@ -33,7 +33,8 @@ For Apache, the JARS must be removed from the repository. Licenses: - JUnit (4.10) - CPL 1.0 + JUnit (4.13.2) - CPL 1.0 + Hamcrest (2.2) - BSD --> <!-- @@ -41,7 +42,7 @@ they are each downloaded only if they don't already exist. --> - <target name="main" depends="prepare, junit-jar" + <target name="main" depends="prepare, junit-jar, hamcrest-jar" description="Downloads all the required thirdparty JARs"/> <target name="prepare" > @@ -105,24 +106,52 @@ <target name="junit-jar-check" description="Checks if JUnit JAR exists."> <condition property="junit.jar.exists"> <and> - <available file="${lib.dir}/junit-4.10.jar"/> + <available file="${lib.dir}/junit-4.13.2.jar"/> </and> </condition> </target> <target name="junit-jar" depends="junit-jar-check" unless="junit.jar.exists" description="Copies the JUnit JAR to the lib directory."> - <echo message="Obtaining lib/junit-4.10.jar"/> + <echo message="Obtaining lib/junit-4.13.2.jar"/> <antcall target="junit-download-jar"/> </target> <target name="junit-download-jar" depends="junit-jar-check" unless="junit.jar.exists" description="Downloads the JUnit jar."> <antcall target="download-jar"> - <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=junit/junit/4.10"/> - <param name="srcJarFile" value="junit-4.10.jar"/> + <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=junit/junit/4.13.2"/> + <param name="srcJarFile" value="junit-4.13.2.jar"/> <param name="destDir" value="${lib.dir}"/> - <param name="destJarFile" value="junit-4.10.jar"/> + <param name="destJarFile" value="junit-4.13.2.jar"/> + </antcall> + </target> + + <!-- + hamcrest + --> + + <target name="hamcrest-jar-check" description="Checks if hamcrest JAR exists."> + <condition property="hamcrest.jar.exists"> + <and> + <available file="${lib.dir}/hamcrest-2.2.jar"/> + </and> + </condition> + </target> + + <target name="hamcrest-jar" depends="hamcrest-jar-check" unless="hamcrest.jar.exists" + description="Copies the hamcrest JAR to the lib directory."> + <echo message="Obtaining lib/hamcrest-2.2.jar"/> + <antcall target="hamcrest-download-jar"/> + </target> + + <target name="hamcrest-download-jar" depends="hamcrest-jar-check" unless="hamcrest.jar.exists" + description="Downloads the hamcrest jar."> + <antcall target="download-jar"> + <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest/2.2"/> + <param name="srcJarFile" value="hamcrest-2.2.jar"/> + <param name="destDir" value="${lib.dir}"/> + <param name="destJarFile" value="hamcrest-2.2.jar"/> </antcall> </target> diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index 002706a8e..bbdb1b439 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> </dependency> </dependencies> diff --git a/compiler/pom.xml b/compiler/pom.xml index 743c21781..6f2fc38df 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -649,7 +649,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <!-- TODO: Currently only needed for the duplicate FlashplayerSecurityHandler --> diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml index 27a8cdeb5..69487f947 100644 --- a/compiler/src/test/build.xml +++ b/compiler/src/test/build.xml @@ -401,9 +401,15 @@ </target> <target name="wipe" depends="clean"> - <delete file="${compiler}/lib/external/commons-lang3-3.4.jar"/> - <delete file="${compiler}/lib/external/commons-compress-1.26.0.jar"/> - <delete file="${compiler}/lib/external/junit-4.10.jar"/> + <delete > + <fileset dir="${compiler}/lib/external" includes="commons-lang3-*.jar" erroronmissingdir="false"/> + </delete> + <delete> + <fileset dir="${compiler}/lib/external" includes="commons-compress-*.jar" erroronmissingdir="false"/> + </delete> + <delete> + <fileset dir="${compiler}/lib/external" includes="junit-*.jar" erroronmissingdir="false"/> + </delete> </target> </project> diff --git a/compiler/src/test/downloads.xml b/compiler/src/test/downloads.xml index afc3a60b8..6328db1db 100644 --- a/compiler/src/test/downloads.xml +++ b/compiler/src/test/downloads.xml @@ -41,7 +41,8 @@ For Apache, the JARS must be removed from the repository. Licenses: - JUnit (4.10) - CPL 1.0 + JUnit (4.13.2) - CPL 1.0 + Hamcrest (2.2) - BSD Commons Compress - Apache 2.0 Commons Lang3 - Apache 2.0 --> @@ -51,7 +52,7 @@ they are each downloaded only if they don't already exist. --> - <target name="main" depends="prepare, junit-jar, commons-compress-jar, commons-lang3-jar" + <target name="main" depends="prepare, junit-jar, hamcrest-jar, commons-compress-jar, commons-lang3-jar" description="Downloads all the required thirdparty JARs"/> <target name="prepare" > @@ -67,6 +68,7 @@ <delete includeEmptyDirs="true" failonerror="false"> <fileset dir="${download.dir}"> <include name="junit*/**"/> + <include name="hamcrest*/**"/> <include name="commons-compress*/**"/> </fileset> </delete> @@ -116,24 +118,52 @@ <target name="junit-jar-check" description="Checks if JUnit JAR exists."> <condition property="junit.jar.exists"> <and> - <available file="${external.lib.dir}/junit-4.10.jar"/> + <available file="${external.lib.dir}/junit-4.13.2.jar"/> </and> </condition> </target> <target name="junit-jar" depends="junit-jar-check" unless="junit.jar.exists" description="Copies the JUnit JAR to the lib directory."> - <echo message="Obtaining lib/external/junit-4.10.jar"/> + <echo message="Obtaining lib/external/junit-4.13.2.jar"/> <antcall target="junit-download-jar"/> </target> <target name="junit-download-jar" depends="junit-jar-check" unless="junit.jar.exists" description="Downloads the JUnit jar."> <antcall target="download-jar"> - <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=junit/junit/4.10"/> - <param name="srcJarFile" value="junit-4.10.jar"/> + <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=junit/junit/4.13.2"/> + <param name="srcJarFile" value="junit-4.13.2.jar"/> <param name="destDir" value="${external.lib.dir}"/> - <param name="destJarFile" value="junit-4.10.jar"/> + <param name="destJarFile" value="junit-4.13.2.jar"/> + </antcall> + </target> + + <!-- + hamcrest + --> + + <target name="hamcrest-jar-check" description="Checks if hamcrest JAR exists."> + <condition property="hamcrest.jar.exists"> + <and> + <available file="${external.lib.dir}/hamcrest-2.2.jar"/> + </and> + </condition> + </target> + + <target name="hamcrest-jar" depends="hamcrest-jar-check" unless="hamcrest.jar.exists" + description="Copies the hamcrest JAR to the lib directory."> + <echo message="Obtaining lib/external/hamcrest-2.2.jar"/> + <antcall target="hamcrest-download-jar"/> + </target> + + <target name="hamcrest-download-jar" depends="hamcrest-jar-check" unless="hamcrest.jar.exists" + description="Downloads the hamcrest jar."> + <antcall target="download-jar"> + <param name="srcUrl" value="https://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest/2.2"/> + <param name="srcJarFile" value="hamcrest-2.2.jar"/> + <param name="destDir" value="${external.lib.dir}"/> + <param name="destJarFile" value="hamcrest-2.2.jar"/> </antcall> </target> diff --git a/debugger/pom.xml b/debugger/pom.xml index 146f2edfa..7ac9dd4ee 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -132,7 +132,7 @@ Do all the JBurg code generation. <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/formatter/pom.xml b/formatter/pom.xml index 496c48a12..28f599d74 100644 --- a/formatter/pom.xml +++ b/formatter/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/linter/pom.xml b/linter/pom.xml index 22d470c7a..dc58b1d36 100644 --- a/linter/pom.xml +++ b/linter/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.13.2</version> <scope>test</scope> </dependency> </dependencies>
