Skip to content

Commit a57bb33

Browse files
cicirellocicirello
authored
Merge pull request #32 from cicirello/development
Preparation for v2.1.0
2 parents 61d2765 + 23f9942 commit a57bb33

File tree

2 files changed

+99
-67
lines changed

2 files changed

+99
-67
lines changed

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,45 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v2
20-
- name: Set up JDK 1.8
21-
uses: actions/setup-java@v1
22-
with:
23-
java-version: 1.8
24-
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
25-
settings-path: ${{ github.workspace }} # location for the settings.xml file
2620

2721
- name: Get the release version
2822
id: get_version
2923
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
3024

25+
- name: Set up JDK 1.8 for deploy to OSSRH
26+
uses: actions/setup-java@v1
27+
with:
28+
java-version: 1.8
29+
server-id: ossrh
30+
server-username: MAVEN_USERNAME
31+
server-password: MAVEN_CENTRAL_TOKEN
32+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
33+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
34+
3135
- name: Build with Maven
32-
run: mvn -B package --file pom.xml -s ${{ github.workspace }}/settings.xml
36+
run: mvn -B package --file pom.xml
37+
38+
- name: Update package version
39+
run: mvn versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}
40+
41+
- name: Publish to Apache Maven Central
42+
run: mvn deploy
3343
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
45+
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
46+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
47+
48+
- name: Set up JDK 1.8 for deploy to github packages
49+
uses: actions/setup-java@v1
50+
with:
51+
java-version: 1.8
52+
server-id: github
3553

3654
- name: Update package version
3755
run: mvn versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}
3856

3957
- name: Publish to GitHub Packages Apache Maven
40-
run: mvn deploy -s ${{ github.workspace }}/settings.xml
58+
run: mvn deploy
4159
env:
4260
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4361

‎pom.xml‎

Lines changed: 72 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,80 @@
66

77
<groupId>org.cicirello</groupId>
88
<artifactId>jpt</artifactId>
9-
<version>2.0.1</version>
9+
<version>2.1.0</version>
1010
<packaging>jar</packaging>
1111

12+
<name>JavaPermutationTools</name>
13+
<description>JavaPermutationTools (JPT) is a library for
14+
computation on permutations and sequences.</description>
15+
<url>https://jpt.cicirello.org/</url>
16+
17+
<licenses>
18+
<license>
19+
<name>GPL-3.0-or-later</name>
20+
<url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
21+
<distribution>repo</distribution>
22+
<comments>
23+
JavaPermutationTools (JPT): A library for computation on permutations and sequences.
24+
Copyright (C) 2005-2020 Vincent A. Cicirello.
25+
26+
JavaPermutationTools is free software: you can redistribute it and/or modify
27+
it under the terms of the GNU General Public License as published by
28+
the Free Software Foundation, either version 3 of the License, or
29+
(at your option) any later version.
30+
31+
JavaPermutationTools is distributed in the hope that it will be useful,
32+
but WITHOUT ANY WARRANTY; without even the implied warranty of
33+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
34+
GNU General Public License for more details.
35+
36+
You should have received a copy of the GNU General Public License
37+
along with this program. If not, see https://www.gnu.org/licenses/.
38+
</comments>
39+
</license>
40+
</licenses>
41+
42+
<developers>
43+
<developer>
44+
<name>Vincent A Cicirello</name>
45+
<email>[email protected]</email>
46+
<url>https://www.cicirello.org/</url>
47+
<organization>Cicirello.Org</organization>
48+
<organizationUrl>https://www.cicirello.org/</organizationUrl>
49+
</developer>
50+
</developers>
51+
52+
<organization>
53+
<name>Cicirello.Org</name>
54+
<url>https://www.cicirello.org/</url>
55+
</organization>
56+
57+
<distributionManagement>
58+
<repository>
59+
<id>ossrh</id>
60+
<name>Central Repository OSSRH</name>
61+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
62+
</repository>
63+
<repository>
64+
<id>github</id>
65+
<name>GitHub cicirello Apache Maven Packages</name>
66+
<url>https://maven.pkg.github.com/cicirello/JavaPermutationTools</url>
67+
</repository>
68+
</distributionManagement>
69+
70+
71+
<issueManagement>
72+
<system>github</system>
73+
<url>https://github.com/cicirello/JavaPermutationTools/issues</url>
74+
</issueManagement>
75+
76+
<scm>
77+
<connection>scm:git:git://github.com/cicirello/JavaPermutationTools.git</connection>
78+
<developerConnection>scm:git:ssh://github.com:cicirello/JavaPermutationTools.git</developerConnection>
79+
<url>http://github.com/cicirello/JavaPermutationTools/tree/master</url>
80+
</scm>
81+
82+
1283
<dependencies>
1384
<dependency>
1485
<groupId>junit</groupId>
@@ -125,61 +196,4 @@
125196
</plugins>
126197
</reporting>
127198

128-
<distributionManagement>
129-
<repository>
130-
<id>github</id>
131-
<name>GitHub cicirello Apache Maven Packages</name>
132-
<url>https://maven.pkg.github.com/cicirello/JavaPermutationTools</url>
133-
</repository>
134-
</distributionManagement>
135-
136-
<name>JavaPermutationTools</name>
137-
<description>JavaPermutationTools (JPT) is a library for
138-
computation on permutations and sequences.</description>
139-
<url>https://jpt.cicirello.org/</url>
140-
141-
<licenses>
142-
<license>
143-
<name>GPL-3.0-or-later</name>
144-
<url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
145-
<distribution>repo</distribution>
146-
<comments>
147-
JavaPermutationTools (JPT): A library for computation on permutations and sequences.
148-
Copyright (C) 2005-2020 Vincent A. Cicirello.
149-
150-
JavaPermutationTools is free software: you can redistribute it and/or modify
151-
it under the terms of the GNU General Public License as published by
152-
the Free Software Foundation, either version 3 of the License, or
153-
(at your option) any later version.
154-
155-
JavaPermutationTools is distributed in the hope that it will be useful,
156-
but WITHOUT ANY WARRANTY; without even the implied warranty of
157-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
158-
GNU General Public License for more details.
159-
160-
You should have received a copy of the GNU General Public License
161-
along with this program. If not, see https://www.gnu.org/licenses/.
162-
</comments>
163-
</license>
164-
</licenses>
165-
166-
<organization>
167-
<name>Cicirello.Org</name>
168-
<url>https://www.cicirello.org/</url>
169-
</organization>
170-
171-
<developers>
172-
<developer>
173-
<name>Vincent A Cicirello</name>
174-
<email>[email protected]</email>
175-
<url>https://www.cicirello.org/</url>
176-
<organization>Cicirello.Org</organization>
177-
<organizationUrl>https://www.cicirello.org/</organizationUrl>
178-
</developer>
179-
</developers>
180-
181-
<issueManagement>
182-
<system>github</system>
183-
<url>https://github.com/cicirello/JavaPermutationTools/issues</url>
184-
</issueManagement>
185199
</project>

0 commit comments

Comments
 (0)