From 6a7920d46e047263774273737f66436e358b6d75 Mon Sep 17 00:00:00 2001 From: David Cohen Date: Wed, 28 Apr 2021 16:18:17 -0400 Subject: [PATCH] Latest dave (#893) * up maven image level * up maven image level * up maven image level * Update stack.yaml fix quotes * increment version number * compile jave * compile jave * compile java * no wget * wget from travis * fix javac * debug * try again * try again --- .travis.yml | 3 ++- build_for_scan.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d0d41c5..c45840a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ services: # reset hard to $TRAVIS_COMMIT install: - . ./ci/git_setup.sh - - wget -nv https://repo1.maven.org/maven2/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar -O ${TRAVIS_BUILD_DIR} + - mkdir ${TRAVIS_BUILD_DIR}/jars + - wget -nv https://repo1.maven.org/maven2/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar -O ${TRAVIS_BUILD_DIR}/jars/osgi.jar before_script: - ./ci/download_cli.sh diff --git a/build_for_scan.sh b/build_for_scan.sh index 424bd822..76f07e69 100755 --- a/build_for_scan.sh +++ b/build_for_scan.sh @@ -1,5 +1,5 @@ -find . -name "org.osgi.core-6.0.0.jar" -javac -cp org.osgi.core-6.0.0.jar incubator/java-openliberty/image/project/util/RangeIncludesVersion.java +find . -name "osgi.jar" +javac -cp jars/osgi.jar incubator/java-openliberty/image/project/util/RangeIncludesVersion.java rm -rf experimental cd incubator rm -rf java-microprofile