Docker build

trellis-ldp · Oct 2, 2023 · 55fbaa9 · 55fbaa9
1 parent bc2032f
commit 55fbaa9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -22,10 +22,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <!-- dependencies -->
-    <antlr.version>4.13.1</antlr.version>
-    <caffeine.version>3.1.8</caffeine.version>
     <commons.codec.version>1.16.0</commons.codec.version>
-    <commons.cli.version>1.5.0</commons.cli.version>
     <commons.io.version>2.13.0</commons.io.version>
     <commons.lang3.version>3.12.0</commons.lang3.version>
     <commons.rdf.version>0.5.0</commons.rdf.version>
@@ -46,7 +43,6 @@
     <jdbi.version>3.35.0</jdbi.version>
     <jersey.version>2.32</jersey.version>
     <jena.version>4.9.0</jena.version>
-    <jose4j.version>0.9.3</jose4j.version>
     <mustache.version>0.9.10</mustache.version>
     <smallrye.config.version>2.12.0</smallrye.config.version>
     <smallrye.health.version>3.2.1</smallrye.health.version>
@@ -68,28 +64,22 @@
 
     <!-- testing -->
     <awaitility.version>4.2.0</awaitility.version>
-    <equalsverifier.version>3.15.1</equalsverifier.version>
-    <glassfish.json.version>2.0.1</glassfish.json.version>
     <junit.version>5.10.0</junit.version>
     <hamcrest.version>2.2</hamcrest.version>
     <liquibase.version>4.10.0</liquibase.version>
     <mockito.version>5.5.0</mockito.version>
     <testcontainers.version>1.17.3</testcontainers.version>
     <yasson.version>1.0.8</yasson.version>
     <weld.version>2.0.2.Final</weld.version>
-    <wiremock.version>3.1.0</wiremock.version>
 
     <!-- plugins -->
-    <antrun.plugin.version>3.1.0</antrun.plugin.version>
-    <archetype.plugin.version>3.2.1</archetype.plugin.version>
     <assembly.plugin.version>3.6.0</assembly.plugin.version>
     <checkstyle.plugin.version>3.3.0</checkstyle.plugin.version>
     <clean.plugin.version>3.3.1</clean.plugin.version>
     <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <dependency.plugin.version>3.6.0</dependency.plugin.version>
     <deploy.plugin.version>3.1.1</deploy.plugin.version>
     <enforcer.plugin.version>3.4.1</enforcer.plugin.version>
-    <exec.plugin.version>3.1.0</exec.plugin.version>
     <install.plugin.version>3.1.1</install.plugin.version>
     <gpg.plugin.version>3.1.0</gpg.plugin.version>
     <jacoco.plugin.version>0.8.10</jacoco.plugin.version>
@@ -466,21 +456,11 @@
           <artifactId>maven-clean-plugin</artifactId>
           <version>${clean.plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>${archetype.plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>${deploy.plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>${antrun.plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
@@ -798,13 +778,15 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.antlr</groupId>
-          <artifactId>antlr4-maven-plugin</artifactId>
-          <version>${antlr.version}</version>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-maven-plugin</artifactId>
+          <version>${quarkus.version}</version>
           <executions>
             <execution>
               <goals>
-                <goal>antlr4</goal>
+                <goal>generate-code</goal>
+                <goal>generate-code-tests</goal>
+                <goal>build</goal>
               </goals>
             </execution>
           </executions>

diff --git a/platform/quarkus/pom.xml b/platform/quarkus/pom.xml
@@ -204,6 +204,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/platform/quarkus/src/main/docker/Dockerfile.jvm b/platform/quarkus/src/main/docker/Dockerfile.jvm
@@ -19,10 +19,10 @@ LABEL maintainer="Aaron Coburn <acoburn@apache.org>"
 
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -XX:+ExitOnOutOfMemoryError -Dcom.github.jsonldjava.disallowRemoteContextLoading=true"
 
-COPY build/quarkus-app/lib/ /trellis/lib/
-COPY build/quarkus-app/app/ /trellis/app/
-COPY build/quarkus-app/quarkus/ /trellis/quarkus/
-COPY build/quarkus-app/quarkus-run.jar /trellis/app.jar
+COPY target/quarkus-app/lib/ /trellis/lib/
+COPY target/quarkus-app/app/ /trellis/app/
+COPY target/quarkus-app/quarkus/ /trellis/quarkus/
+COPY target/quarkus-app/quarkus-run.jar /trellis/app.jar
 
 WORKDIR /trellis/