Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to jib-maven-plugin #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch to jib-maven-plugin #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654c00e
Switch from the unmaintained dockerfile-maven-version to jib-maven-pl…
mneagul Oct 21, 2021
92afa8c
comment out the global default image
mneagul Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<locationtech-jts.version>1.16.0</locationtech-jts.version>
<locationtech-spatial4j.version>0.7</locationtech-spatial4j.version>
<vividsolutions-jts.version>1.13</vividsolutions-jts.version>
<!-- <image>gcr.io/focus-cargo-315523/staccato:${project.version}</image> -->
</properties>

<modules>
Expand Down Expand Up @@ -98,6 +99,19 @@
</dependencies>
</dependencyManagement>

<build>
<!-- Defines plugins that are used in the modules. -->
<pluginManagement>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>3.1.4</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
11 changes: 0 additions & 11 deletions staccato-application/Dockerfile
View file
Open in desktop

This file was deleted.

61 changes: 22 additions & 39 deletions staccato-application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
<artifactId>noggit</artifactId>
<version>0.7</version>
</dependency>
<!--
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>1.0.7</version>
</dependency>
-->
<!--
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>1.0.7</version>
</dependency>
-->
<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -115,7 +115,6 @@
</dependencies>

<build>

<plugins>

<plugin>
Expand All @@ -129,6 +128,21 @@
</configuration>
</plugin>

<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>3.1.4</version>
<configuration>
<containerizingMode>packaged</containerizingMode>
<to>
<image>gcr.io/focus-cargo-315523/staccato:${project.version}</image>
</to>
<from>
<image>amazoncorretto:11.0.7</image>
</from>
</configuration>
</plugin>

<plugin>
<!-- Build an executable JAR -->
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -162,37 +176,6 @@
<executable>true</executable>
</configuration>
</plugin>

<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile-maven-version}</version>
<executions>
<execution>
<id>default</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
<configuration>
<!--<repository>quay.io/boundlessgeo/staccato</repository>-->
<repository>gcr.io/focus-cargo-315523/staccato</repository>
<tag>${project.version}</tag>
<buildArgs>
<JAR_NAME>staccato-${project.version}.jar</JAR_NAME>
</buildArgs>
</configuration>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
Expand Down
15 changes: 14 additions & 1 deletion staccato-collections/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@
<maven.compiler.target>11</maven.compiler.target>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<!-- we don't want jib to execute on this module -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -39,4 +52,4 @@
</dependencies>
</dependencyManagement>

</project>
</project>
14 changes: 13 additions & 1 deletion staccato-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
<groupId>com.planet.staccato</groupId>
<artifactId>staccato-commons</artifactId>

<build>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<!-- we don't want jib to execute on this module -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -51,4 +63,4 @@

</dependencies>

</project>
</project>
15 changes: 14 additions & 1 deletion staccato-community/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,17 @@
<staccato.version>${project.version}</staccato.version>
</properties>

</project>
<build>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<!-- we don't want jib to execute on this module -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
15 changes: 14 additions & 1 deletion staccato-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
<xbib-content-core.version>2.5.2</xbib-content-core.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<!-- we don't want jib to execute on this module -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.planet.staccato</groupId>
Expand Down Expand Up @@ -92,4 +105,4 @@

</dependencies>

</project>
</project>