Skip to content

Commit 36b6be2

Browse files
Bernardo-MGBernardo-MG
authored
Merge pull request #9 from Bernardo-MG/release
Release
2 parents 7406f86 + 26411e5 commit 36b6be2

6 files changed

Lines changed: 85 additions & 223 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
.loadpath
3232
.metadata
3333
.project
34+
.factorypath
3435
.settings/
3536
bin/**
3637
tmp/**
@@ -44,10 +45,6 @@ local.properties
4445
/src/main/resources/rebel.xml
4546
.springBeans
4647

47-
# IntelliJ Idea files #
48-
.idea
49-
*.iml
50-
5148
# Windows files #
5249
Thumbs.db
5350
Desktop.ini
@@ -58,3 +55,7 @@ Desktop.ini
5855
._*
5956
.Spotlight-V100
6057
.Trashes
58+
/target/
59+
60+
# Shade plugin #
61+
dependency-reduced-pom.xml

‎pom.xml‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<groupId>com.bernardomg.tabletop</groupId>
2121
<artifactId>dice-cli</artifactId>
22-
<version>1.2.3</version>
22+
<version>1.2.4</version>
2323
<packaging>jar</packaging>
2424

2525
<name>Dice Notation Tools CLI</name>
@@ -133,15 +133,18 @@
133133
<!-- ============================================== -->
134134
<!-- =========== DEPENDENCIES VERSIONS ============ -->
135135
<!-- ============================================== -->
136+
<bernardomg.cli.maniferVersion>1.0.0</bernardomg.cli.maniferVersion>
136137
<dice.version>2.2.3</dice.version>
137138
<guava.version>31.1-jre</guava.version>
138139
<junit.jupiter.version>5.9.2</junit.jupiter.version>
140+
<log4j.version>2.19.0</log4j.version>
141+
<lombok.version>1.18.26</lombok.version>
139142
<picocli.version>4.7.1</picocli.version>
140-
<spring.boot.version>2.7.8</spring.boot.version>
143+
<slf4j.version>2.0.6</slf4j.version>
141144
<!-- ============================================== -->
142145
<!-- ============== PLUGINS VERSIONS ============== -->
143146
<!-- ============================================== -->
144-
<plugin.spring.boot.version>${spring.boot.version}</plugin.spring.boot.version>
147+
<plugin.shade.version>3.4.1</plugin.shade.version>
145148
<!-- ============================================== -->
146149
<!-- ============ PLUGIN CONFIGURATION ============ -->
147150
<!-- ============================================== -->
@@ -167,14 +170,6 @@
167170

168171
<dependencyManagement>
169172
<dependencies>
170-
<dependency>
171-
<!-- Spring Boot Dependencies BOM -->
172-
<groupId>org.springframework.boot</groupId>
173-
<artifactId>spring-boot-dependencies</artifactId>
174-
<version>${spring.boot.version}</version>
175-
<type>pom</type>
176-
<scope>import</scope>
177-
</dependency>
178173
<dependency>
179174
<!-- JUnit BOM -->
180175
<groupId>org.junit</groupId>
@@ -193,12 +188,6 @@
193188
<artifactId>guava</artifactId>
194189
<version>${guava.version}</version>
195190
</dependency>
196-
<dependency>
197-
<!-- picocli -->
198-
<groupId>info.picocli</groupId>
199-
<artifactId>picocli</artifactId>
200-
<version>${picocli.version}</version>
201-
</dependency>
202191
<dependency>
203192
<!-- Dice -->
204193
<groupId>com.bernardomg.tabletop</groupId>
@@ -213,12 +202,28 @@
213202
</exclusions>
214203
</dependency>
215204
<!-- ============================================== -->
205+
<!-- ==================== CLI ===================== -->
206+
<!-- ============================================== -->
207+
<dependency>
208+
<!-- picocli -->
209+
<groupId>info.picocli</groupId>
210+
<artifactId>picocli</artifactId>
211+
<version>${picocli.version}</version>
212+
</dependency>
213+
<dependency>
214+
<!-- Manifest version provider -->
215+
<groupId>com.bernardomg.cli</groupId>
216+
<artifactId>picocli-manifest-version-provider</artifactId>
217+
<version>${bernardomg.cli.maniferVersion}</version>
218+
</dependency>
219+
<!-- ============================================== -->
216220
<!-- ================== LOMBOK ==================== -->
217221
<!-- ============================================== -->
218222
<dependency>
219223
<!-- Lombok -->
220224
<groupId>org.projectlombok</groupId>
221225
<artifactId>lombok</artifactId>
226+
<version>${lombok.version}</version>
222227
<scope>provided</scope>
223228
</dependency>
224229
<!-- ============================================== -->
@@ -228,16 +233,19 @@
228233
<!-- SLF4J API -->
229234
<groupId>org.slf4j</groupId>
230235
<artifactId>slf4j-api</artifactId>
236+
<version>${slf4j.version}</version>
231237
</dependency>
232238
<dependency>
233239
<!-- Log4j SLF4J Bridge -->
234240
<groupId>org.apache.logging.log4j</groupId>
235-
<artifactId>log4j-slf4j-impl</artifactId>
241+
<artifactId>log4j-slf4j2-impl</artifactId>
242+
<version>${log4j.version}</version>
236243
</dependency>
237244
<dependency>
238245
<!-- Log4j core -->
239246
<groupId>org.apache.logging.log4j</groupId>
240247
<artifactId>log4j-core</artifactId>
248+
<version>${log4j.version}</version>
241249
</dependency>
242250
<!-- ============================================== -->
243251
<!-- ======= TEST ENVIRONMENT DEPENDENCIES ======== -->
@@ -254,12 +262,6 @@
254262
<artifactId>junit-platform-runner</artifactId>
255263
<scope>test</scope>
256264
</dependency>
257-
<dependency>
258-
<!-- Mockito -->
259-
<groupId>org.mockito</groupId>
260-
<artifactId>mockito-core</artifactId>
261-
<scope>test</scope>
262-
</dependency>
263265
</dependencies>
264266

265267
<!-- ********************************************** -->
@@ -271,10 +273,10 @@
271273
<pluginManagement>
272274
<plugins>
273275
<plugin>
274-
<!-- Spring Boot -->
275-
<groupId>org.springframework.boot</groupId>
276-
<artifactId>spring-boot-maven-plugin</artifactId>
277-
<version>${plugin.spring.boot.version}</version>
276+
<!-- Shade -->
277+
<groupId>org.apache.maven.plugins</groupId>
278+
<artifactId>maven-shade-plugin</artifactId>
279+
<version>${plugin.shade.version}</version>
278280
</plugin>
279281
</plugins>
280282
</pluginManagement>
@@ -322,52 +324,52 @@
322324
</configuration>
323325
</plugin>
324326
<plugin>
325-
<!-- Site -->
326-
<!-- Generates the Maven Site -->
327+
<!-- Shade -->
327328
<groupId>org.apache.maven.plugins</groupId>
328-
<artifactId>maven-site-plugin</artifactId>
329-
<dependencies>
330-
<dependency>
331-
<!-- Docs Maven Skin -->
332-
<groupId>com.bernardomg.maven.skins</groupId>
333-
<artifactId>docs-maven-skin</artifactId>
334-
<version>${site.skin.version}</version>
335-
</dependency>
336-
</dependencies>
337-
</plugin>
338-
<plugin>
339-
<!-- Spring Boot -->
340-
<groupId>org.springframework.boot</groupId>
341-
<artifactId>spring-boot-maven-plugin</artifactId>
329+
<artifactId>maven-shade-plugin</artifactId>
342330
<executions>
343331
<execution>
344332
<goals>
345-
<goal>repackage</goal>
333+
<goal>shade</goal>
346334
</goals>
347335
<configuration>
348-
<classifier>spring-boot</classifier>
349-
<mainClass>${main.path}</mainClass>
336+
<finalName>${exec.file.name}</finalName>
337+
<shadedArtifactAttached>true</shadedArtifactAttached>
338+
<transformers>
339+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
340+
<mainClass>${main.path}</mainClass>
341+
<manifestEntries>
342+
<Multi-Release>true</Multi-Release>
343+
</manifestEntries>
344+
</transformer>
345+
</transformers>
346+
<filters>
347+
<filter>
348+
<artifact>*:*</artifact>
349+
<excludes>
350+
<exclude>META-INF/*.SF</exclude>
351+
<exclude>META-INF/*.DSA</exclude>
352+
<exclude>META-INF/*.RSA</exclude>
353+
</excludes>
354+
</filter>
355+
</filters>
350356
</configuration>
351357
</execution>
352358
</executions>
353359
</plugin>
354360
<plugin>
355-
<!-- Antrun -->
361+
<!-- Site -->
362+
<!-- Generates the Maven Site -->
356363
<groupId>org.apache.maven.plugins</groupId>
357-
<artifactId>maven-antrun-plugin</artifactId>
358-
<executions>
359-
<execution>
360-
<phase>package</phase>
361-
<configuration>
362-
<target>
363-
<copy file="${project.build.directory}/${project.build.finalName}-spring-boot.jar" tofile="${project.build.directory}/${exec.file.name}.jar" />
364-
</target>
365-
</configuration>
366-
<goals>
367-
<goal>run</goal>
368-
</goals>
369-
</execution>
370-
</executions>
364+
<artifactId>maven-site-plugin</artifactId>
365+
<dependencies>
366+
<dependency>
367+
<!-- Docs Maven Skin -->
368+
<groupId>com.bernardomg.maven.skins</groupId>
369+
<artifactId>docs-maven-skin</artifactId>
370+
<version>${site.skin.version}</version>
371+
</dependency>
372+
</dependencies>
371373
</plugin>
372374
</plugins>
373375
</build>

‎readme.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ java -jar target/dice.jar -h
3030

3131
## Features
3232

33-
- Executable JAR using only Maven
33+
- CLI for [Dice Notation Tools][dice-notation-tools]
34+
- Executable JAR
3435

3536
## Documentation
3637

‎src/changes/changes.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Updated CI files.
4242
</action>
4343
</release>
44-
<release version="1.2.3" date="2023-02-18" description="">
44+
<release version="1.2.3" date="2023-02-18" description="Updated project">
4545
<action dev="bmg" type="fix">
4646
Fixed docs.
4747
</action>
@@ -52,5 +52,13 @@
5252
Updated dependencies.
5353
</action>
5454
</release>
55+
<release version="1.2.4" date="2023-02-18" description="Removed Spring Boot">
56+
<action dev="bmg" type="update">
57+
No longer using Spring Boot for the executable jar.
58+
</action>
59+
<action dev="bmg" type="update">
60+
Using a generic library for the version command.
61+
</action>
62+
</release>
5563
</body>
5664
</document>

0 commit comments

Comments
 (0)