Skip to content

Commit 0826295

Browse files
Bernardo-MGBernardo-MG
authored
v2.2.6
2 parents 7310173 + 76ccf00 commit 0826295

File tree

48 files changed

+361
-483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+361
-483
lines changed

‎.github/workflows/deployment.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
concurrency:
1212
group: deploy-github-${{ github.ref }}
1313
cancel-in-progress: true
14-
permissions:
14+
permissions:
1515
contents: read
1616
packages: write
1717

@@ -20,20 +20,22 @@ jobs:
2020
uses: bernardo-mg/maven-github-deployment-action@v1
2121
with:
2222
token: ${{ secrets.GITHUB_TOKEN }}
23+
jdk: 17
2324

24-
ossrh:
25-
name: OSSRH deployment
25+
central:
26+
name: Central deployment
2627
runs-on: ubuntu-latest
27-
environment: deployment_ossrh
28+
environment: deployment_central
2829
concurrency:
29-
group: deploy-ossrh-${{ github.ref }}
30+
group: deploy-central-${{ github.ref }}
3031
cancel-in-progress: true
3132

3233
steps:
3334
- name: Deploy
34-
uses: bernardo-mg/maven-signed-deployment-action@develop
35+
uses: bernardo-mg/maven-signed-deployment-action@v1
3536
with:
36-
username: ${{ secrets.OSSRH_USERNAME }}
37-
password: ${{ secrets.OSSRH_TOKEN }}
37+
username: ${{ secrets.CENTRAL_USERNAME }}
38+
password: ${{ secrets.CENTRAL_TOKEN }}
3839
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
39-
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
40+
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
41+
jdk: 17

‎.github/workflows/doc_deployment.yml‎

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

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
jdk: [11, 17, 20]
12+
jdk: [17, 21, 24]
1313

1414
steps:
1515
- name: Check-out

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ local.properties
4444
/src/main/resources/rebel.xml
4545
.springBeans
4646

47+
# IntelliJ Idea files #
48+
.idea
49+
*.iml
50+
51+
# Visual Studio #
52+
.vscode/
53+
.factorypath
54+
55+
# Docker
56+
.env
57+
4758
# Windows files #
4859
Thumbs.db
4960
Desktop.ini
@@ -54,4 +65,3 @@ Desktop.ini
5465
._*
5566
.Spotlight-V100
5667
.Trashes
57-
/target/

‎pom.xml‎

Lines changed: 23 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.bernardomg.maven</groupId>
1414
<artifactId>base-pom</artifactId>
15-
<version>1.5.6</version>
15+
<version>1.5.11</version>
1616
</parent>
1717

1818
<!-- ********************************************** -->
@@ -21,7 +21,7 @@
2121

2222
<groupId>com.bernardomg.tabletop</groupId>
2323
<artifactId>dice</artifactId>
24-
<version>2.2.5</version>
24+
<version>2.2.6</version>
2525
<packaging>jar</packaging>
2626

2727
<name>Dice Notation Tools for Java</name>
@@ -67,23 +67,6 @@
6767
<!-- ============================================== -->
6868
<!-- ============ DEPLOYMENT PROFILES ============= -->
6969
<!-- ============================================== -->
70-
<profile>
71-
<!-- Site deployment profile -->
72-
<!-- Sets the site repository to point to the releases repo -->
73-
<id>deployment-site</id>
74-
<activation>
75-
<!-- Active by default so the repository appears in the reports -->
76-
<activeByDefault>true</activeByDefault>
77-
</activation>
78-
<distributionManagement>
79-
<site>
80-
<id>site</id>
81-
<name>Project Documentation Site</name>
82-
<!-- The URL should be set externally -->
83-
<url>${site.url}</url>
84-
</site>
85-
</distributionManagement>
86-
</profile>
8770
<profile>
8871
<!-- Github deployment profile. -->
8972
<id>deployment-github</id>
@@ -92,31 +75,17 @@
9275
<!-- Github repository -->
9376
<id>github</id>
9477
<name>GitHub Packages</name>
95-
<url>https://maven.pkg.github.com/Bernardo-MG/dice-notation-java</url>
78+
<url>https://maven.pkg.github.com/bernardo-mg/java-validation</url>
9679
</repository>
9780
</distributionManagement>
9881
</profile>
9982
<profile>
100-
<!-- OSSRH deployment profile. -->
101-
<id>deployment-ossrh</id>
102-
<distributionManagement>
103-
<repository>
104-
<!-- OSSRH repository -->
105-
<id>ossrh</id>
106-
<name>Central Repository OSSRH</name>
107-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
108-
</repository>
109-
<snapshotRepository>
110-
<!-- OSSRH snapshots repository -->
111-
<id>ossrh</id>
112-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
113-
</snapshotRepository>
114-
</distributionManagement>
83+
<!-- Central deployment profile. -->
84+
<id>deployment-central</id>
11585
<build>
11686
<plugins>
11787
<plugin>
11888
<!-- GPG -->
119-
<!-- Signs the artifacts -->
12089
<groupId>org.apache.maven.plugins</groupId>
12190
<artifactId>maven-gpg-plugin</artifactId>
12291
<executions>
@@ -136,6 +105,17 @@
136105
</gpgArguments>
137106
</configuration>
138107
</plugin>
108+
<plugin>
109+
<!-- Maven Central publishing -->
110+
<groupId>org.sonatype.central</groupId>
111+
<artifactId>central-publishing-maven-plugin</artifactId>
112+
<extensions>true</extensions>
113+
<configuration>
114+
<publishingServerId>central</publishingServerId>
115+
<autoPublish>true</autoPublish>
116+
<waitUntil>published</waitUntil>
117+
</configuration>
118+
</plugin>
139119
</plugins>
140120
</build>
141121
</profile>
@@ -176,23 +156,18 @@
176156
<!-- ============================================== -->
177157
<maven.version>3.8</maven.version>
178158
<!-- ============================================== -->
179-
<!-- ================ JAVA VERSION ================ -->
180-
<!-- ============================================== -->
181-
<java.version>11</java.version>
182-
<!-- ============================================== -->
183159
<!-- =============== MANIFEST DATA ================ -->
184160
<!-- ============================================== -->
185161
<manifest.name>com/bernardomg/tabletop/dice</manifest.name>
186162
<!-- ============================================== -->
187163
<!-- =========== DEPENDENCIES VERSIONS ============ -->
188164
<!-- ============================================== -->
189-
<antlr.version>4.13.1</antlr.version>
190-
<assertj.version>3.25.1</assertj.version>
191-
<junit.jupiter.version>5.10.1</junit.jupiter.version>
192-
<lombok.version>1.18.30</lombok.version>
193-
<mockito.version>5.8.0</mockito.version>
194-
<log4j.version>2.20.0</log4j.version>
195-
<slf4j.version>2.0.9</slf4j.version>
165+
<antlr.version>4.13.2</antlr.version>
166+
<assertj.version>3.27.3</assertj.version>
167+
<junit.jupiter.version>5.13.3</junit.jupiter.version>
168+
<mockito.version>5.18.0</mockito.version>
169+
<log4j.version>2.25.0</log4j.version>
170+
<slf4j.version>2.0.17</slf4j.version>
196171
<!-- ============================================== -->
197172
<!-- ============== PLUGINS VERSIONS ============== -->
198173
<!-- ============================================== -->
@@ -210,7 +185,7 @@
210185
<!-- ============================================== -->
211186
<!-- ================= MAVEN SITE ================= -->
212187
<!-- ============================================== -->
213-
<site.skin.version>2.3.2</site.skin.version>
188+
<site.skin.version>2.4.1</site.skin.version>
214189
<mavenURL>http://mvnrepository.com/artifact/com.bernardomg.tabletop/dice</mavenURL>
215190
<githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=dice-notation-java]]></githubArtifactURL>
216191
</properties>
@@ -240,16 +215,6 @@
240215
<version>${antlr.version}</version>
241216
</dependency>
242217
<!-- ============================================== -->
243-
<!-- ================== LOMBOK ==================== -->
244-
<!-- ============================================== -->
245-
<dependency>
246-
<!-- Lombok -->
247-
<groupId>org.projectlombok</groupId>
248-
<artifactId>lombok</artifactId>
249-
<version>${lombok.version}</version>
250-
<scope>provided</scope>
251-
</dependency>
252-
<!-- ============================================== -->
253218
<!-- ================== LOGGERS =================== -->
254219
<!-- ============================================== -->
255220
<dependency>

‎readme.md‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ Its usefulness is very clear, it allows working with specific random values dist
1010

1111
[![Maven Central](https://img.shields.io/maven-central/v/com.bernardomg.tabletop/dice.svg)][maven-repo]
1212

13-
[![Release docs](https://img.shields.io/badge/docs-release-blue.svg)][site-release]
14-
[![Development docs](https://img.shields.io/badge/docs-develop-blue.svg)][site-develop]
15-
16-
[![Release javadocs](https://img.shields.io/badge/javadocs-release-blue.svg)][javadoc-release]
17-
[![Development javadocs](https://img.shields.io/badge/javadocs-develop-blue.svg)][javadoc-develop]
18-
1913
## Features
2014

2115
- ANTLR4 grammar
@@ -39,16 +33,6 @@ The grammar is included among the [ANTLR4 sample grammars][antrl-grammars].
3933

4034
## Documentation
4135

42-
Documentation is always generated for the latest release, kept in the 'master' branch:
43-
44-
- The [latest release documentation page][site-release].
45-
- The [the latest release Javadoc site][javadoc-release].
46-
47-
Documentation is also generated from the latest snapshot, taken from the 'develop' branch:
48-
49-
- The [the latest snapshot documentation page][site-develop].
50-
- The [the latest snapshot Javadoc site][javadoc-develop].
51-
5236
The documentation site sources come along the source code (as it is a Maven site), so it is always possible to generate them using the following Maven command:
5337

5438
```
@@ -95,7 +79,7 @@ rolls = parser.parse("1d6+12", roller);
9579
System.out.println(rolls.getTotalRoll());
9680
```
9781

98-
For more examples and details check the [docs][site-release].
82+
For more examples and details check the documentation.
9983

10084
## Collaborate
10185

@@ -119,11 +103,7 @@ The project has been released under version 2.0 of the [Apache License][license]
119103
[antrl-grammars]: https://github.com/antlr/grammars-v4
120104
[maven-repo]: http://mvnrepository.com/artifact/com.bernardomg.tabletop/dice
121105
[issues]: https://github.com/Bernardo-MG/dice-notation-java/issues
122-
[javadoc-develop]: https://docs.bernardomg.com/development/maven/dice-notation-java/apidocs
123-
[javadoc-release]: https://docs.bernardomg.com/maven/dice-notation-java/apidocs
124106
[license]: http://www.apache.org/licenses/LICENSE-2.0
125107
[scm]: http://github.com/Bernardo-MG/dice-notation-java
126-
[site-develop]: https://docs.bernardomg.com/development/maven/dice-notation-java
127-
[site-release]: https://docs.bernardomg.com/maven/dice-notation-java
128108

129109
[dice-notation-java-cli]: https://github.com/Bernardo-MG/dice-notation-java-cli

‎src/changes/changes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,5 +195,13 @@
195195
Updated dependencies.
196196
</action>
197197
</release>
198+
<release version="2.2.6" date="2025-07-12" description="Updated dependencies">
199+
<action dev="bmg" type="update">
200+
Updated dependencies.
201+
</action>
202+
<action dev="bmg" type="remove">
203+
Removed Lombok.
204+
</action>
205+
</release>
198206
</body>
199207
</document>

‎src/config/pmd/pmd-rules.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<ruleset name="Default" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
2+
<ruleset name="Default"
3+
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
34
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
45
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
56

@@ -8,20 +9,10 @@
89
</description>
910

1011
<rule ref="category/java/bestpractices.xml" />
11-
<rule ref="category/java/codestyle.xml">
12-
<exclude name="AvoidFinalLocalVariable" />
13-
<exclude name="UnnecessaryConstructor" />
14-
<exclude name="UnnecessaryModifier" />
15-
<exclude name="UselessParentheses" />
16-
</rule>
17-
<rule ref="category/java/design.xml">
18-
<exclude name="DataClass" />
19-
<exclude name="LawOfDemeter" />
20-
</rule>
12+
<rule ref="category/java/codestyle.xml" />
13+
<rule ref="category/java/design.xml" />
2114
<rule ref="category/java/errorprone.xml" />
22-
<rule ref="category/java/multithreading.xml">
23-
<exclude name="UseConcurrentHashMap" />
24-
</rule>
15+
<rule ref="category/java/multithreading.xml" />
2516
<rule ref="category/java/performance.xml" />
2617

2718
</ruleset>

0 commit comments

Comments
 (0)