Skip to content

Commit d053c6e

Browse files
Bernardo-MGBernardo-MG
authored
Merge pull request #5 from Bernardo-MG/release
Release
2 parents f95d03c + 72e40e0 commit d053c6e

8 files changed

Lines changed: 65 additions & 37 deletions

File tree

‎.github/workflows/deploy_docs.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ jobs:
2424
- name: Check-out
2525
uses: actions/checkout@v2
2626
- name: Set up JDK
27-
uses: actions/setup-java@v1
27+
uses: actions/setup-java@v2.1.0
2828
with:
2929
java-version: 11
30+
distribution: 'adopt'
3031
- name: Set up Maven settings
3132
uses: bernardo-mg/deployment-maven-settings-action@v1.1.2
32-
with:
33-
version-type: ${{ steps.extract_branch.outputs.branch }}
3433
env:
3534
DEPLOY_DOCS_USER: ${{ secrets.DEPLOY_DOCS_USER }}
3635
DEPLOY_DOCS_PASSWORD: ${{ secrets.DEPLOY_DOCS_PASSWORD }}

‎.github/workflows/deploy_github.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Github Repository Deployment
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
deploy:
9+
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
packages: write
14+
15+
steps:
16+
- name: Check-out
17+
uses: actions/checkout@v2
18+
- name: Set up JDK
19+
uses: actions/setup-java@v2.1.0
20+
with:
21+
java-version: 11
22+
distribution: 'adopt'
23+
server-id: github
24+
- name: Deploy
25+
run: mvn deploy -B -P deployment,deployment-release,deployment-github
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/testing.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
jdk: [ 11, 14 ]
11+
jdk: [ 11, 15 ]
1212

1313
steps:
1414
- name: Check-out
1515
uses: actions/checkout@v2
1616
- name: Set up JDK ${{ matrix.jdk }}
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v2.1.0
1818
with:
1919
java-version: ${{ matrix.jdk }}
20+
distribution: 'adopt'
2021
- name: Run all tests
2122
run: mvn clean verify

‎pom.xml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.bernardomg.maven</groupId>
1313
<artifactId>base-pom</artifactId>
14-
<version>1.4.0</version>
14+
<version>1.4.2</version>
1515
</parent>
1616

1717
<!-- ********************************************** -->
@@ -20,7 +20,7 @@
2020

2121
<groupId>com.bernardomg.tabletop</groupId>
2222
<artifactId>dice-cli</artifactId>
23-
<version>1.2.0</version>
23+
<version>1.2.1</version>
2424
<packaging>jar</packaging>
2525

2626
<name>Dice Notation Tools CLI</name>
@@ -58,21 +58,6 @@
5858
<notifiers />
5959
</ciManagement>
6060

61-
<distributionManagement>
62-
<repository>
63-
<uniqueVersion>false</uniqueVersion>
64-
<id>releases</id>
65-
<name>Releases Repository</name>
66-
<url>https://api.bintray.com/maven/bernardo-mg/maven/dice-notation-java-cli</url>
67-
</repository>
68-
<snapshotRepository>
69-
<uniqueVersion>false</uniqueVersion>
70-
<id>snapshots</id>
71-
<name>Snapshots Repository</name>
72-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
73-
</snapshotRepository>
74-
</distributionManagement>
75-
7661
<!-- ********************************************** -->
7762
<!-- ****************** PROFILES ****************** -->
7863
<!-- ********************************************** -->
@@ -131,6 +116,18 @@
131116
<maven.test.skip>true</maven.test.skip>
132117
</properties>
133118
</profile>
119+
<profile>
120+
<!-- Github deployment profile. -->
121+
<id>deployment-github</id>
122+
<distributionManagement>
123+
<repository>
124+
<!-- Github repository -->
125+
<id>github</id>
126+
<name>GitHub Packages</name>
127+
<url>https://maven.pkg.github.com/Bernardo-MG/dice-notation-java-cli</url>
128+
</repository>
129+
</distributionManagement>
130+
</profile>
134131
</profiles>
135132

136133
<!-- ********************************************** -->
@@ -174,12 +171,12 @@
174171
<!-- ============================================== -->
175172
<!-- =========== DEPENDENCIES VERSIONS ============ -->
176173
<!-- ============================================== -->
177-
<dice.version>2.1.0</dice.version>
178-
<guava.version>30.1-jre</guava.version>
174+
<dice.version>2.1.2</dice.version>
175+
<guava.version>30.1.1-jre</guava.version>
179176
<junit.jupiter.version>5.7.1</junit.jupiter.version>
180-
<mockito.version>3.7.7</mockito.version>
177+
<mockito.version>3.11.0</mockito.version>
181178
<picocli.version>4.6.1</picocli.version>
182-
<log4j.version>2.14.0</log4j.version>
179+
<log4j.version>2.14.1</log4j.version>
183180
<slf4j.version>1.7.30</slf4j.version>
184181
<spring.boot.version>2.4.3</spring.boot.version>
185182
<!-- ============================================== -->
@@ -189,7 +186,8 @@
189186
<!-- ============================================== -->
190187
<!-- ================= MAVEN SITE ================= -->
191188
<!-- ============================================== -->
192-
<site.skin.version>2.0.11</site.skin.version>
189+
<site.skin.version>2.2.0</site.skin.version>
190+
<githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=dice-notation-java-cli]]></githubArtifactURL>
193191
<!-- ============================================== -->
194192
<!-- ================= EXECUTABLE ================= -->
195193
<!-- ============================================== -->

‎readme.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ To run the project first package it:
88
mvn clean package
99
```
1010

11-
Afterwards a runnable jar will be in the target folder. It can be run like this:
11+
Or download it from [Github Packages][github_package].
12+
13+
In both cases the JAR will be a runnable Java file. It can be executed like this:
1214

1315
```
1416
java -jar target/dice.jar roll 1d6
@@ -71,6 +73,7 @@ If you wish to fork or modify the code, visit the [GitHub project page][scm], wh
7173

7274
The project has been released under the [MIT License][license].
7375

76+
[github_package]: https://github.com/Bernardo-MG?tab=packages&repo_name=dice-notation-java-cli
7477
[issues]: https://github.com/bernardo-mg/dice-notation-java-cli/issues
7578
[javadoc-develop]: https://docs.bernardomg.com/development/maven/dice-notation-java-cli/apidocs
7679
[javadoc-release]: https://docs.bernardomg.com/maven/dice-notation-java-cli/apidocs

‎src/changes/changes.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,10 @@
2828
Removed support for JDK 8.
2929
</action>
3030
</release>
31+
<release version="1.2.1" date="2021-06-03" description="Added deployment">
32+
<action dev="bmg" type="add">
33+
Added deployment to Github packages.
34+
</action>
35+
</release>
3136
</body>
3237
</document>

‎src/site/markdown/acquire.md.vm‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
#set( $symbol_pound = '#' )
22
${symbol_pound} Setting up the dependencies
33

4-
The project files are hosted on a [Bintray repository][bintray-repo], and have been replicated on JCenter and OSS Sonatype, which also replicates into the [Maven Central Repository][maven-repo].
4+
The project files are hosted in the [Github Packages Repository][github-repo], from where it can be downloaded. Otherwise the project can be acquired from the [code repository][scm] and packaged.
55

6-
This means that most Maven setups will be able to acquire the dependency without any additional configuration. Still, if the repository should be registered it is recommended using the Bintray one.
7-
8-
For any additional information about how to set up the dependency check the [dependency information section](./dependency-info.html).
9-
10-
11-
[bintray-repo]: ${bintrayURL}
12-
[maven-repo]: ${mavenURL}
6+
[scm]: ${scm.url}
7+
[github-repo]: ${githubArtifactURL}

‎src/site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</item>
5757
</menu>
5858
<menu name="Icons" inherit="bottom">
59-
<item name="Github" img="github" href="${project.scm.url}" />
59+
<item name="Github" img="fab fa-github" href="${project.scm.url}" />
6060
</menu>
6161
</body>
6262

0 commit comments

Comments
 (0)