Skip to content

Commit cebd6e4

Browse files
danielkocotdanielkocot
authored
Merge pull request #3 from codecentric/codecentric-refactoring
prepared release 2.1.0-beta3
2 parents 59f2f73 + 882b4ee commit cebd6e4

File tree

4 files changed

+54
-158
lines changed

4 files changed

+54
-158
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ jobs:
1313
uses: actions/setup-java@v1
1414
with:
1515
java-version: 11
16+
server-id: github
17+
server-username: GITHUB_USER_REF
18+
server-password: GITHUB_TOKEN_REF
1619

1720
- name: Build with Maven
1821
run: mvn -B install --no-transfer-progress --file pom.xml
22+
env:
23+
GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }}
24+
GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }}

‎.github/workflows/publish_to_github-packages.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Publish packages to GitHub Packages
2+
on:
3+
release:
4+
types: [created]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-java@v2
11+
with:
12+
java-version: '11'
13+
distribution: 'adopt'
14+
server-id: github
15+
server-username: GITHUB_USER_REF
16+
server-password: GITHUB_TOKEN_REF
17+
- name: Publish package
18+
run: mvn --batch-mode deploy -DskipTests
19+
env:
20+
GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }}
21+
GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }}

‎.github/workflows/release-to-maven-central.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 27 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>de.codecentric.reedelk</groupId>
99
<artifactId>module-parent</artifactId>
10-
<version>2.0.0</version>
10+
<version>2.1.0-beta3</version>
1111
</parent>
1212

1313
<packaging>bundle</packaging>
14-
<version>2.0.0</version>
14+
<version>2.1.0-beta3</version>
1515
<artifactId>module-mail</artifactId>
1616

1717
<properties>
@@ -23,15 +23,32 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<junit.version>5.5.2</junit.version>
2525
<jacoco.version>0.8.2</jacoco.version>
26-
<!-- Maven Central Release tools -->
27-
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
28-
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
29-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
30-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
31-
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
32-
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
3326
</properties>
34-
27+
<pluginRepositories>
28+
<pluginRepository>
29+
<id>github</id>
30+
<name>Reedelk Runtime Packages</name>
31+
<url>https://maven.pkg.github.com/codecentric/reedelk-runtime</url>
32+
<releases><enabled>true</enabled></releases>
33+
<snapshots><enabled>true</enabled></snapshots>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
<repositories>
37+
<repository>
38+
<id>github</id>
39+
<name>Reedelk Runtime Packages</name>
40+
<url>https://maven.pkg.github.com/codecentric/reedelk-runtime</url>
41+
<releases><enabled>true</enabled></releases>
42+
<snapshots><enabled>true</enabled></snapshots>
43+
</repository>
44+
</repositories>
45+
<distributionManagement>
46+
<repository>
47+
<id>github</id>
48+
<name>GitHub Packages</name>
49+
<url>https://maven.pkg.github.com/codecentric/reedelk-module-mail</url>
50+
</repository>
51+
</distributionManagement>
3552
<dependencies>
3653
<dependency>
3754
<groupId>org.apache.commons</groupId>
@@ -133,96 +150,4 @@
133150
</plugin>
134151
</plugins>
135152
</build>
136-
<profiles>
137-
<!-- plugins needed to deploy to Maven Central -->
138-
<profile>
139-
<id>central-deploy</id>
140-
<build>
141-
<plugins>
142-
<plugin>
143-
<artifactId>maven-gpg-plugin</artifactId>
144-
<version>${maven-gpg-plugin.version}</version>
145-
<executions>
146-
<execution>
147-
<id>sign-artifacts</id>
148-
<phase>verify</phase>
149-
<goals>
150-
<goal>sign</goal>
151-
</goals>
152-
<configuration>
153-
<!-- This is necessary for gpg to not try to use the pinentry programs -->
154-
<gpgArguments>
155-
<arg>--pinentry-mode</arg>
156-
<arg>loopback</arg>
157-
</gpgArguments>
158-
</configuration>
159-
</execution>
160-
</executions>
161-
</plugin>
162-
<plugin>
163-
<groupId>org.codehaus.mojo</groupId>
164-
<artifactId>versions-maven-plugin</artifactId>
165-
<version>${versions-maven-plugin.version}</version>
166-
<configuration>
167-
<generateBackupPoms>false</generateBackupPoms>
168-
</configuration>
169-
</plugin>
170-
<plugin>
171-
<artifactId>maven-deploy-plugin</artifactId>
172-
<version>${maven-deploy-plugin.version}</version>
173-
<configuration>
174-
<skip>true</skip>
175-
</configuration>
176-
</plugin>
177-
<plugin>
178-
<groupId>org.apache.maven.plugins</groupId>
179-
<artifactId>maven-source-plugin</artifactId>
180-
<version>${maven-source-plugin.version}</version>
181-
<executions>
182-
<execution>
183-
<id>attach-sources</id>
184-
<goals>
185-
<goal>jar</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
</plugin>
190-
<plugin>
191-
<groupId>org.apache.maven.plugins</groupId>
192-
<artifactId>maven-javadoc-plugin</artifactId>
193-
<version>${maven-javadoc-plugin.version}</version>
194-
<executions>
195-
<execution>
196-
<id>attach-javadocs</id>
197-
<goals>
198-
<goal>jar</goal>
199-
</goals>
200-
</execution>
201-
</executions>
202-
</plugin>
203-
<plugin>
204-
<groupId>org.sonatype.plugins</groupId>
205-
<artifactId>nexus-staging-maven-plugin</artifactId>
206-
<version>${nexus-staging-maven-plugin.version}</version>
207-
<extensions>true</extensions>
208-
<configuration>
209-
<serverId>oss.sonatype.org</serverId>
210-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
211-
<description>${project.version}</description>
212-
</configuration>
213-
<executions>
214-
<execution>
215-
<id>deploy-to-sonatype</id>
216-
<phase>deploy</phase>
217-
<goals>
218-
<goal>deploy</goal>
219-
<goal>release</goal>
220-
</goals>
221-
</execution>
222-
</executions>
223-
</plugin>
224-
</plugins>
225-
</build>
226-
</profile>
227-
</profiles>
228153
</project>

0 commit comments

Comments
 (0)