Skip to content

Commit a6cf5c2

Browse files
eneumanneneumann
authored
Merge branch 'develop' into EN_#4386_fix-simple-name-collisions
2 parents 0657473 + 58c0e96 commit a6cf5c2

File tree

7 files changed

+51
-23
lines changed

7 files changed

+51
-23
lines changed

‎.github/workflows/maven-publish.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: ${{ github.ref == 'refs/heads/develop' }}
1717
environment: dev
1818
permissions:
19-
contents: read
19+
contents: write
2020
packages: write
2121

2222
steps:
@@ -39,7 +39,7 @@ jobs:
3939
# Install gpg secret key
4040
cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import
4141
# Verify gpg secret key
42-
gpg --list-secret-keys --keyid-format LONG
42+
gpg --list-secret-keys --keyid-format=long || echo "❌ No secret keys found"
4343
4444
- id: ssh-setup
4545
name: Set SSH key
@@ -81,21 +81,26 @@ jobs:
8181
if: ${{ github.ref == 'refs/heads/main' }}
8282
environment: dev
8383
permissions:
84-
contents: read
84+
contents: write
8585
packages: write
8686

8787
steps:
8888
- id: checkout
8989
name: Checkout
9090
uses: actions/checkout@v4
91+
with:
92+
ref: main
93+
fetch-depth: 0 # Required for Maven Release Plugin
94+
persist-credentials: false
9195

9296
- id: gpg-install
9397
name: Install gpg secret key
9498
run: |
9599
# Install gpg secret key
96100
cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import
97101
# Verify gpg secret key
98-
gpg --list-secret-keys --keyid-format LONG
102+
gpg --list-secret-keys --keyid-format=long || echo "❌ No secret keys found"
103+
echo "Installed gpg secret key"
99104
100105
- id: ssh-setup
101106
name: Set SSH key
@@ -131,7 +136,8 @@ jobs:
131136

132137
- id: release
133138
name: Release to production
134-
run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DpreparationGoals=install
139+
run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -DpreparationGoals=install
140+
# run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install
135141

136142
- id: rollback
137143
name: Rollback

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Java Client Library
22

3-
* Latest released version 0.15.3
4-
* Latest snapshot version 0.15.4-SNAPSHOT
3+
* Latest released version 0.15.4
4+
* Latest snapshot version 0.15.5-SNAPSHOT
55

66
## Introduction
77
This is the PolyAPI Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha).

‎commons/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.polyapi</groupId>
66
<artifactId>parent-pom</artifactId>
7-
<version>0.15.4-SNAPSHOT</version>
7+
<version>0.15.5-SNAPSHOT</version>
88
<relativePath>../parent-pom</relativePath>
99
</parent>
1010

@@ -154,6 +154,12 @@
154154
</goals>
155155
</execution>
156156
</executions>
157+
<configuration>
158+
<gpgArguments>
159+
<arg>--pinentry-mode</arg>
160+
<arg>loopback</arg>
161+
</gpgArguments>
162+
</configuration>
157163
</plugin>
158164
<plugin>
159165
<groupId>org.sonatype.central</groupId>

‎library/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.polyapi</groupId>
66
<artifactId>parent-pom</artifactId>
7-
<version>0.15.4-SNAPSHOT</version>
7+
<version>0.15.5-SNAPSHOT</version>
88
<relativePath>../parent-pom</relativePath>
99
</parent>
1010
<artifactId>library</artifactId>
@@ -104,6 +104,12 @@
104104
</goals>
105105
</execution>
106106
</executions>
107+
<configuration>
108+
<gpgArguments>
109+
<arg>--pinentry-mode</arg>
110+
<arg>loopback</arg>
111+
</gpgArguments>
112+
</configuration>
107113
</plugin>
108114
<plugin>
109115
<groupId>org.sonatype.central</groupId>

‎parent-pom/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64
<groupId>io.polyapi</groupId>
75
<artifactId>parent-pom</artifactId>
8-
<version>0.15.4-SNAPSHOT</version>
6+
<version>0.15.5-SNAPSHOT</version>
97
<packaging>pom</packaging>
108
<name>PolyAPI Java parent POM</name>
119
<url>https://polyapi.io</url>
@@ -130,6 +128,12 @@
130128
</goals>
131129
</execution>
132130
</executions>
131+
<configuration>
132+
<gpgArguments>
133+
<arg>--pinentry-mode</arg>
134+
<arg>loopback</arg>
135+
</gpgArguments>
136+
</configuration>
133137
</plugin>
134138
<plugin>
135139
<groupId>org.sonatype.central</groupId>

‎polyapi-maven-plugin/pom.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43
<modelVersion>4.0.0</modelVersion>
54
<parent>
65
<groupId>io.polyapi</groupId>
76
<artifactId>parent-pom</artifactId>
8-
<version>0.15.4-SNAPSHOT</version>
7+
<version>0.15.5-SNAPSHOT</version>
98
<relativePath>../parent-pom</relativePath>
109
</parent>
1110
<artifactId>polyapi-maven-plugin</artifactId>
@@ -127,9 +126,6 @@
127126
<activation>
128127
<activeByDefault>false</activeByDefault>
129128
</activation>
130-
<properties>
131-
<keyEnvName>MAVEN_GPG_KEY</keyEnvName>
132-
</properties>
133129
<build>
134130
<plugins>
135131
<plugin>
@@ -145,6 +141,12 @@
145141
</goals>
146142
</execution>
147143
</executions>
144+
<configuration>
145+
<gpgArguments>
146+
<arg>--pinentry-mode</arg>
147+
<arg>loopback</arg>
148+
</gpgArguments>
149+
</configuration>
148150
</plugin>
149151
<plugin>
150152
<groupId>org.sonatype.central</groupId>

‎pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53

64
<modelVersion>4.0.0</modelVersion>
75
<groupId>io.polyapi</groupId>
86
<artifactId>polyapi-java</artifactId>
9-
<version>0.15.4-SNAPSHOT</version>
7+
<version>0.15.5-SNAPSHOT</version>
108
<packaging>pom</packaging>
119
<modules>
1210
<module>parent-pom</module>
@@ -193,6 +191,12 @@
193191
</goals>
194192
</execution>
195193
</executions>
194+
<configuration>
195+
<gpgArguments>
196+
<arg>--pinentry-mode</arg>
197+
<arg>loopback</arg>
198+
</gpgArguments>
199+
</configuration>
196200
</plugin>
197201
<plugin>
198202
<groupId>org.sonatype.central</groupId>

0 commit comments

Comments
 (0)