diff --git a/.circleci/config.yml b/.circleci/config.yml index 029515e..e91d8d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,118 +1,100 @@ version: 2 jobs: - lein_tests: - docker: - - image: clojure:lein - version: 2 - steps: - - checkout - - run: - command: | - set -ex - lein test2junit - ls target/test-results - ls target/test-results/html - lein uberjar - buildutils/generate-manifest - - store_artifacts: - path: target/test-results/xml/ - destination: test-results/xml - - store_artifacts: - path: target/uberjar/ - destination: uberjar/ - - store_test_results: - path: target/test-results/xml/ - - persist_to_workspace: - root: . - paths: - - target/uberjar/degasolv-*-standalone.jar - - target/manifest - - script_tests: - docker: - - image: djhaskin987/lein-script-tester:latest - version: 2 - steps: - - checkout - - run: - command: | - test/resources/scripts/test-all - package_ubuntu16: docker: - image: djhaskin987/graal-lein-fpm:ubuntu16 version: 2 steps: - - attach_workspace: - at: /tmp/workspace - checkout - - run: cp -af /tmp/workspace/target ./ - run: - name: "Package debian for Ubuntu 16" - command: buildutils/package deb - no_output_timeout: 30m + name: "Test and build for Ubuntu 16" + command: buildutils/build deb + no_output_timeout: 60m - persist_to_workspace: root: . paths: - target/package/*.deb + - target/exe/* + - target/uberjar/*.jar + - target/manifest + - store_artifacts: + path: target/test-results/xml/ + destination: test-results_u16/xml + - store_artifacts: + path: target/exe/ + destination: exe_u16/ + - store_artifacts: + path: target/uberjar/ + destination: uberjar_u16/ - store_artifacts: path: target/package/ destination: package_u16/ - - store_artifacts: - path: target/graal/ - destination: graal_u16/ + - store_test_results: + path: target/test-results/xml/ package_ubuntu18: docker: - image: djhaskin987/graal-lein-fpm:ubuntu18 version: 2 steps: - - attach_workspace: - at: /tmp/workspace - checkout - - run: cp -af /tmp/workspace/target ./ - run: - name: "Package debian for Ubuntu 18" - command: buildutils/package deb - no_output_timeout: 30m - - run: mv target/package target/package_u18 - - run: mv target/graal target/graal_u18 + name: "Test and build for Ubuntu 18" + command: buildutils/build deb + no_output_timeout: 60m - persist_to_workspace: root: . paths: - - target/package_u18/*.deb + - target/package/*.deb + - target/exe/* + - target/uberjar/*.jar + - target/manifest - store_artifacts: - path: target/package_u18/ - destination: package_u18/ + path: target/test-results/xml/ + destination: test-results_u18/xml - store_artifacts: - path: target/graal_u18/ - destination: graal_u18/ + path: target/exe/ + destination: exe_u18/ + - store_artifacts: + path: target/uberjar/ + destination: uberjar_u18/ + - store_artifacts: + path: target/package/ + destination: package_u18/ + - store_test_results: + path: target/test-results/xml/ package_centos7: docker: - - image: djhaskin987/graal-lein-fpm:centos7 + - image: djhaskin987/graal-lein-fpm:ubuntu18 version: 2 steps: - - attach_workspace: - at: /tmp/workspace - checkout - - run: cp -af /tmp/workspace/target ./ - run: - name: "Package debian for CentOS 7" - command: buildutils/package rpm - no_output_timeout: 30m - - run: mv target/package target/package_c7 - - run: mv target/graal target/graal_c7 + name: "Test and build for CentOS 7" + command: buildutils/build rpm + no_output_timeout: 60m - persist_to_workspace: root: . paths: - - target/package_c7/*.rpm + - target/package/*.rpm + - target/exe/* + - target/uberjar/*.jar + - target/manifest - store_artifacts: - path: target/package_c7/ - destination: package_c7/ + path: target/test-results/xml/ + destination: test-results_c7/xml + - store_artifacts: + path: target/exe/ + destination: exe_c7/ + - store_artifacts: + path: target/uberjar/ + destination: uberjar_c7/ - store_artifacts: - path: target/graal_c7/ - destination: graal_c7/ + path: target/package/ + destination: package_c7/ + - store_test_results: + path: target/test-results/xml/ test_ubuntu16_package: docker: @@ -155,17 +137,9 @@ workflows: version: 2 build_and_test: jobs: - - script_tests - - lein_tests - - package_ubuntu16: - requires: - - lein_tests - - package_ubuntu18: - requires: - - lein_tests - - package_centos7: - requires: - - lein_tests + - package_ubuntu16 + - package_ubuntu18 + - package_centos7 - test_ubuntu16_package: requires: - package_ubuntu16 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 13d5b04..0000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: clojure -lein: lein2 -script: ./build - -jdk: - - oraclejdk8 - - oraclejdk7 - - openjdk7 - - openjdk6 diff --git a/buildutils/build b/buildutils/build new file mode 100755 index 0000000..354620c --- /dev/null +++ b/buildutils/build @@ -0,0 +1,87 @@ +#!/bin/sh +export POSIXLY_CORRECT=1 +set -exou + +type="${1}" +shift + +lein --version +lein test2junit +ls target/test-results +ls target/test-results/html +lein uberjar + +name=$(lein print :name | sed 's|"||g') +version=$(lein print :version | sed 's|"||g') +basic_version=$(echo "${version}" | sed -e 's|-.*$||g') +branch=$(git branch | awk '/^[*] /{print $2}') +builddate=$(date --utc '+%Y%m%d%H%M%S') +git_desc=$(git describe --long --match '[0-9].[0-9].[0-9]') +previous_version=$(echo "${git_desc}" | sed 's|-.*$||g') +iteration="$(echo "${git_desc}" | sed -e 's|^[^-]*-||g' -e 's|-[^-]*$||g')" +hash=$(git rev-parse HEAD) +description=$(lein print :description) +url=$(lein print :url) + +cat > target/manifest << MANIFEST +name=${name} +version=${version} +basic_version=${basic_version} +branch=${branch} +builddate=${builddate} +git_desc=${git_desc} +description=${description} +previous_version=${previous_version} +iteration=${iteration} +hash=${hash} +url=${url} +MANIFEST + +native-image --verbose --enable-url-protocols=http,https -H:+ReportUnsupportedElementsAtRuntime --no-fallback -jar target/uberjar/${name}-${version}-standalone.jar + +mkdir -p target/exe +test/resources/scripts/test-all +ls target/exe +cp ./${name}-${version}-standalone target/exe + +if [ "${type}" = "rpm" ] +then + dep="java-headless" +else + dep="java-runtime" +fi + +mkdir -p pkg/ +mkdir -p pkg/usr/bin/ +mkdir -p pkg/usr/lib/${name}/ +mkdir -p pkg/usr/share/doc/${name}/ + +cat > pkg/usr/share/doc/${name}/manifest.txt << MANIFEST +Name: ${name} +Version: ${basic_version} +Previous Version: ${previous_version} +Iteration: ${iteration} +Git hash: ${hash} +Build date: ${builddate} +MANIFEST + +cp ./${name}-${version}-standalone pkg/usr/bin/${name} + +fpm \ + --verbose \ + --input-type dir \ + --output-type ${type} \ + --name "${name}" \ + --version "${basic_version}" \ + --iteration "${iteration}.djh987" \ + --license "Eclipse Public License" \ + --architecture "all" \ + --depends "${dep}" \ + --maintainer "djhaskin987@gmail.com" \ + --description "${description}" \ + --url "${url}" \ + -C pkg \ + . + +mkdir -p target/package +mv *.${type} target/package diff --git a/docs/3rd-party-licenses.rst b/docs/3rd-party-licenses.rst index 13f8186..4f7c080 100644 --- a/docs/3rd-party-licenses.rst +++ b/docs/3rd-party-licenses.rst @@ -374,12 +374,12 @@ exception as provided by Oracle in the LICENSE file that accompanied this code." the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -Clojure and its Dependencies ----------------------------- +Clojure and Clojure Libraries +----------------------------- -All of Clojure, the language in which Degasolv was written, and its -dependencies essentially use the same license: The Eclipse Public License, -version 1.0 . It is presented below along with the names of the libraries used +All of Clojure, the language in which Degasolv was written, and the clojure +libraries it uses all use the same license: The Eclipse Public License, +version 1.0. It is presented below along with the names of the libraries used in Degasolv. Clojure @@ -399,33 +399,14 @@ Clojure .. _Clojure Programming Language: https://github.com/clojure/clojure/releases/tag/clojure-1.10.1 -spec.alpha -++++++++++ - -+------------------------------+--------------------------------------+ -| Software | `spec.alpha`_ | -+------------------------------+--------------------------------------+ -| Author(s) | Rich Hickey and Contributors | -+------------------------------+--------------------------------------+ -| License type | Eclipse Public License 1.0 | -+------------------------------+--------------------------------------+ -| Version of software | 0.2.176 | -+------------------------------+--------------------------------------+ -| Degasolv version introduced | 1.0.2 | -+------------------------------+--------------------------------------+ - -.. _spec.alpha: https://github.com/clojure/spec.alpha - -Serovers +serovers ++++++++ +------------------------------+--------------------------------------+ -| Software | `Serovers`_ | +| Software | `serovers`_ | +------------------------------+--------------------------------------+ | Author(s) | Daniel Jay Haskin | +------------------------------+--------------------------------------+ -| License type | Eclipse Public License | -+------------------------------+--------------------------------------+ | Version of software | 1.6.2 | +------------------------------+--------------------------------------+ | Degasolv version introduced | 1.8.0 | @@ -442,8 +423,6 @@ tools.cli +------------------------------+--------------------------------------+ | Author(s) | Rich Hickey and contributors | +------------------------------+--------------------------------------+ -| License type | Eclipse Public License 1.0 | -+------------------------------+--------------------------------------+ | Version of software | 0.3.5 | +------------------------------+--------------------------------------+ | Degasolv version introduced | 1.0.2 | @@ -459,8 +438,6 @@ tagged +------------------------------+--------------------------------------+ | Author(s) | Stephen E. Miner | +------------------------------+--------------------------------------+ -| License type | Eclipse Public License | -+------------------------------+--------------------------------------+ | Version of software | 0.5.0 | +------------------------------+--------------------------------------+ | Degasolv version introduced | 1.0.2 | @@ -476,8 +453,6 @@ data.json +------------------------------+--------------------------------------+ | Author(s) | Stuart Sierra | +------------------------------+--------------------------------------+ -| License type | Eclipse Public License 1.0 | -+------------------------------+--------------------------------------+ | Version of software | 0.2.6 | +------------------------------+--------------------------------------+ | Degasolv version introduced | 1.10.0 | @@ -495,8 +470,6 @@ core.match | Author(s) | David Nolen, Ambrose Bonnaire- | | | Sergeant, Rich Hickey & contributors | +------------------------------+--------------------------------------+ -| License type | Eclipse Public License 1.0 | -+------------------------------+--------------------------------------+ | Version of software | 0.3.0-alpha5 | +------------------------------+--------------------------------------+ | Degasolv version introduced | 1.0.2 | diff --git a/project.clj b/project.clj index 4278ec1..472531f 100644 --- a/project.clj +++ b/project.clj @@ -29,14 +29,13 @@ :profiles { :dev { :dependencies [ - [org.clojure/core.match "0.3.0-alpha5"] - [org.clojure/clojure "1.9.0-alpha14"] - [serovers "1.6.2"] - [org.clojure/tools.cli "0.3.5"] [com.velisco/tagged "0.5.0"] - [org.clojure/data.json "0.2.6"] + [org.clojure/clojure "1.10.1"] + [org.clojure/tools.cli "0.3.5"] + [serovers "1.6.2"] + [org.clojure/core.match "0.3.0-alpha5"] ] - :plugins [[test2junit "1.3.3"]] + :plugins [[test2junit "1.4.2"]] :test2junit-output-dir "target/test-results" } :uberjar {:aot [ diff --git a/test/resources/scripts/test-all b/test/resources/scripts/test-all index 7a63fc7..dd013ba 100755 --- a/test/resources/scripts/test-all +++ b/test/resources/scripts/test-all @@ -9,8 +9,6 @@ fi root_path=${PWD} test_home=test/resources/data/grill -lein uberjar - # Script tests for i in test/resources/scripts/test-* do diff --git a/test/resources/scripts/test-apt b/test/resources/scripts/test-apt index 266a4aa..75ff778 100755 --- a/test/resources/scripts/test-apt +++ b/test/resources/scripts/test-apt @@ -17,42 +17,37 @@ try_time() { } } -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ query-repo \ --repository "binary-amd64 file://${PWD}/${test_home}/avail /" \ --package-system apt \ --query "libc6" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --resolve-strat "fast" \ --repository "binary-amd64 file://${PWD}/${test_home}/avail /" \ --package-system apt \ --requirement "libc6" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --repository "binary-amd64 file://${PWD}/${test_home}/avail /" \ --package-system apt \ --requirement "libc6" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --repository "binary-amd64 file://${PWD}/${test_home}/avail /" \ --package-system apt \ --requirement "bash" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --resolve-strat fast \ --disable-alternatives \ @@ -65,9 +60,8 @@ try_time java \ --resolve-strat fast \ --requirement "firefox" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --repository "binary-i386 file://${PWD}/${test_home}/i386 /" \ --repository "binary-amd64 file://${PWD}/${test_home}/amd64 /" \ @@ -77,9 +71,8 @@ try_time java \ --present-package "libpng12-0==1.2.13-4" \ --requirement "firefox" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --disable-alternatives \ --resolve-strat fast \ @@ -91,9 +84,8 @@ try_time java \ --present-package "libpng12-0==1.2.13-4" \ --requirement "ubuntu-desktop" -try_time java \ - -Xss16m \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +try_time + target/exe/${name}-${version}-standalone \ resolve-locations \ --repository "binary-i386 file://${PWD}/${test_home}/i386 /" \ --repository "binary-amd64 file://${PWD}/${test_home}/amd64 /" \ diff --git a/test/resources/scripts/test-json-config b/test/resources/scripts/test-json-config index 426e429..a856277 100755 --- a/test/resources/scripts/test-json-config +++ b/test/resources/scripts/test-json-config @@ -27,5 +27,5 @@ cat > "degasolv.json" << JSON } JSON -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ -j "degasolv.json" display-config diff --git a/test/resources/scripts/test-list-strat b/test/resources/scripts/test-list-strat index bf3ca9b..ea0a66e 100755 --- a/test/resources/scripts/test-list-strat +++ b/test/resources/scripts/test-list-strat @@ -20,7 +20,7 @@ cd "${test_home}" # First, generate *most* of the needed cards for the tests to pass. -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0" \ @@ -29,7 +29,7 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "c" \ -C $PWD/a-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "b" \ -v "1.0.0" \ @@ -38,7 +38,7 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "e" \ -C $PWD/b-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "e" \ -v "1.0.0" \ @@ -46,7 +46,7 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "a" \ -C $PWD/e-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "x" \ -v "1.0.0" \ @@ -55,35 +55,35 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "y" \ -C $PWD/x-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "y" \ -v "1.0.0" \ -l "https://example.com/repo/y-1.0.0.zip" \ -C $PWD/y-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "z" \ -v "1.0.0" \ -l "https://example.com/repo/z-1.0.0.zip" \ -C $PWD/z-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "c" \ -v "1.0.0" \ -l "https://example.com/repo/c-1.0.0.zip" \ -C $PWD/c-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "d" \ -v "1.0.0" \ -l "https://example.com/repo/d-1.0.0.zip" \ -C $PWD/d-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-repo-index \ -d $PWD \ -I $PWD/index.dsrepo @@ -101,7 +101,7 @@ EOF ) -actual=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +actual=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ -L eager \ @@ -138,7 +138,7 @@ b==1.0.0 @ https://example.com/repo/b-1.0.0.zip EOF ) -actual=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +actual=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ -L lazy \ diff --git a/test/resources/scripts/test-meta b/test/resources/scripts/test-meta index d92703d..844dece 100755 --- a/test/resources/scripts/test-meta +++ b/test/resources/scripts/test-meta @@ -6,6 +6,7 @@ then echo "This script must be run from the root of the project." fi +root_path=${PWD} test_home=test/resources/data/meta rm -rf ${test_home} mkdir -p ${test_home} @@ -13,8 +14,7 @@ mkdir -p ${test_home} name=$(lein print :name | sed 's|"||g') version=$(lein print :version | sed 's|"||g') -java \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ --card-file ${test_home}/out.dscard \ --id yer \ @@ -40,8 +40,7 @@ cat > ${test_home}/degasolv.edn <<EOF } EOF -java \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ -c ${test_home}/degasolv.edn \ generate-card @@ -54,8 +53,7 @@ then exit 1 fi -java \ - -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ --card-file ${test_home}/out3.dscard \ --id yer \ diff --git a/test/resources/scripts/test-option-packs b/test/resources/scripts/test-option-packs index 54e6968..a8b1418 100755 --- a/test/resources/scripts/test-option-packs +++ b/test/resources/scripts/test-option-packs @@ -17,16 +17,16 @@ cat > ${test_home}/test-option-packs.edn <<EDN } EDN -java -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ -c ${test_home}/test-option-packs.edn \ display-config | grep -E ':conflict-strat "prioritized"' -java -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ -k "multi-version-mode" \ display-config | grep -E ':conflict-strat "inclusive"' -java -jar target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ -c ${test_home}/test-option-packs.edn \ -k "multi-version-mode" \ display-config | grep -E ':conflict-strat "inclusive"' diff --git a/test/resources/scripts/test-output-format b/test/resources/scripts/test-output-format index b54becf..e0498d6 100755 --- a/test/resources/scripts/test-output-format +++ b/test/resources/scripts/test-output-format @@ -20,7 +20,7 @@ cd "${test_home}" # First, generate the needed cards for resolution. -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0" \ @@ -28,22 +28,22 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -l "https://example.com/repo/a-1.0.0.zip" \ -C $PWD/a-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "b" \ -v "2.3.0" \ -l "https://example.com/repo/b-2.3.0.zip" \ -C $PWD/b-2.3.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar generate-repo-index -d $PWD -I $PWD/index.dsrepo +${root_path}/target/exe/${name}-${version}-standalone generate-repo-index -d $PWD -I $PWD/index.dsrepo -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --output-format json \ --requirement "a<=1.0.0" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --output-format json \ @@ -52,7 +52,7 @@ then exit 1 fi -if ! java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ! ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --enable-error-format \ @@ -63,13 +63,13 @@ then fi -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --output-format edn \ -R ${PWD}/index.dsrepo \ --requirement "a<=1.0.0" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --output-format edn \ -R ${PWD}/index.dsrepo \ @@ -78,7 +78,7 @@ then exit 1 fi -if ! java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ! ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --enable-error-format \ --output-format edn \ @@ -88,12 +88,12 @@ then exit 1 fi -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --requirement "a<=1.0.0" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --requirement "z<=1.0.0" diff --git a/test/resources/scripts/test-query-output-format b/test/resources/scripts/test-query-output-format index 3b7f611..124cd8b 100755 --- a/test/resources/scripts/test-query-output-format +++ b/test/resources/scripts/test-query-output-format @@ -20,7 +20,7 @@ cd "${test_home}" # First, generate the needed cards for resolution. -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0" \ @@ -28,25 +28,25 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -l "https://example.com/repo/a-1.0.0.zip" \ -C $PWD/a-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.1" \ -l "https://example.com/repo/a-1.0.1.zip" \ -C $PWD/a-1.0.1.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-repo-index \ -d $PWD \ -I $PWD/index.dsrepo -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --output-format json \ --query "a" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --output-format json \ @@ -55,7 +55,7 @@ then exit 1 fi -if ! java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ! ${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --enable-error-format \ @@ -65,13 +65,13 @@ then exit 1 fi -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --output-format edn \ --query "a" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --output-format edn \ @@ -81,7 +81,7 @@ then fi -if ! java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ! ${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --output-format edn \ @@ -91,12 +91,12 @@ then exit 1 fi -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --query "a" -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ query-repo \ -R ${PWD}/index.dsrepo \ --query "a>2.0" diff --git a/test/resources/scripts/test-search-strat b/test/resources/scripts/test-search-strat index 5099d21..f2801e8 100755 --- a/test/resources/scripts/test-search-strat +++ b/test/resources/scripts/test-search-strat @@ -20,7 +20,7 @@ cd "${test_home}" # First, generate *most* of the needed cards for the tests to pass. -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0" \ @@ -29,7 +29,7 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "c|d" \ -C $PWD/a-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "b" \ -v "1.0.0" \ @@ -37,27 +37,27 @@ java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ -r "d|c" \ -C $PWD/b-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "c" \ -v "1.0.0" \ -l "https://example.com/repo/c-1.0.0.zip" \ -C $PWD/c-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "d" \ -v "1.0.0" \ -l "https://example.com/repo/d-1.0.0.zip" \ -C $PWD/d-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-repo-index \ -d $PWD \ -I $PWD/index.dsrepo # should fail -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --search-strat deapth-first \ -R ${PWD}/index.dsrepo \ @@ -66,20 +66,20 @@ then exit 1 fi -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --search-strat depth-first \ -R ${PWD}/index.dsrepo \ --requirement a -output1=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output1=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --requirement a) printf '%s\n' "${output1}" -output2=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output2=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ --search-strat breadth-first \ -R ${PWD}/index.dsrepo \ diff --git a/test/resources/scripts/test-subproc b/test/resources/scripts/test-subproc index 40ee4f2..b6aa387 100755 --- a/test/resources/scripts/test-subproc +++ b/test/resources/scripts/test-subproc @@ -33,7 +33,7 @@ set +x echo "Basic JSON test..." set -x -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -x "test/resources/scripts/subproc" \ -t subproc \ @@ -45,7 +45,7 @@ set +x echo "Basic EDN test..." set -x -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -t subproc \ -r "a>=2.0.0" \ @@ -57,7 +57,7 @@ set +x echo "Basic bad-exit test..." set -x -if java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +if ${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -t subproc \ -r "a>=2.0.0" \ diff --git a/test/resources/scripts/test-version-comparison b/test/resources/scripts/test-version-comparison index 392cb4c..1d4fa64 100755 --- a/test/resources/scripts/test-version-comparison +++ b/test/resources/scripts/test-version-comparison @@ -20,26 +20,26 @@ cd "${test_home}" # First, generate *most* of the needed cards for the tests to pass. -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0" \ -l "https://example.com/repo/a-1.0.0.zip" \ -C $PWD/a-1.0.0.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-card \ -i "a" \ -v "1.0.0-1" \ -l "https://example.com/repo/a-1.0.0-1.zip" \ -C $PWD/a-1.0.0-1.zip.dscard -java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +${root_path}/target/exe/${name}-${version}-standalone \ generate-repo-index \ -d $PWD \ -I $PWD/index.dsrepo -output=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ -V maven \ @@ -49,7 +49,7 @@ printf '%s\n' "${output}" echo "${output}" | grep -qE '==1\.0\.0-1 @' -output=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ -V maven \ @@ -59,7 +59,7 @@ printf '%s\n' "${output}" echo "${output}" | grep -qE '==1\.0\.0 @' -output=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ -V semver \ @@ -69,7 +69,7 @@ printf '%s\n' "${output}" echo "${output}" | grep -qE '==1\.0\.0-1 @' -output=$(java -jar ${root_path}/target/uberjar/${name}-${version}-standalone.jar \ +output=$(${root_path}/target/exe/${name}-${version}-standalone \ resolve-locations \ -R ${PWD}/index.dsrepo \ --requirement "a>1.0.0-1")