try again

intensiongmbh · Mar 19, 2021 · 7124db6 · 7124db6
1 parent f18425f
commit 7124db6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -1,2 +1,2 @@
 FROM busybox
-COPY sendinblue-extension/target/sendinblue.jar /sendinblue/
+COPY ../../sendinblue-bundle/target/sendinblue.ear /sendinblue/
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -18,10 +18,10 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Package maven jar
-        run: mvn clean package -DskipTests -Djar.name=sendinblue
+        run: mvn clean package -DskipTests -DartifactName=sendinblue
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/sendinblue-bundle/pom.xml b/sendinblue-bundle/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>de.intension</groupId>
@@ -7,9 +8,13 @@
   </parent>
   <artifactId>keycloak-sendinblue-bundle</artifactId>
   <packaging>ear</packaging>
-  
+
   <description>Create an EAR to deploy the extension and its dependencies in Keycloak</description>
 
+  <properties>
+    <artifactName>${artifactId}-${keycloak.version}${changelist}</artifactName>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>de.intension</groupId>
@@ -19,6 +24,8 @@
   </dependencies>
 
   <build>
+    <!-- Override this with -Djar.name when building the jar -->
+    <finalName>${artifactName}</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-ear-plugin</artifactId>

diff --git a/sendinblue-extension/pom.xml b/sendinblue-extension/pom.xml
@@ -14,15 +14,6 @@
 
   <name>Keycloak Sendinblue Extension</name>
 
-  <properties>
-    <jar.name>${artifactId}-${keycloak.version}${changelist}</jar.name>
-  </properties>
-
-  <build>
-    <!-- Override this with -Djar.name when building the jar -->
-    <finalName>${jar.name}</finalName>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.keycloak</groupId>