Skip to content

Commit ada3464

Browse files
Bernardo-MGBernardo-MG
authored
Merge pull request #2 from Bernardo-MG/release
Release
2 parents 5b1f84b + ff114de commit ada3464

File tree

17 files changed

+890
-119
lines changed

17 files changed

+890
-119
lines changed

‎LICENSE‎

Lines changed: 174 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,174 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2020 Bernardo Martínez Garrido
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.

‎pom.xml‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

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

2626
<name>Dice Notation Tools CLI</name>
@@ -181,10 +181,11 @@
181181
<picocli.version>4.4.0</picocli.version>
182182
<log4j.version>2.13.3</log4j.version>
183183
<slf4j.version>1.7.30</slf4j.version>
184+
<spring.boot.version>2.3.1.RELEASE</spring.boot.version>
184185
<!-- ============================================== -->
185186
<!-- ============== PLUGINS VERSIONS ============== -->
186187
<!-- ============================================== -->
187-
<plugin.shade.version>3.2.4</plugin.shade.version>
188+
<plugin.spring.boot.version>${spring.boot.version}</plugin.spring.boot.version>
188189
<!-- ============================================== -->
189190
<!-- ================= MAVEN SITE ================= -->
190191
<!-- ============================================== -->
@@ -193,7 +194,7 @@
193194
<!-- ================= EXECUTABLE ================= -->
194195
<!-- ============================================== -->
195196
<main.path>com.bernardomg.tabletop.dice.cli.Main</main.path>
196-
<exec.file.name>executable</exec.file.name>
197+
<exec.file.name>dice</exec.file.name>
197198
</properties>
198199

199200
<!-- ********************************************** -->
@@ -282,14 +283,14 @@
282283
<!-- ********************************************** -->
283284

284285
<build>
285-
<defaultGoal>clean package install</defaultGoal>
286+
<defaultGoal>clean package</defaultGoal>
286287
<pluginManagement>
287288
<plugins>
288289
<plugin>
289-
<!-- Shade -->
290-
<groupId>org.apache.maven.plugins</groupId>
291-
<artifactId>maven-shade-plugin</artifactId>
292-
<version>${plugin.shade.version}</version>
290+
<!-- Spring Boot -->
291+
<groupId>org.springframework.boot</groupId>
292+
<artifactId>spring-boot-maven-plugin</artifactId>
293+
<version>${plugin.spring.boot.version}</version>
293294
</plugin>
294295
</plugins>
295296
</pluginManagement>
@@ -336,37 +337,6 @@
336337
</archive>
337338
</configuration>
338339
</plugin>
339-
<plugin>
340-
<!-- Shade -->
341-
<groupId>org.apache.maven.plugins</groupId>
342-
<artifactId>maven-shade-plugin</artifactId>
343-
<executions>
344-
<execution>
345-
<goals>
346-
<goal>shade</goal>
347-
</goals>
348-
<configuration>
349-
<finalName>${exec.file.name}</finalName>
350-
<shadedArtifactAttached>true</shadedArtifactAttached>
351-
<transformers>
352-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
353-
<mainClass>${main.path}</mainClass>
354-
</transformer>
355-
</transformers>
356-
<filters>
357-
<filter>
358-
<artifact>*:*</artifact>
359-
<excludes>
360-
<exclude>META-INF/*.SF</exclude>
361-
<exclude>META-INF/*.DSA</exclude>
362-
<exclude>META-INF/*.RSA</exclude>
363-
</excludes>
364-
</filter>
365-
</filters>
366-
</configuration>
367-
</execution>
368-
</executions>
369-
</plugin>
370340
<plugin>
371341
<!-- Site -->
372342
<!-- Generates the Maven Site -->
@@ -381,6 +351,40 @@
381351
</dependency>
382352
</dependencies>
383353
</plugin>
354+
<plugin>
355+
<!-- Spring Boot -->
356+
<groupId>org.springframework.boot</groupId>
357+
<artifactId>spring-boot-maven-plugin</artifactId>
358+
<executions>
359+
<execution>
360+
<goals>
361+
<goal>repackage</goal>
362+
</goals>
363+
<configuration>
364+
<classifier>spring-boot</classifier>
365+
<mainClass>${main.path}</mainClass>
366+
</configuration>
367+
</execution>
368+
</executions>
369+
</plugin>
370+
<plugin>
371+
<!-- Antrun -->
372+
<groupId>org.apache.maven.plugins</groupId>
373+
<artifactId>maven-antrun-plugin</artifactId>
374+
<executions>
375+
<execution>
376+
<phase>package</phase>
377+
<configuration>
378+
<target>
379+
<copy file="${project.build.directory}/${project.build.finalName}-spring-boot.jar" tofile="${project.build.directory}/${exec.file.name}.jar" />
380+
</target>
381+
</configuration>
382+
<goals>
383+
<goal>run</goal>
384+
</goals>
385+
</execution>
386+
</executions>
387+
</plugin>
384388
</plugins>
385389
</build>
386390

‎readme.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Dice Notation Tools CLI
1+
# Dice Notation Tools for Java CLI
22

33
CLI for running the [Dice Notation Tools][dice-notation-tools] through line command.
44

@@ -11,13 +11,13 @@ mvn clean package
1111
Afterwards a runnable jar will be in the target folder. It can be run like this:
1212

1313
```
14-
java -jar target/executable.jar 1d6
14+
java -jar target/dice.jar roll 1d6
1515
```
1616

1717
To show other commands:
1818

1919
```
20-
java -jar target/executable.jar -h
20+
java -jar target/dice.jar -h
2121
```
2222

2323
[![Release docs](https://img.shields.io/badge/docs-release-blue.svg)][site-release]

‎src/changes/changes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,13 @@
1010
First version.
1111
</action>
1212
</release>
13+
<release version="1.1.0" date="2020-07-19" description="Improved CLI">
14+
<action dev="bmg" type="add">
15+
Added an option to gather dice from an expression.
16+
</action>
17+
<action dev="bmg" type="update">
18+
Extended and improved CLI.
19+
</action>
20+
</release>
1321
</body>
1422
</document>

0 commit comments

Comments
 (0)