From 63df49341dbfcfcd61f649f16ad0f8a76bac6b5b Mon Sep 17 00:00:00 2001 From: David Cohen Date: Wed, 28 Apr 2021 16:44:58 -0400 Subject: [PATCH] Latest dave (#894) * 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 * by george I think I-ve got it --- .travis.yml | 2 -- build_for_scan.sh | 4 +--- pom.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pom.xml diff --git a/.travis.yml b/.travis.yml index c45840a89..6f9d74fa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ services: # reset hard to $TRAVIS_COMMIT install: - . ./ci/git_setup.sh - - 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 76f07e696..1cb3b8d49 100755 --- a/build_for_scan.sh +++ b/build_for_scan.sh @@ -1,6 +1,4 @@ -find . -name "osgi.jar" -javac -cp jars/osgi.jar incubator/java-openliberty/image/project/util/RangeIncludesVersion.java -rm -rf experimental +mvn compile cd incubator rm -rf java-microprofile rm -rf java-spring-boot2 diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..a3a38b277 --- /dev/null +++ b/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + + stacks.app + stacks-app + 1.0-SNAPSHOT + + + 1.7 + 1.7 + incubator/java-openliberty/image/project/util + + + ${src.dir} + + + + + + + org.osgi + org.osgi.core + 6.0.0 + provided + + +