Skip to content

Commit 76f0e50

Browse files
stavshamirstavshamir
authored
Update gradle to 7.4.2
1 parent a1ddb4f commit 76f0e50

File tree

9 files changed

+183
-325
lines changed

9 files changed

+183
-325
lines changed

‎.github/workflows/springwolf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: gradle/gradle-build-action@v2
2828

2929
- name: Build with Gradle
30-
run: ./gradlew build -x signArchives
30+
run: ./gradlew -p springwolf-core build
3131

3232
- name: Publish package
3333
if: github.ref == 'refs/heads/master'

‎gradle/wrapper/gradle-wrapper.jar

-556 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
109125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110126
fi
111127

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116132
JAVACMD=`cygpath --unix "$JAVACMD"`

‎gradlew.bat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

‎springwolf-add-ons/springwolf-common-model-converters/build.gradle

Lines changed: 35 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -36,89 +36,48 @@ test {
3636
jar.enabled = true
3737
bootJar.enabled = false
3838

39-
task javadocJar(type: Jar) {
40-
classifier = 'javadoc'
41-
from javadoc
42-
}
43-
44-
task sourcesJar(type: Jar) {
45-
classifier = 'sources'
46-
from sourceSets.main.allSource
47-
}
48-
49-
artifacts {
50-
archives javadocJar, sourcesJar
51-
}
52-
53-
signing {
54-
sign configurations.archives
55-
56-
useInMemoryPgpKeys project.findProperty("SIGNINGKEY"), project.findProperty("SIGNINGPASSWORD")
57-
}
58-
59-
def pomConfig = {
60-
licenses {
61-
license {
62-
name 'The Apache License, Version 2.0'
63-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
64-
}
65-
}
66-
67-
developers {
68-
developer {
69-
id 'stavshamir'
70-
name 'Stav Shamir'
71-
email 'shamir.stav@gmail.com'
72-
}
73-
}
74-
75-
scm {
76-
url 'https://github.com/springwolf/springwolf-core'
77-
}
39+
java {
40+
withJavadocJar()
41+
withSourcesJar()
7842
}
7943

8044
publishing {
8145
publications {
8246
mavenJava(MavenPublication) {
8347
from components.java
8448

85-
artifact sourcesJar {
86-
classifier "sources"
87-
}
88-
89-
artifact javadocJar {
90-
classifier "javadoc"
91-
}
92-
93-
groupId project.group
9449
artifactId 'springwolf-common-model-converters'
50+
groupId project.group
9551
version project.version
9652

97-
pom.withXml {
98-
def root = asNode()
99-
root.appendNode('description', 'Common model converters beans for Springwolf')
100-
root.appendNode('name', 'springwolf-common-model-converters')
101-
root.appendNode('url', 'https://github.com/springwolf/springwolf-core')
102-
root.children().last() + pomConfig
103-
104-
def pomFile = file("${project.buildDir}/generated-pom.xml")
105-
writeTo(pomFile)
106-
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
107-
artifact(pomAscFile) {
108-
classifier = null
109-
extension = 'pom.asc'
53+
pom {
54+
name = 'springwolf-common-model-converters'
55+
description = 'Common model converters beans for Springwolf'
56+
url = 'https://springwolf.github.io/'
57+
58+
licenses {
59+
license {
60+
name = 'The Apache License, Version 2.0'
61+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
62+
}
11063
}
111-
}
11264

113-
project.tasks.signArchives.signatureFiles.each {
114-
artifact(it) {
115-
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
116-
if (matcher.find()) {
117-
classifier = matcher.group(1)
118-
} else {
119-
classifier = null
65+
developers {
66+
developer {
67+
id = 'stavshamir'
68+
name = 'Stav Shamir'
69+
email = 'shamir.stav@gmail.com'
12070
}
121-
extension = 'jar.asc'
71+
72+
developer {
73+
id = 'timonback'
74+
name = 'Timon Back'
75+
email = 'timon.back+springwolf@gmail.com'
76+
}
77+
}
78+
79+
scm {
80+
url = 'https://github.com/stavshamir/springwolf'
12281
}
12382
}
12483
}
@@ -135,13 +94,11 @@ publishing {
13594
}
13695
}
13796
}
97+
}
13898

139-
model {
140-
tasks.publishMavenJavaPublicationToMavenLocal {
141-
dependsOn project.tasks.signArchives
142-
}
143-
tasks.publishMavenJavaPublicationToMavenRepository {
144-
dependsOn project.tasks.signArchives
145-
}
146-
}
99+
signing {
100+
def signingKey = project.findProperty("SIGNINGKEY")
101+
def signingPassword = project.findProperty("SIGNINGPASSWORD")
102+
useInMemoryPgpKeys(signingKey, signingPassword)
103+
sign publishing.publications.mavenJava
147104
}

‎springwolf-core/build.gradle

Lines changed: 37 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'java'
33
id 'java-library'
4-
id 'maven'
54
id 'signing'
65
id 'maven-publish'
76

@@ -49,87 +48,48 @@ dependencies {
4948
jar.enabled = true
5049
bootJar.enabled = false
5150

52-
task javadocJar(type: Jar) {
53-
classifier = 'javadoc'
54-
from javadoc
55-
}
56-
57-
task sourcesJar(type: Jar) {
58-
classifier = 'sources'
59-
from sourceSets.main.allSource
60-
}
61-
62-
artifacts {
63-
archives javadocJar, sourcesJar
64-
}
65-
66-
signing {
67-
sign configurations.archives
68-
useInMemoryPgpKeys project.findProperty("SIGNINGKEY"), project.findProperty("SIGNINGPASSWORD")
69-
}
70-
71-
def pomConfig = {
72-
licenses {
73-
license {
74-
name 'The Apache License, Version 2.0'
75-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
76-
}
77-
}
78-
79-
developers {
80-
developer {
81-
id 'stavshamir'
82-
name 'Stav Shamir'
83-
email 'shamir.stav@gmail.com'
84-
}
85-
}
86-
87-
scm {
88-
url 'https://github.com/stavshamir/springwolf'
89-
}
51+
java {
52+
withJavadocJar()
53+
withSourcesJar()
9054
}
9155

9256
publishing {
9357
publications {
9458
mavenJava(MavenPublication) {
9559
from components.java
9660

97-
artifact sourcesJar {
98-
classifier "sources"
99-
}
100-
101-
artifact javadocJar {
102-
classifier "javadoc"
103-
}
104-
105-
groupId project.group
10661
artifactId 'springwolf-core'
62+
groupId project.group
10763
version project.version
108-
pom.withXml {
109-
def root = asNode()
110-
root.appendNode('description', 'Automated JSON API documentation for async APIs (Kafka etc.) interfaces built with Spring')
111-
root.appendNode('name', 'springwolf-core')
112-
root.appendNode('url', 'https://github.com/stavshamir/springwolf')
113-
root.children().last() + pomConfig
114-
115-
def pomFile = file("${project.buildDir}/generated-pom.xml")
116-
writeTo(pomFile)
117-
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
118-
artifact(pomAscFile) {
119-
classifier = null
120-
extension = 'pom.asc'
64+
65+
pom {
66+
name = 'springwolf-core'
67+
description = 'Automated JSON API documentation for async APIs (Kafka etc.) interfaces built with Spring'
68+
url = 'https://springwolf.github.io'
69+
70+
licenses {
71+
license {
72+
name = 'The Apache License, Version 2.0'
73+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
74+
}
12175
}
122-
}
12376

124-
project.tasks.signArchives.signatureFiles.each {
125-
artifact(it) {
126-
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
127-
if (matcher.find()) {
128-
classifier = matcher.group(1)
129-
} else {
130-
classifier = null
77+
developers {
78+
developer {
79+
id = 'stavshamir'
80+
name = 'Stav Shamir'
81+
email = 'shamir.stav@gmail.com'
82+
}
83+
84+
developer {
85+
id = 'timonback'
86+
name = 'Timon Back'
87+
email = 'timon.back+springwolf@gmail.com'
13188
}
132-
extension = 'jar.asc'
89+
}
90+
91+
scm {
92+
url = 'https://github.com/stavshamir/springwolf'
13393
}
13494
}
13595
}
@@ -146,13 +106,12 @@ publishing {
146106
}
147107
}
148108
}
109+
}
149110

150-
model {
151-
tasks.publishMavenJavaPublicationToMavenLocal {
152-
dependsOn project.tasks.signArchives
153-
}
154-
tasks.publishMavenJavaPublicationToMavenRepository {
155-
dependsOn project.tasks.signArchives
156-
}
157-
}
111+
signing {
112+
def signingKey = project.findProperty("SIGNINGKEY")
113+
def signingPassword = project.findProperty("SIGNINGPASSWORD")
114+
useInMemoryPgpKeys (signingKey, signingPassword)
115+
sign publishing.publications.mavenJava
158116
}
117+

0 commit comments

Comments
 (0)