Spring/spring-credhub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2.2.x: Bump io.spring.javaformat from 0.0.39 to 0.0.40 (#182)

Browse Source 
* 2.2.x: Bump io.spring.javaformat from 0.0.39 to 0.0.40

Bumps [io.spring.javaformat](https://github.com/spring-io/spring-javaformat) from 0.0.39 to 0.0.40.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.39...v0.0.40)

---
updated-dependencies:
- dependency-name: io.spring.javaformat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix Gradle configurations

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abel Salgado Romero <romeroab@vmware.com>
This commit is contained in:
dependabot[bot]
2023-11-24 13:46:48 +01:00
committed by GitHub
parent aa1b782fa3
commit 282906268b
9 changed files with 51 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

37
gradlew vendored
View File

@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -175,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

27
gradlew.bat vendored
View File

@@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell

12
spring-credhub-core/build.gradle
View File

@@ -25,16 +25,16 @@ dependencyManagement {
description = 'Spring CredHub Core'
dependencies {
compile("org.springframework:spring-core")
compile("org.springframework:spring-beans")
compile("org.springframework:spring-context")
compile("org.springframework:spring-web")
compile("com.fasterxml.jackson.core:jackson-databind:2.12.7")
api("org.springframework:spring-core")
api("org.springframework:spring-beans")
api("org.springframework:spring-context")
api("org.springframework:spring-web")
api("com.fasterxml.jackson.core:jackson-databind:2.12.7")
reactiveImplementation("org.springframework:spring-webflux")
reactiveImplementation("io.projectreactor.netty:reactor-netty")
compile("org.springframework.security:spring-security-oauth2-client") {
api("org.springframework.security:spring-security-oauth2-client") {
exclude module: "spring-security-web"
}
securityImplementation("org.springframework.security:spring-security-config")

6
spring-credhub-docs/build.gradle
View File

@@ -32,9 +32,9 @@ configurations {
}
dependencies {
compile project(":spring-credhub-core")
compile("io.projectreactor:reactor-core")
compile("org.springframework.boot:spring-boot-autoconfigure")
implementation project(":spring-credhub-core")
implementation("io.projectreactor:reactor-core")
implementation("org.springframework.boot:spring-boot-autoconfigure")
asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.7"
}

16
spring-credhub-integration-tests/build.gradle
View File

@@ -32,20 +32,20 @@ apply plugin: 'eclipse'
apply plugin: 'org.springframework.boot'
dependencies {
compile project(":spring-credhub-starter")
compile("org.springframework.boot:spring-boot-starter")
testImplementation project(":spring-credhub-starter")
testImplementation("org.springframework.boot:spring-boot-starter")
compile("org.springframework.boot:spring-boot-starter-web")
testImplementation("org.springframework.boot:spring-boot-starter-web")
compile("org.springframework.security:spring-security-config")
compile("org.springframework.security:spring-security-oauth2-client")
testImplementation("org.springframework.security:spring-security-config")
testImplementation("org.springframework.security:spring-security-oauth2-client")
if (project.hasProperty("useOkHttp3")) {
compile("com.squareup.okhttp3:okhttp")
implementation("com.squareup.okhttp3:okhttp")
} else if (project.hasProperty("useNetty")) {
compile("io.netty:netty-all")
implementation("io.netty:netty-all")
} else {
compile("org.apache.httpcomponents:httpclient")
implementation("org.apache.httpcomponents:httpclient")
}
testImplementation("org.springframework.boot:spring-boot-starter-test")

12
spring-credhub-reactive-integration-tests/build.gradle
View File

@@ -32,14 +32,14 @@ apply plugin: 'eclipse'
apply plugin: 'org.springframework.boot'
dependencies {
compile project(":spring-credhub-starter")
compile("org.springframework.boot:spring-boot-starter")
implementation project(":spring-credhub-starter")
implementation("org.springframework.boot:spring-boot-starter")
compile("org.springframework.boot:spring-boot-starter-webflux")
compile("io.projectreactor.netty:reactor-netty")
implementation("org.springframework.boot:spring-boot-starter-webflux")
implementation("io.projectreactor.netty:reactor-netty")
compile("org.springframework.security:spring-security-config")
compile("org.springframework.security:spring-security-oauth2-client")
implementation("org.springframework.security:spring-security-config")
implementation("org.springframework.security:spring-security-oauth2-client")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.projectreactor:reactor-test")

4
spring-credhub-starter/build.gradle
View File

@@ -23,8 +23,8 @@ dependencyManagement {
description = 'Spring CredHub Starter'
dependencies {
compile project(':spring-credhub-core')
compile("org.springframework.boot:spring-boot-autoconfigure")
api project(':spring-credhub-core')
api("org.springframework.boot:spring-boot-autoconfigure")
reactiveImplementation("org.springframework.boot:spring-boot-starter-webflux")