-
-
Notifications
You must be signed in to change notification settings - Fork 293
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8e677dc
commit 5d5dccf
Showing
8 changed files
with
98 additions
and
195 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,9 @@ | ||
| task wrapper(type: Wrapper) { | ||
| gradleVersion = '4.0' | ||
| } | ||
|
|
||
| defaultTasks 'clean', 'compileJava', 'test' | ||
|
|
||
| subprojects { proj -> | ||
|
|
||
| apply plugin: 'idea' | ||
| apply plugin: 'java' | ||
| apply plugin: 'maven-publish' | ||
| apply plugin: 'maven' | ||
| apply plugin: 'signing' | ||
|
|
||
| description = 'Structurizr' | ||
|
|
@@ -18,7 +12,6 @@ subprojects { proj -> | |
|
|
||
| repositories { | ||
| mavenCentral() | ||
| mavenLocal() | ||
| } | ||
|
|
||
| sourceSets { | ||
|
|
@@ -34,125 +27,74 @@ subprojects { proj -> | |
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile 'com.google.code.findbugs:jsr305:3.0.2' | ||
| } | ||
|
|
||
| compileJava.options.encoding = 'UTF-8' | ||
| compileTestJava.options.encoding = 'UTF-8' | ||
|
|
||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
|
|
||
| java { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| jar { | ||
| manifest { | ||
| attributes( | ||
| "Implementation-Title": "Structurizr for Java", | ||
| "Implementation-Version": version | ||
| "Implementation-Title": "Structurizr for Java", | ||
| "Implementation-Version": version | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar) { | ||
| classifier = 'sources' | ||
| from sourceSets.main.allJava | ||
| } | ||
|
|
||
| task javadocJar(type: Jar) { | ||
| classifier = 'javadoc' | ||
| from javadoc | ||
| } | ||
|
|
||
| artifacts { | ||
| archives javadocJar, sourcesJar | ||
| } | ||
|
|
||
| signing { | ||
| sign configurations.archives | ||
| } | ||
|
|
||
| uploadArchives { | ||
| publishing { | ||
| repositories { | ||
| mavenDeployer { | ||
| beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } | ||
|
|
||
| repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { | ||
| authentication(userName: ossrhUsername, password: ossrhPassword) | ||
| maven { | ||
| name = "ossrh" | ||
| url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" | ||
| credentials { | ||
| username = findProperty('ossrhUsername') | ||
| password = findProperty('ossrhPassword') | ||
| } | ||
| } | ||
| } | ||
|
|
||
| snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { | ||
| authentication(userName: ossrhUsername, password: ossrhPassword) | ||
| } | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| from components.java | ||
|
|
||
| pom.project { | ||
| name 'Structurizr for Java' | ||
| packaging 'jar' | ||
| description 'Structurizr for Java' | ||
| url 'https://github.com/structurizr/java' | ||
| pom { | ||
| name = 'Structurizr for Java' | ||
| description = 'Structurizr for Java' | ||
| url = 'https://github.com/structurizr/java' | ||
|
|
||
| scm { | ||
| connection 'scm:git:git://github.com/structurizr/structurizr-java.git' | ||
| developerConnection 'scm:git:[email protected]:structurizr/structurizr-java.git' | ||
| url 'https://github.com/structurizr/java' | ||
| connection = 'scm:git:git://github.com/structurizr/structurizr-java.git' | ||
| developerConnection = 'scm:git:[email protected]:structurizr/structurizr-java.git' | ||
| url = 'https://github.com/structurizr/java' | ||
| } | ||
|
|
||
| licenses { | ||
| license { | ||
| name 'The Apache License, Version 2.0' | ||
| url 'http://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| name = 'The Apache License, Version 2.0' | ||
| url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| } | ||
| } | ||
|
|
||
| developers { | ||
| developer { | ||
| id "simon" | ||
| name "Simon Brown" | ||
| email "[email protected]" | ||
| id = "simon" | ||
| name = "Simon Brown" | ||
| email = "[email protected]" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def pomConfig = { | ||
| licenses { | ||
| license { | ||
| name "The Apache Software License, Version 2.0" | ||
| url "http://www.apache.org/licenses/LICENSE-2.0.txt" | ||
| distribution "repo" | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id "simon" | ||
| name "Simon Brown" | ||
| email "[email protected]" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| from components.java | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
| pom.withXml { | ||
| def root = asNode() | ||
| root.appendNode('description', 'Visualise, document and explore your software architecture with the C4 model.') | ||
| root.appendNode('name', 'Structurizr for Java') | ||
| root.appendNode('url', 'https://github.com/structurizr/java') | ||
| root.children().last() + pomConfig | ||
| } | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| maven { | ||
| url "$buildDir/repo" | ||
| } | ||
| } | ||
| signing { | ||
| sign publishing.publications.mavenJava | ||
| } | ||
|
|
||
| } | ||
This file was deleted.
Oops, something went wrong.
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,6 +1,5 @@ | ||
| #Mon Nov 19 10:27:00 CET 2018 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip |
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,26 +1,14 @@ | ||
| dependencies { | ||
|
|
||
| compile project(':structurizr-core') | ||
| implementation project(':structurizr-core') | ||
|
|
||
| compile 'com.fasterxml.jackson.core:jackson-databind:2.13.3' | ||
| implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3' | ||
|
|
||
| compile 'org.apache.httpcomponents.client5:httpclient5:5.1.3' | ||
| implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.3' | ||
|
|
||
| compile 'javax.xml.bind:jaxb-api:2.3.0' | ||
| implementation 'javax.xml.bind:jaxb-api:2.3.0' | ||
|
|
||
| testCompile 'junit:junit:4.12' | ||
| } | ||
| implementation 'commons-logging:commons-logging:1.2' | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDir 'src' | ||
| } | ||
| } | ||
| test { | ||
| java { | ||
| srcDir 'test/unit' | ||
| srcDir 'test/integration' | ||
| } | ||
| } | ||
| } | ||
| testImplementation 'junit:junit:4.12' | ||
| } |
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,22 +1,10 @@ | ||
| dependencies { | ||
|
|
||
| compile 'com.fasterxml.jackson.core:jackson-annotations:2.13.3' | ||
| implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3' | ||
| implementation 'com.google.code.findbugs:jsr305:3.0.2' | ||
|
|
||
| compile 'commons-logging:commons-logging:1.2' | ||
| implementation 'commons-logging:commons-logging:1.2' | ||
|
|
||
| testCompile 'junit:junit:4.12' | ||
| testCompile 'org.assertj:assertj-core:3.9.1' | ||
| } | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDir 'src' | ||
| } | ||
| } | ||
| test { | ||
| java { | ||
| srcDir 'test/unit' | ||
| } | ||
| } | ||
| } | ||
| testImplementation 'junit:junit:4.12' | ||
| testImplementation 'org.assertj:assertj-core:3.9.1' | ||
| } |
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
Oops, something went wrong.