Merge branch 'malowe/master/24' into 'master'

Iss #24 - Fix tests not properly running for GeoIP builds in CI

Closes #24

See merge request !32

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'
             

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;
 

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

src/test/resources/application.properties

- # 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