diff --git a/java/build.xml b/java/build.xml index 1b89bf23c..9be89a8e2 100644 --- a/java/build.xml +++ b/java/build.xml @@ -11,6 +11,8 @@ + + @@ -30,7 +32,13 @@ - + + + + + + + @@ -186,7 +194,7 @@ + depends="download-jars,build-phone-metadata,build-short-metadata,build-alternate-metadata,build-carrier-data,build-geo-data,build-timezones-data"> diff --git a/java/lib/junit-4.13.1.jar b/java/lib/junit-4.13.1.jar deleted file mode 100644 index b376ffc16..000000000 Binary files a/java/lib/junit-4.13.1.jar and /dev/null differ diff --git a/java/lib/mockito-all-1.10.19.jar b/java/lib/mockito-all-1.10.19.jar deleted file mode 100644 index c831489cd..000000000 Binary files a/java/lib/mockito-all-1.10.19.jar and /dev/null differ diff --git a/java/script/download-junit-jars.sh b/java/script/download-junit-jars.sh new file mode 100644 index 000000000..2a4e9a1f5 --- /dev/null +++ b/java/script/download-junit-jars.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Set the version of JUnit and Mockito +junit_version="4.13.1" +mockito_version="1.10.19" +cd ../ +# Function to download a JAR if not available +download_jar() { + local jar_name="$1" + local jar_filename="$2" + local download_url="$3" + + if [ ! -f "lib/$jar_filename" ]; then + echo "Downloading $jar_name..." + wget "$download_url" -P lib + else + echo "$jar_name already exists in lib directory." + fi +} + +# Check and download JUnit&Mockito JAR +download_jar "JUnit" "junit-$junit_version.jar" "https://repo1.maven.org/maven2/junit/junit/$junit_version/junit-$junit_version.jar" +download_jar "Mockito" "mockito-all-$mockito_version.jar" "https://repo1.maven.org/maven2/org/mockito/mockito-all/$mockito_version/mockito-all-$mockito_version.jar" + +# Run the mvn install command for the Snapshot jars +cd ../ +mvn clean install diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar deleted file mode 100644 index bbf973626..000000000 Binary files a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar and /dev/null differ diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar deleted file mode 100644 index bf404a3a5..000000000 Binary files a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar and /dev/null differ