Updated MapStruct dependency to CR1. Still trying to figure out the signing plugin.

Chessray · Chessray · commit 740e885c87c9 · 2020-09-06T21:29:27.000+01:00
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -2,7 +2,7 @@ apply plugin: "maven-publish"
 apply plugin: "signing"
 
 dependencies {
-    compileOnly'org.springframework:spring-core:5.0.0.RELEASE'
+    compileOnly 'org.springframework:spring-core:5.0.0.RELEASE'
 }
 
 java {
@@ -31,7 +31,9 @@ publishing {
                 }
                 developers {
                     developer {
+                        id = 'RayBan'
                         name = 'Raimund Klein'
+                        email = 'raimund.klein@gmx.de'
                     }
                 }
                 scm {
@@ -52,6 +54,9 @@ publishing {
 }
 
 signing {
+    required { gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+    useGpgCmd()
     sign publishing.publications.mavenJava
 }
 
@@ -60,7 +65,6 @@ javadoc {
         options.addBooleanOption('html5', true)
     }
     options.links = [
-        "https://docs.oracle.com/javase/8/docs/api/",
         "https://docs.spring.io/spring/docs/5.0.0.RELEASE/javadoc-api/"
     ]
 }
diff --git a/build.gradle b/build.gradle
@@ -21,9 +21,6 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
-        maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots"
-        }
     }
 }
 
diff --git a/examples/classname/build.gradle b/examples/classname/build.gradle
@@ -4,8 +4,8 @@ dependencies {
     implementation project(":annotations")
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     compileOnly 'javax.annotation:jsr250-api:1.0'
-    implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0-SNAPSHOT'
+    implementation 'org.mapstruct:mapstruct:1.4.0.CR1'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.CR1'
     implementation 'org.springframework:spring-core:5.0.0.RELEASE'
     implementation 'org.springframework:spring-context:5.0.0.RELEASE'
     testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
diff --git a/examples/noconfig/build.gradle b/examples/noconfig/build.gradle
@@ -3,8 +3,8 @@ dependencies {
     implementation project(":examples:model")
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     compileOnly 'javax.annotation:jsr250-api:1.0'
-    implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0-SNAPSHOT'
+    implementation 'org.mapstruct:mapstruct:1.4.0.CR1'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.CR1'
     implementation 'org.springframework:spring-core:5.0.0.RELEASE'
     implementation 'org.springframework:spring-context:5.0.0.RELEASE'
     testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
diff --git a/examples/packagename-and-classname/build.gradle b/examples/packagename-and-classname/build.gradle
@@ -4,8 +4,8 @@ dependencies {
     implementation project(":annotations")
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     compileOnly 'javax.annotation:jsr250-api:1.0'
-    implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0-SNAPSHOT'
+    implementation 'org.mapstruct:mapstruct:1.4.0.CR1'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.CR1'
     implementation 'org.springframework:spring-core:5.0.0.RELEASE'
     implementation 'org.springframework:spring-context:5.0.0.RELEASE'
     testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
diff --git a/examples/packagename/build.gradle b/examples/packagename/build.gradle
@@ -4,8 +4,8 @@ dependencies {
     implementation project(":examples:model")
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     compileOnly 'javax.annotation:jsr250-api:1.0'
-    implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0-SNAPSHOT'
+    implementation 'org.mapstruct:mapstruct:1.4.0.CR1'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.CR1'
     implementation 'org.springframework:spring-core:5.0.0.RELEASE'
     implementation 'org.springframework:spring-context:5.0.0.RELEASE'
     testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
diff --git a/extensions/build.gradle b/extensions/build.gradle
@@ -3,7 +3,7 @@ apply plugin: "signing"
 
 dependencies {
     implementation project(":annotations")
-    implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
+    implementation 'org.mapstruct:mapstruct:1.4.0.CR1'
     implementation 'com.squareup:javapoet:1.12.1'
     implementation 'org.apache.commons:commons-lang3:3.10'
 
@@ -44,9 +44,9 @@ publishing {
                     }
                 }
                 scm {
-                    connection = 'scm:git:git://git@github.com:mapstruct/mapstruct-spring-extensions.git'
-                    developerConnection = 'scm:git:ssh://git@github.com:mapstruct/mapstruct-spring-extensions.git'
-//                        url = 'http://example.com/my-library/'
+                    connection = 'scm:git:git://github.com/mapstruct/mapstruct-spring-extensions.git'
+                    developerConnection = 'scm:git:git://github.com/mapstruct/mapstruct-spring-extensions.git'
+                    url = 'https://github.com/mapstruct/mapstruct-spring-extensions'
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ apply plugin: "maven-publish"`
`2`	`2`	`apply plugin: "signing"`
`3`	`3`
`4`	`4`	`dependencies {`
`5`		`- compileOnly'org.springframework:spring-core:5.0.0.RELEASE'`
	`5`	`+ compileOnly 'org.springframework:spring-core:5.0.0.RELEASE'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`java {`
`@@ -31,7 +31,9 @@ publishing {`
`31`	`31`	`}`
`32`	`32`	`developers {`
`33`	`33`	`developer {`
	`34`	`+ id = 'RayBan'`
`34`	`35`	`name = 'Raimund Klein'`
	`36`	`+ email = '[email protected]'`
`35`	`37`	`}`
`36`	`38`	`}`
`37`	`39`	`scm {`
`@@ -52,6 +54,9 @@ publishing {`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`signing {`
	`57`	`+ required { gradle.taskGraph.hasTask("uploadArchives") }`
	`58`	`+ sign configurations.archives`
	`59`	`+ useGpgCmd()`
`55`	`60`	`sign publishing.publications.mavenJava`
`56`	`61`	`}`
`57`	`62`
`@@ -60,7 +65,6 @@ javadoc {`
`60`	`65`	`options.addBooleanOption('html5', true)`
`61`	`66`	`}`
`62`	`67`	`options.links = [`
`63`		`- "https://docs.oracle.com/javase/8/docs/api/",`
`64`	`68`	`"https://docs.spring.io/spring/docs/5.0.0.RELEASE/javadoc-api/"`
`65`	`69`	`]`
`66`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ allprojects {`
`21`	`21`	`repositories {`
`22`	`22`	`jcenter()`
`23`	`23`	`mavenCentral()`
`24`		`- maven {`
`25`		`- url "https://oss.sonatype.org/content/repositories/snapshots"`
`26`		`- }`
`27`	`24`	`}`
`28`	`25`	`}`
`29`	`26`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ apply plugin: "signing"`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`implementation project(":annotations")`
`6`		`- implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'`
	`6`	`+ implementation 'org.mapstruct:mapstruct:1.4.0.CR1'`
`7`	`7`	`implementation 'com.squareup:javapoet:1.12.1'`
`8`	`8`	`implementation 'org.apache.commons:commons-lang3:3.10'`
`9`	`9`
`@@ -44,9 +44,9 @@ publishing {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`scm {`
`47`		`- connection = 'scm:git:git://git@github.com:mapstruct/mapstruct-spring-extensions.git'`
`48`		`- developerConnection = 'scm:git:ssh://git@github.com:mapstruct/mapstruct-spring-extensions.git'`
`49`		`-// url = 'http://example.com/my-library/'`
	`47`	`+ connection = 'scm:git:git://github.com/mapstruct/mapstruct-spring-extensions.git'`
	`48`	`+ developerConnection = 'scm:git:git://github.com/mapstruct/mapstruct-spring-extensions.git'`
	`49`	`+ url = 'https://github.com/mapstruct/mapstruct-spring-extensions'`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`