Skip to content

Commit

Permalink
Merge pull request #338 from groldan/build/geoserver_submodule_profil…
Browse files Browse the repository at this point in the history
…e_disabled_by_default

build: disable the geoserver submodule maven profile by default
  • Loading branch information
groldan committed Jun 22, 2023
2 parents 57b6067 + e18fec9 commit 6a62779
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
20 changes: 8 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,37 @@ all: deps install test build-image
SKIP_PUSH?="true"

lint:
./mvnw -P-geoserver sortpom:verify fmt:check -ntp
./mvnw sortpom:verify fmt:check -ntp

format:
./mvnw -P-geoserver sortpom:sort fmt:format -ntp
./mvnw sortpom:sort fmt:format -ntp

deps:
./mvnw -U -f geoserver_submodule/ clean install -DskipTests -ntp -T4

install:
./mvnw clean install -P-geoserver -DskipTests -ntp -T4 -U
./mvnw clean install -DskipTests -ntp -T4 -U

test:
./mvnw verify -P-geoserver -ntp -T4
./mvnw verify -ntp -T4

build-image: build-image-infrastructure build-image-geoserver

build-image-openj9: build-image-infrastructure-openj9 build-image-geoserver-openj9

build-image-infrastructure:
./mvnw clean package -f src/apps/infrastructure \
-Ddocker -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
-Ddocker -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

build-image-infrastructure-openj9:
./mvnw clean package -f src/apps/infrastructure \
-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
-Dopenj9 -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

build-image-geoserver:
./mvnw clean package -f src/apps/geoserver \
-Ddocker -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
-Ddocker -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

build-image-geoserver-openj9:
./mvnw clean package -f src/apps/geoserver \
-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

build-config-native-image:
./mvnw -pl :gs-cloud-config-service install -am -Dfmt.action=check -ntp -P-geoserver
./mvnw -pl :gs-cloud-config-service spring-boot:build-image -Pnative,-geoserver -ntp -DskipTests -Dfmt.skip
-Dopenj9 -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
<profile>
<id>geoserver</id>
<activation>
<activeByDefault>true</activeByDefault>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>geoserver_submodule</module>
Expand Down

0 comments on commit 6a62779

Please sign in to comment.