Skip to content

Commit 4ce6648

Browse files
authored
Fix #17 : Use shadowJar instead of default one (#19)
1 parent af66db1 commit 4ce6648

File tree

11 files changed

+47
-34
lines changed

11 files changed

+47
-34
lines changed

.idea/compiler.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/cli/cli.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/cli/cli_main.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/cli/cli_test.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/lib/lib.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/lib/lib_main.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/lib/lib_test.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/openapi-style-validator.iml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,9 @@ The project is configured to use gradle. To build the jar, just do:
6161

6262
`gradlew assemble`
6363

64-
or
64+
or if you want to invoke the jar creation directly
6565

66-
```
67-
gradle build
68-
gradle fatJar
69-
```
66+
`gradlew shadowJar`
7067

7168
### To change the code
7269

build.gradle

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
subprojects {
2-
apply plugin: "java"
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
7+
}
8+
}
39

4-
version = '1.1'
10+
version = '1.1'
511

6-
repositories {
7-
mavenCentral()
8-
}
9-
10-
dependencies {
11-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
12-
compile group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.25'
13-
testCompile group: 'junit', name: 'junit', version: '4.12'
14-
}
12+
subprojects {
13+
apply plugin: 'java'
14+
15+
repositories {
16+
mavenCentral()
17+
}
1518

16-
task fatJar(type: Jar) {
17-
manifest {
18-
attributes 'Implementation-Title': 'OpenApiTools OpenApi Style Validator',
19-
'Implementation-Version': version,
20-
'Main-Class': 'org.openapitools.openapistylevalidator.Main'
19+
dependencies {
20+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
21+
compile group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.25'
22+
testCompile group: 'junit', name: 'junit', version: '4.12'
2123
}
22-
archiveBaseName = rootProject.name + '-' + project.name.replace("modules/", "")
23-
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
24-
with jar
25-
}
2624
}

cli/build.gradle

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1+
apply plugin: 'application'
2+
13
dependencies {
24
compile project(':lib')
35
compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
46

57
compile 'io.swagger.parser.v3:swagger-parser:2.0.13'
68
compile 'org.openapitools.empoa:empoa-swagger-core:1.0.0'
7-
}
9+
}
10+
11+
mainClassName = 'org.openapitools.openapistylevalidator.Main'
12+
13+
apply plugin: 'com.github.johnrengelman.shadow'
14+
15+
shadowJar {
16+
//noinspection GroovyAccessibility
17+
archiveBaseName = "openapi-style-validator-cli"
18+
//noinspection GroovyAccessibility
19+
archiveClassifier = null
20+
}
21+
22+
project.tasks.assemble.dependsOn project.tasks.shadowJar

0 commit comments

Comments
 (0)