Skip to content

Commit 609f97f

Browse files
Merge pull request #17 from mike-d-davydov/fix/release-deployment-and-javadoc
fix: release deployment and javadoc warnings
2 parents 083538f + d384f90 commit 609f97f

File tree

5 files changed

+55
-43
lines changed

5 files changed

+55
-43
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -61,46 +61,19 @@ jobs:
6161
echo "EOF" >> $GITHUB_OUTPUT
6262
6363
- name: Create GitHub Release
64-
uses: actions/create-release@v1
65-
id: create_release
66-
env:
67-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
uses: softprops/action-gh-release@v1
6865
with:
69-
tag_name: ${{ github.ref }}
70-
release_name: JPWise v${{ steps.extract_version.outputs.VERSION }}
66+
tag_name: v${{ steps.extract_version.outputs.VERSION }}
67+
name: JPWise v${{ steps.extract_version.outputs.VERSION }}
7168
body: ${{ steps.release_notes.outputs.RELEASE_NOTES }}
7269
draft: false
7370
prerelease: false
74-
75-
- name: Upload JAR to release
76-
uses: actions/upload-release-asset@v1
77-
env:
78-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
79-
with:
80-
upload_url: ${{ steps.create_release.outputs.upload_url }}
81-
asset_path: target/jpwise-${{ steps.extract_version.outputs.VERSION }}.jar
82-
asset_name: jpwise-${{ steps.extract_version.outputs.VERSION }}.jar
83-
asset_content_type: application/java-archive
84-
85-
- name: Upload Sources JAR to release
86-
uses: actions/upload-release-asset@v1
87-
env:
88-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
89-
with:
90-
upload_url: ${{ steps.create_release.outputs.upload_url }}
91-
asset_path: target/jpwise-${{ steps.extract_version.outputs.VERSION }}-sources.jar
92-
asset_name: jpwise-${{ steps.extract_version.outputs.VERSION }}-sources.jar
93-
asset_content_type: application/java-archive
94-
95-
- name: Upload JavaDoc JAR to release
96-
uses: actions/upload-release-asset@v1
71+
files: |
72+
target/jpwise-${{ steps.extract_version.outputs.VERSION }}.jar
73+
target/jpwise-${{ steps.extract_version.outputs.VERSION }}-sources.jar
74+
target/jpwise-${{ steps.extract_version.outputs.VERSION }}-javadoc.jar
9775
env:
9876
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99-
with:
100-
upload_url: ${{ steps.create_release.outputs.upload_url }}
101-
asset_path: target/jpwise-${{ steps.extract_version.outputs.VERSION }}-javadoc.jar
102-
asset_name: jpwise-${{ steps.extract_version.outputs.VERSION }}-javadoc.jar
103-
asset_content_type: application/java-archive
10477

10578
publish:
10679
name: Publish to GitHub Packages
@@ -116,6 +89,16 @@ jobs:
11689
with:
11790
java-version: 11
11891
distribution: 'temurin'
92+
server-id: github
93+
server-username: GITHUB_ACTOR
94+
server-password: GITHUB_TOKEN
95+
96+
- name: Cache Maven dependencies
97+
uses: actions/cache@v4
98+
with:
99+
path: ~/.m2
100+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
101+
restore-keys: ${{ runner.os }}-m2
119102

120103
- name: Extract version from tag
121104
id: extract_version
@@ -124,7 +107,10 @@ jobs:
124107
- name: Update version in pom.xml
125108
run: mvn versions:set -DnewVersion=${{ steps.extract_version.outputs.VERSION }}
126109

110+
- name: Build and test
111+
run: mvn clean compile test
112+
127113
- name: Publish to GitHub Packages
128-
run: mvn deploy
114+
run: mvn deploy -DskipTests
129115
env:
130116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@
77
<groupId>io.github.mikeddavydov</groupId>
88
<artifactId>jpwise</artifactId>
99
<version>1.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
11+
12+
<name>JPWise</name>
13+
<description>Java Pairwise Testing Framework - A powerful library for generating pairwise test combinations with support for complex parameter relationships and compatibility rules</description>
14+
<url>https://github.com/mikeddavydov/jpwise</url>
15+
16+
<licenses>
17+
<license>
18+
<name>MIT License</name>
19+
<url>https://opensource.org/licenses/MIT</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
</licenses>
23+
24+
<developers>
25+
<developer>
26+
<id>mikeddavydov</id>
27+
<name>Mikhail Davydov</name>
28+
<email>mikhail.davydov@example.com</email>
29+
<url>https://github.com/mikeddavydov</url>
30+
<roles>
31+
<role>developer</role>
32+
<role>maintainer</role>
33+
</roles>
34+
</developer>
35+
</developers>
1036

1137
<properties>
1238
<maven.compiler.source>11</maven.compiler.source>
@@ -289,14 +315,14 @@
289315
<repository>
290316
<id>github</id>
291317
<name>GitHub Packages</name>
292-
<url>https://maven.pkg.github.com/mikhail-davydov/jpwise</url>
318+
<url>https://maven.pkg.github.com/mikeddavydov/jpwise</url>
293319
</repository>
294320
</distributionManagement>
295321

296322
<!-- SCM information -->
297323
<scm>
298-
<connection>scm:git:git://github.com/mikhail-davydov/jpwise.git</connection>
299-
<developerConnection>scm:git:ssh://github.com:mikhail-davydov/jpwise.git</developerConnection>
300-
<url>http://github.com/mikhail-davydov/jpwise/tree/main</url>
324+
<connection>scm:git:git://github.com/mikeddavydov/jpwise.git</connection>
325+
<developerConnection>scm:git:ssh://github.com:mikeddavydov/jpwise.git</developerConnection>
326+
<url>http://github.com/mikeddavydov/jpwise/tree/main</url>
301327
</scm>
302328
</project>

src/main/java/io/github/mikeddavydov/core/CombinationTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
* }
5151
*
5252
* // Access as row maps
53-
* List<Map<String, Object>> rows = table.asRowMapList();
54-
* for (Map<String, Object> row : rows) {
53+
* List&lt;Map&lt;String, Object&gt;&gt; rows = table.asRowMapList();
54+
* for (Map&lt;String, Object&gt; row : rows) {
5555
* String browser = (String) row.get("browser");
5656
* String os = (String) row.get("os");
5757
* }

src/main/java/io/github/mikeddavydov/core/CyclingPartition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* <p>Example usage:
1919
*
2020
* <pre>
21-
* CyclingPartition<String> chrome = new CyclingPartition<>(
21+
* CyclingPartition&lt;String&gt; chrome = new CyclingPartition&lt;&gt;(
2222
* "Chrome",
2323
* "116.0", // Default value
2424
* Arrays.asList("116.0", "116.1", "116.2") // Values to cycle through

src/main/java/io/github/mikeddavydov/core/TestParameter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* List<CompatibilityPredicate> rules = Arrays.asList((ep1, ep2) -> {
4545
* // Safari only works with macOS
4646
* if (ep1.getName().equals("Safari")
47-
* && ep2.getParentParameter().getName().equals("operatingSystem")) {
47+
* &amp;&amp; ep2.getParentParameter().getName().equals("operatingSystem")) {
4848
* return ep2.getName().equals("macOS");
4949
* }
5050
* return true;

0 commit comments

Comments
 (0)