Skip to content
This repository was archived by the owner on Nov 10, 2025. It is now read-only.

Commit 3ac6e70

Browse files
committed
Upgrade to Gradle 8.4
* Exclude Artifactory setting if not `isCI` * Enable debug for SNAPSHOT GHA to see what is going on with JFrog build-info
1 parent 68f0a99 commit 3ac6e70

File tree

4 files changed

+27
-25
lines changed

4 files changed

+27
-25
lines changed

.github/workflows/spring-artifactory-gradle-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
4242
- name: Build and Publish
4343
run: |
44-
jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish
44+
jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish -d -x test
4545
jf rt build-publish
4646

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

publish-maven.gradle

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,24 @@ publishing {
5454
}
5555
}
5656

57-
artifactory {
58-
publish {
59-
defaults {
60-
def zipArtifactProps =
61-
['zip.name': 'spring-integration-aws',
62-
'zip.displayname': 'Spring Integration Aws',
63-
'zip.deployed': 'false']
64-
properties {
65-
mavenJava zipArtifactProps, '*:*:*:*@zip'
66-
mavenJava 'zip.type': 'docs', '*:*:*:docs@zip'
67-
mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
57+
if (isCI) {
58+
artifactory {
59+
publish {
60+
defaults {
61+
def zipArtifactProps =
62+
['zip.name': 'spring-integration-aws',
63+
'zip.displayname': 'Spring Integration Aws',
64+
'zip.deployed': 'false']
65+
properties {
66+
mavenJava zipArtifactProps, '*:*:*:*@zip'
67+
mavenJava 'zip.type': 'docs', '*:*:*:docs@zip'
68+
mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
69+
}
6870
}
6971
}
7072
}
71-
}
7273

73-
artifactoryPublish {
74-
publications(publishing.publications.mavenJava)
75-
}
74+
artifactoryPublish {
75+
publications(publishing.publications.mavenJava)
76+
}
77+
}

0 commit comments

Comments
 (0)