From 841b1c41604be7e26c5683ef94993c2d4655152d Mon Sep 17 00:00:00 2001
From: Lindvar Lagran <llag@equinor.com>
Date: Tue, 23 Jul 2024 07:44:47 +0200
Subject: [PATCH] jar

---
 .DS_Store                               | Bin 6148 -> 0 bytes
 .github/workflows/maven-make-docker.yml |   2 +-
 .github/workflows/target_workflow.yml   |  25 --------
 das-producer/Dockerfile                 |   2 +-
 das-producer/pom.xml                    |  81 +++---------------------
 5 files changed, 12 insertions(+), 98 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 .github/workflows/target_workflow.yml

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 6e801b8bbfd47eaea801078f564bfb3c7b3a5299..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyG{c^3>-s>NKmAt+#jIe4^~n5g8Tr8AR3gQLrHxV-^HgfehBGwp`f5aW67Rf
zuV+s;#rX`t*2mo)umZ58JL1E`-2B{qW*3z)BAs`<VZZ@99Pu=(KA&*zH5re1$L)mw
zjN!B$_OFNiOWuF}0%fIu6p#W^Knh5KUn$_dm$tl0RFnczKni>-;NOQvckG2@VthIn
zVgw*Am=5DQW(i{R1hE&6iOkR}sl=pOjTn}6=3CYE!Z9)Fuo^zBo@_OtSUjEgw<w48
zL`5ke1*QsI=62=%|DOKC{68gWCk3Ryzf!;!o9$-JSE}ARdpYm5js8IQnoqhL*Fj;3
lc1(<R%#F9>n<&b<=4+n!!Z9)E%m<yQp8?lJCI$XlfiI=77D@mB

diff --git a/.github/workflows/maven-make-docker.yml b/.github/workflows/maven-make-docker.yml
index 9abe115..c1b539e 100644
--- a/.github/workflows/maven-make-docker.yml
+++ b/.github/workflows/maven-make-docker.yml
@@ -48,7 +48,7 @@ jobs:
             }]
 
       - name: Build, test and package
-        run: ./mvnw -B clean test jar:jar
+        run: ./mvnw -B clean package
       
       - uses: docker/setup-buildx-action@v3.3.0
         id: buildx
diff --git a/.github/workflows/target_workflow.yml b/.github/workflows/target_workflow.yml
deleted file mode 100644
index b7d30ba..0000000
--- a/.github/workflows/target_workflow.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: My Target Workflow
-
-on:
-  workflow_dispatch:
-    inputs:
-      name:
-        description: 'name'
-        required: true
-        type: string
-      home:
-        description: 'home'
-        required: true
-        type: string
-    
-jobs:
-  log-the-inputs:
-    runs-on: ubuntu-latest
-    steps:
-      - run: |
-          echo "Name: $NAME"
-          echo "hoem: $HOME"
-        env:
-          NAME: ${{ inputs.name }}
-          HOME: ${{ inputs.home }}
-  
diff --git a/das-producer/Dockerfile b/das-producer/Dockerfile
index 152cd20..80ea34d 100644
--- a/das-producer/Dockerfile
+++ b/das-producer/Dockerfile
@@ -9,7 +9,7 @@ RUN useradd -u 1000 ingressuser
 WORKDIR /opt
 USER ingressuser
 
-ENV JAR_FILE=das-producer/target/app.jar
+ENV JAR_FILE=das-producer/target/*.jar
 COPY ${JAR_FILE} /opt/app.jar
 
 ENTRYPOINT ["java", "-XshowSettings:vm", "-XX:+PrintFlagsFinal", "-XX:MaxRAMPercentage=70", "-Djava.security.egd=file:/dev/./urandom", "-Djava.awt.headless=true", "-jar", "/opt/app.jar"]
diff --git a/das-producer/pom.xml b/das-producer/pom.xml
index e8f2751..fa4da01 100644
--- a/das-producer/pom.xml
+++ b/das-producer/pom.xml
@@ -111,13 +111,17 @@
 
   <build>
     <plugins>
+
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <finalName>app</finalName>
-        </configuration>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -151,71 +155,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>io.fabric8</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>0.44.0</version>
-        <configuration>
-          <verbose>true</verbose>
-          <images>
-            <image>
-              <name>fibra/${project.artifactId}</name>
-              <build>
-                <buildx>
-                  <platforms>
-                    <platform>linux/amd64</platform>
-                    <platform>linux/arm64</platform>
-                  </platforms>
-                </buildx>
-                <dockerFileDir>${project.basedir}</dockerFileDir>
-                <args>
-                  <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                </args>
-                <tags>
-                  <tag>latest</tag>
-                  <tag>${project.version}</tag>
-                </tags>
-              </build>
-            </image>
-          </images>
-        </configuration>
-        <executions>
-          <execution>
-            <id>default</id>
-            <phase>package</phase>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!--plugin>
-        <groupId>com.spotify</groupId>
-        <artifactId>dockerfile-maven-plugin</artifactId>
-        <version>1.4.13</version>
-        <executions>
-          <execution>
-            <id>default</id>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <repository>fibra/${project.artifactId}</repository>
-          <tag>${project.version}</tag>
-          <buildArgs>
-            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-          </buildArgs>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <version>1.2.0</version>
-          </dependency>
-        </dependencies>
-      </plugin-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>