diff --git a/Jenkinsfile b/Jenkinsfile index 92bfa0a305bd009a543b1c44700f0023176adbcc..0d70e51234056eccf70855426460df9dbff312bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -121,7 +121,7 @@ sh 'mkdir -p ./maxmind && ./bin/maxmind.sh $PWD/maxmind' } - sh 'make production-build' + sh 'make compile-java' stash includes: 'target/', name: 'target' stash includes: 'maxmind/**/*', name: 'maxmind' diff --git a/Makefile b/Makefile index cfe3e18ab4d2057009ad0c54f38af6900d573628..0e670e35a16310ae04b2dcdfa3decaec36cd0383 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ SHELL = /bin/bash pre-setup:; @echo "Creating environment file from template" @rm -f .env && envsubst < config/.env.sample > .env - +setup:; + @source .env && bash ./bin/maxmind.sh maxmind/ dev-start:; mvn compile quarkus:dev @@ -16,7 +17,6 @@ generate-spec: validate-spec; install-yarn:; yarn install --frozen-lockfile - @source .env && bash ./bin/maxmind.sh maxmind/ validate-spec: install-yarn; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2c809f44ae0673aef00500d92e21ed7ae7bbea99..6b42e4872fbc2f6cb93890a300984709adab80ed 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,4 +15,8 @@ maxmind.database.city.file=GeoLite2-City.mmdb %dev.quarkus.http.port=8090 -%dev.eclipse.maxmind.root=${PWD}/maxmind \ No newline at end of file +%dev.eclipse.maxmind.root=${PWD}/maxmind + +#eclipse.cve.provider=stubbed +quarkus.oidc.enabled=false +quarkus.keycloak.devservices.enabled=false \ No newline at end of file diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 0343cef9bc406b1bf46aa116de5c0c3b86d40be4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,11 +0,0 @@ - # Configuration file -quarkus.http.port=8080 - -eclipse.maxmind.root=/tmp/maxmind -eclipse.subnet.ipv4.path=${eclipse.maxmind.root}/db/GeoLite2-Country-Blocks-IPv4.csv -eclipse.subnet.ipv6.path=${eclipse.maxmind.root}/db/GeoLite2-Country-Blocks-IPv6.csv -eclipse.subnet.countries.path=${eclipse.maxmind.root}/db/GeoLite2-Country-Locations-en.csv - -maxmind.database.root=${eclipse.maxmind.root}/bin -maxmind.database.country.file=GeoLite2-Country.mmdb -maxmind.database.city.file=GeoLite2-City.mmdb