From de5a741be1150f4c452350564ed6f8cc6d02c8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Couralet?= <cedric.couralet@insee.fr>
Date: Mon, 2 Aug 2021 08:30:28 +0200
Subject: [PATCH] Ossrh profile should be explicitly enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes GPG issue building #31

Signed-off-by: Cédric Couralet <cedric.couralet@insee.fr>
---
 .github/workflows/deploy-maven.yml |  7 ++-
 pom.xml                            | 94 +++++++++++++++---------------
 2 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/deploy-maven.yml b/.github/workflows/deploy-maven.yml
index 13b573b..14148ee 100644
--- a/.github/workflows/deploy-maven.yml
+++ b/.github/workflows/deploy-maven.yml
@@ -17,8 +17,8 @@ jobs:
       - id: install-secret-key
         name: Install gpg secret key
         run: |
-         cat <(echo -e "${{ secrets.OSSRH_GPG_KEY }}") | gpg --batch --import
-         gpg --list-secret-keys --keyid-format LONG
+          cat <(echo -e "${{ secrets.OSSRH_GPG_KEY }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
       - id: publish-to-central
         name: Publish to Central Repository
         env:
@@ -30,9 +30,10 @@ jobs:
             --no-transfer-progress \
             --batch-mode \
             -Dgpg.passphrase=${{ secrets.OSSRH_GPG_KEY_PASSWORD }} \
+            -P ossrh \
             clean deploy
       - id: push-new-version
-        name: push new version 
+        name: push new version
         run: |
           git clone https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{github.repository}}.git
           cd keycloak-mail-whitelisting
diff --git a/pom.xml b/pom.xml
index fc624d5..bd413a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,56 +97,56 @@
           </execution>
         </executions>
       </plugin>
-     
+
     </plugins>
   </build>
 
   <profiles>
-		<profile>
-			<id>ossrh</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<gpg.executable>gpg</gpg.executable>
-<!-- 				<gpg.passphrase>${env.GPG_PASSWORD}</gpg.passphrase> -->
-			</properties>
-			<distributionManagement>
-				<snapshotRepository>
-					<id>ossrh</id>
-					<name>Central Repository OSSRH</name>
-					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-				</snapshotRepository>
+    <profile>
+      <id>ossrh</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <gpg.executable>gpg</gpg.executable>
+        <!-- 				<gpg.passphrase>${env.GPG_PASSWORD}</gpg.passphrase> -->
+      </properties>
+      <distributionManagement>
+        <snapshotRepository>
+          <id>ossrh</id>
+          <name>Central Repository OSSRH</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <repository>
-					<id>ossrh</id>
-					<name>Central Repository OSSRH</name>
-					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-				</repository>
-			</distributionManagement>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.0.1</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-						  <gpgArguments>
-						    <arg>--pinentry-mode</arg>
-						    <arg>loopback</arg>
-						  </gpgArguments>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+          <id>ossrh</id>
+          <name>Central Repository OSSRH</name>
+          <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+      </distributionManagement>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <gpgArguments>
+                <arg>--pinentry-mode</arg>
+                <arg>loopback</arg>
+              </gpgArguments>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file