-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #389 from raynigon/feature/improve-dependency-reso…
…lution Improve Dependency Resolution
- Loading branch information
Showing
8 changed files
with
42 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| dependencies { | ||
| implementation project(':ecs-logging-base') | ||
| api(project(':ecs-logging-base')) | ||
| compileOnly("org.springframework.boot:spring-boot-starter-web") | ||
| testImplementation("org.springframework.boot:spring-boot-starter-web") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
|
|
||
| signing { | ||
| required { | ||
| findProperty("signingKey") != null | ||
|
|
@@ -22,58 +21,43 @@ publishing { | |
| } | ||
| } | ||
| publications { | ||
| basic(MavenPublication) { | ||
| create("maven", MavenPublication) { | ||
| artifactId = project.name | ||
|
|
||
| artifact project.tasks.jar | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
| from components.java | ||
|
|
||
| pom.withXml { | ||
| def rootNode = asNode() | ||
| rootNode.children().last() + { | ||
| resolveStrategy = Closure.DELEGATE_FIRST | ||
|
|
||
| name project.name | ||
| description "The ${project.name} is a part of the unit-api" | ||
| url 'https://github.com/raynigon/spring-boot/' | ||
| issueManagement { | ||
| system 'GitHub' | ||
| url 'https://github.com/raynigon/spring-boot/issues' | ||
| } | ||
| licenses { | ||
| license { | ||
| name 'Apache-2.0' | ||
| url 'https://opensource.org/licenses/Apache-2.0' | ||
| } | ||
| } | ||
| scm { | ||
| url 'https://github.com/raynigon/spring-boot/' | ||
| connection 'scm:git:git://github.com/raynigon/spring-boot.git' | ||
| developerConnection 'scm:git:ssh://[email protected]/raynigon/spring-boot.git' | ||
| } | ||
| developers { | ||
| developer { | ||
| id 'raynigon' | ||
| name 'Simon Schneider' | ||
| email '[email protected]' | ||
| } | ||
| pom { | ||
| name = project.name | ||
| description = "The ${project.name} is a part of the unit-api" | ||
| url = 'https://github.com/raynigon/spring-boot/' | ||
| issueManagement { | ||
| system = 'GitHub' | ||
| url = 'https://github.com/raynigon/spring-boot/issues' | ||
| } | ||
| licenses { | ||
| license { | ||
| name = 'Apache-2.0' | ||
| url = 'https://opensource.org/licenses/Apache-2.0' | ||
| } | ||
| } | ||
|
|
||
| rootNode.remove((Node) ((Node) rootNode).get("dependencyManagement").get(0)) | ||
| def dependenciesNode = rootNode.appendNode('dependencies') | ||
|
|
||
| def addDependency = { dependency, scope -> | ||
| dependenciesNode.appendNode('dependency').with { | ||
| appendNode('groupId', dependency.group) | ||
| appendNode('artifactId', dependency.name) | ||
| appendNode('version', dependency.version) | ||
| appendNode('scope', scope) | ||
| scm { | ||
| url = 'https://github.com/raynigon/spring-boot/' | ||
| connection = 'scm:git:git://github.com/raynigon/spring-boot.git' | ||
| developerConnection = 'scm:git:ssh://[email protected]/raynigon/spring-boot.git' | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'raynigon' | ||
| name = 'Simon Schneider' | ||
| email = '[email protected]' | ||
| } | ||
| } | ||
| project.configurations.implementation.dependencies.each { addDependency(it, 'compile') } | ||
| } | ||
| // Remove Spring Boot Dependency Management | ||
| pom.withXml { | ||
| def rootNode = asNode() | ||
| rootNode.remove((Node) ((Node) rootNode).get("dependencyManagement").get(0)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||