Skip to content

Commit 644dddc

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 0aed55e + 1a4d974 commit 644dddc

File tree

4 files changed

+285
-12
lines changed

4 files changed

+285
-12
lines changed

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,22 @@ jobs:
121121
git config --global user.name "GitHub Actions"
122122
git pull
123123
124-
- name: Set up JDK OSSRH
124+
- name: Set up JDK
125125
uses: actions/setup-java@v4
126126
with: # running setup-java again overwrites the settings.xml
127127
java-version: '17'
128128
distribution: 'temurin'
129-
server-id: ossrh
129+
server-id: sonatype-central-portal
130130
server-username: MAVEN_CENTRAL_USERNAME
131131
server-password: MAVEN_CENTRAL_TOKEN
132132
gpg-passphrase: MAVEN_GPG_PASSPHRASE
133133
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
134134

135-
- name: Publish to OSSRH
136-
run: ../mvnw -B deploy -Possrh -DskipTests
135+
- name: Publish to Central Portal
136+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
137137
env:
138-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
139-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
138+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
139+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
140140
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
141141
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
142142

‎.github/workflows/test-deploy.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Set up JDK OSSRH
16+
- name: Set up JDK
1717
uses: actions/setup-java@v4
1818
with: # running setup-java again overwrites the settings.xml
1919
distribution: 'temurin'
2020
java-version: '17'
21-
server-id: ossrh
21+
server-id: sonatype-central-portal
2222
server-username: MAVEN_CENTRAL_USERNAME
2323
server-password: MAVEN_CENTRAL_TOKEN
2424
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2525
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2626

27-
- name: Publish to OSSRH
28-
run: ../mvnw -B deploy -Possrh -DskipTests
27+
- name: Publish to Central Portal
28+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
2929
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
3030
env:
31-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
32-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
31+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
32+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
3333
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ hs_err_pid*
7171
.idea/*
7272
!.idea/saveactions_settings.xml
7373
!.idea/checkstyle-idea.xml
74+
!.idea/externalDependencies.xml
7475

7576
!.idea/inspectionProfiles/
7677
.idea/inspectionProfiles/*

‎template-placeholder/pom.xml‎

Lines changed: 272 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,272 @@
1+
<?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">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>software.xdev</groupId>
8+
<artifactId>template-placeholder</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
11+
12+
<name>template-placeholder</name>
13+
<description>template-placeholder</description>
14+
<url>https://github.com/xdev-software/template-placeholder</url>
15+
16+
<scm>
17+
<url>https://github.com/xdev-software/template-placeholder</url>
18+
<connection>scm:git:https://github.com/xdev-software/template-placeholder.git</connection>
19+
</scm>
20+
21+
<inceptionYear>2023</inceptionYear>
22+
23+
<organization>
24+
<name>XDEV Software</name>
25+
<url>https://xdev.software</url>
26+
</organization>
27+
28+
<developers>
29+
<developer>
30+
<name>XDEV Software</name>
31+
<organization>XDEV Software</organization>
32+
<url>https://xdev.software</url>
33+
</developer>
34+
</developers>
35+
36+
<licenses>
37+
<license>
38+
<name>Apache-2.0</name>
39+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
40+
<distribution>repo</distribution>
41+
</license>
42+
</licenses>
43+
44+
<properties>
45+
<javaVersion>17</javaVersion>
46+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
47+
48+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
50+
</properties>
51+
52+
<build>
53+
<pluginManagement>
54+
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-site-plugin</artifactId>
58+
<version>4.0.0-M16</version>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-project-info-reports-plugin</artifactId>
63+
<version>3.9.0</version>
64+
</plugin>
65+
</plugins>
66+
</pluginManagement>
67+
<plugins>
68+
<plugin>
69+
<groupId>com.mycila</groupId>
70+
<artifactId>license-maven-plugin</artifactId>
71+
<version>5.0.0</version>
72+
<configuration>
73+
<properties>
74+
<email>${project.organization.url}</email>
75+
</properties>
76+
<licenseSets>
77+
<licenseSet>
78+
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
79+
<includes>
80+
<include>src/main/java/**</include>
81+
<include>src/test/java/**</include>
82+
</includes>
83+
</licenseSet>
84+
</licenseSets>
85+
</configuration>
86+
<executions>
87+
<execution>
88+
<id>first</id>
89+
<goals>
90+
<goal>format</goal>
91+
</goals>
92+
<phase>process-sources</phase>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-compiler-plugin</artifactId>
100+
<version>3.14.0</version>
101+
<configuration>
102+
<release>${maven.compiler.release}</release>
103+
<compilerArgs>
104+
<arg>-proc:none</arg>
105+
</compilerArgs>
106+
</configuration>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-javadoc-plugin</artifactId>
111+
<version>3.11.2</version>
112+
<executions>
113+
<execution>
114+
<id>attach-javadocs</id>
115+
<phase>package</phase>
116+
<goals>
117+
<goal>jar</goal>
118+
</goals>
119+
</execution>
120+
</executions>
121+
<configuration>
122+
<quiet>true</quiet>
123+
<doclint>none</doclint>
124+
</configuration>
125+
</plugin>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-source-plugin</artifactId>
129+
<version>3.3.1</version>
130+
<executions>
131+
<execution>
132+
<id>attach-sources</id>
133+
<phase>package</phase>
134+
<goals>
135+
<goal>jar-no-fork</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
140+
</plugins>
141+
</build>
142+
<profiles>
143+
<profile>
144+
<id>publish-sonatype-central-portal</id>
145+
<build>
146+
<plugins>
147+
<plugin>
148+
<groupId>org.codehaus.mojo</groupId>
149+
<artifactId>flatten-maven-plugin</artifactId>
150+
<version>1.7.0</version>
151+
<configuration>
152+
<flattenMode>ossrh</flattenMode>
153+
</configuration>
154+
<executions>
155+
<execution>
156+
<id>flatten</id>
157+
<phase>process-resources</phase>
158+
<goals>
159+
<goal>flatten</goal>
160+
</goals>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-gpg-plugin</artifactId>
167+
<version>3.2.7</version>
168+
<executions>
169+
<execution>
170+
<id>sign-artifacts</id>
171+
<phase>verify</phase>
172+
<goals>
173+
<goal>sign</goal>
174+
</goals>
175+
<configuration>
176+
<!-- Fixes "gpg: signing failed: Inappropriate ioctl for device" -->
177+
<!-- Prevent `gpg` from using pinentry programs -->
178+
<gpgArguments>
179+
<arg>--pinentry-mode</arg>
180+
<arg>loopback</arg>
181+
</gpgArguments>
182+
</configuration>
183+
</execution>
184+
</executions>
185+
</plugin>
186+
187+
<plugin>
188+
<groupId>org.sonatype.central</groupId>
189+
<artifactId>central-publishing-maven-plugin</artifactId>
190+
<version>0.7.0</version>
191+
<extensions>true</extensions>
192+
<configuration>
193+
<publishingServerId>sonatype-central-portal</publishingServerId>
194+
<autoPublish>true</autoPublish>
195+
</configuration>
196+
</plugin>
197+
</plugins>
198+
</build>
199+
</profile>
200+
<profile>
201+
<id>checkstyle</id>
202+
<build>
203+
<plugins>
204+
<plugin>
205+
<groupId>org.apache.maven.plugins</groupId>
206+
<artifactId>maven-checkstyle-plugin</artifactId>
207+
<version>3.6.0</version>
208+
<dependencies>
209+
<dependency>
210+
<groupId>com.puppycrawl.tools</groupId>
211+
<artifactId>checkstyle</artifactId>
212+
<version>10.23.1</version>
213+
</dependency>
214+
</dependencies>
215+
<configuration>
216+
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
217+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
218+
</configuration>
219+
<executions>
220+
<execution>
221+
<goals>
222+
<goal>check</goal>
223+
</goals>
224+
</execution>
225+
</executions>
226+
</plugin>
227+
</plugins>
228+
</build>
229+
</profile>
230+
<profile>
231+
<id>pmd</id>
232+
<build>
233+
<plugins>
234+
<plugin>
235+
<groupId>org.apache.maven.plugins</groupId>
236+
<artifactId>maven-pmd-plugin</artifactId>
237+
<version>3.26.0</version>
238+
<configuration>
239+
<includeTests>true</includeTests>
240+
<printFailingErrors>true</printFailingErrors>
241+
<rulesets>
242+
<ruleset>../.config/pmd/ruleset.xml</ruleset>
243+
</rulesets>
244+
</configuration>
245+
<dependencies>
246+
<dependency>
247+
<groupId>net.sourceforge.pmd</groupId>
248+
<artifactId>pmd-core</artifactId>
249+
<version>7.13.0</version>
250+
</dependency>
251+
<dependency>
252+
<groupId>net.sourceforge.pmd</groupId>
253+
<artifactId>pmd-java</artifactId>
254+
<version>7.13.0</version>
255+
</dependency>
256+
</dependencies>
257+
</plugin>
258+
</plugins>
259+
</build>
260+
<reporting>
261+
<plugins>
262+
<!-- Required for reporting -->
263+
<plugin>
264+
<groupId>org.apache.maven.plugins</groupId>
265+
<artifactId>maven-jxr-plugin</artifactId>
266+
<version>3.6.0</version>
267+
</plugin>
268+
</plugins>
269+
</reporting>
270+
</profile>
271+
</profiles>
272+
</project>

0 commit comments

Comments
 (0)