Fix Job Service shading

Signed-off-by: Benjamin Rögner <benjamin.roegner@here.com>
heremaps · Oct 21, 2024 · a72331a · a72331a
1 parent f6974a4
commit a72331a
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 55 deletions.
diff --git a/Dockerfile-job-service b/Dockerfile-job-service
@@ -13,8 +13,8 @@ ENV LOG_PATH /var/log/xyz
 ENV LOCALSTACK_ENDPOINT http://aws-localstack:4566
 ENV HUB_ENDPOINT http://xyz-hub:8080/hub
 
-COPY xyz-jobs/xyz-job-service/target/xyz-job-service.jar .
+COPY xyz-jobs/xyz-job-service/target/xyz-job-service-fat.jar .
 ADD Dockerfile-job-service /
 
 EXPOSE 7070
-CMD java -jar xyz-job-service.jar
+CMD java -jar xyz-job-service-fat.jar
diff --git a/xyz-jobs/pom.xml b/xyz-jobs/pom.xml
@@ -47,54 +47,6 @@
  </execution>
  </executions>
  </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>**/Log4j2Plugins.dat</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.apache.logging.log4j:log4j-jcl</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>commons-logging:commons-logging</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- </filters>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>com.here.xyz.jobs.service.JobService</mainClass>
- <manifestEntries>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <finalName>${project.artifactId}</finalName>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/xyz-jobs/xyz-job-service/pom.xml b/xyz-jobs/xyz-job-service/pom.xml
@@ -30,6 +30,12 @@
  <artifactId>xyz-job-service</artifactId>
  <packaging>jar</packaging>
 
+ <properties>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
  <dependencies>
  <!-- XYZ libraries -->
  <dependency>
@@ -169,11 +175,58 @@
  </dependency>
  </dependencies>
 
- <properties>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.apache.logging.log4j:log4j-jcl</artifact>
+ <includes>
+ <include>**</include>
+ </includes>
+ </filter>
+ <filter>
+ <artifact>commons-logging:commons-logging</artifact>
+ <includes>
+ <include>**</include>
+ </includes>
+ </filter>
+ </filters>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>com.here.xyz.jobs.service.JobService</mainClass>
+ <manifestEntries>
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ </transformers>
+ <finalName>${project.artifactId}-fat</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
 
  <profiles>
  <profile>