diff --git a/build.gradle b/build.gradle index bd8ff50a0..43873c3b7 100644 --- a/build.gradle +++ b/build.gradle @@ -49,10 +49,15 @@ allprojects { configurations.all { transitive = false// 为本依赖关闭依赖传递特性 } - //java Version - sourceCompatibility = 17 - targetCompatibility = 17 + + java { + //java Version + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + compileJava.options.encoding = 'UTF-8' + compileJava.options.compilerArgs.add("-parameters") eclipse { /*设置工程字符集*/ @@ -79,10 +84,8 @@ buildscript { // In this section you declare where to find the dependencies of your project repositories { - // Use 'jcenter' for resolving your dependencies. // You can declare any Maven/Ivy/file repository here. mavenCentral() - jcenter() } @@ -104,19 +107,19 @@ subprojects { repositories { mavenLocal() - maven { url "https://maven.aliyun.com/repository/central"} - maven { url "https://maven.aliyun.com/repository/public/"} - maven { url "https://repo.spring.io/plugins-release" } - maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo1.maven.org/maven2" } - maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" } - maven { url "https://mvnrepository.com/repos/central" } - maven { url "https://jcenter.bintray.com" } - maven { url "https://mvn.gt.igexin.com/nexus/content/repositories/releases"} - maven { url "https://plugins.gradle.org/m2" } - maven { url "https://oss.sonatype.org/content/repositories/releases" } - maven { url "https://maven.repository.redhat.com/ga" } - maven { url "https://repository.apache.org/content/repositories/releases" } + maven { url = "https://maven.aliyun.com/repository/central"} + maven { url = "https://maven.aliyun.com/repository/public/"} + maven { url = "https://repo.spring.io/plugins-release" } + maven { url = "https://repo.spring.io/milestone" } + maven { url = "https://repo1.maven.org/maven2" } + maven { url = "https://build.shibboleth.net/nexus/content/repositories/releases" } + maven { url = "https://mvnrepository.com/repos/central" } + maven { url = "https://jcenter.bintray.com" } + maven { url = "https://mvn.gt.igexin.com/nexus/content/repositories/releases"} + maven { url = "https://plugins.gradle.org/m2" } + maven { url = "https://oss.sonatype.org/content/repositories/releases" } + maven { url = "https://maven.repository.redhat.com/ga" } + maven { url = "https://repository.apache.org/content/repositories/releases" } mavenCentral() } diff --git a/gradle-version.bat b/gradle-version.bat new file mode 100644 index 000000000..21d544ad7 --- /dev/null +++ b/gradle-version.bat @@ -0,0 +1,9 @@ +echo off + +call setEnvVars.bat + +set GRADLE_VERSION=9.1.0 + +gradlew.bat wrapper --gradle-version %GRADLE_VERSION% + +pause \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b28bf3d02..a78912738 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,6 +39,7 @@ springDataVersion =3.5.5 springkafkaVersion =3.3.10 springretryVersion =2.0.11 #spring plugin +springbootpluginVersion =3.4.11 springplugincoreVersion =3.0.0 springpluginmetadataVersion =3.0.0 #spring cloud diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..e6441136f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db26354a9..2e1113280 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421..b740cf133 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index a4d015e9a..e564e589c 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -1,21 +1,15 @@ buildscript { - repositories { - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/'} - } dependencies { //springboot jar - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springbootpluginVersion}") } } plugins { - id 'java' - id "io.spring.dependency-management" version "1.0.11.RELEASE" - id 'org.springframework.boot' version "${springBootVersion}" + id 'java' //add support for Java + id 'org.springframework.boot' version "${springbootpluginVersion}" } -apply plugin: 'io.spring.dependency-management' - description = "maxkey-web-maxkey" bootJar { diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 73635ad38..cbd93945f 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -1,28 +1,17 @@ buildscript { - repositories { - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/'} - } dependencies { //springboot jar - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springbootpluginVersion}") } } plugins { - id 'org.springframework.boot' version "${springBootVersion}" - id "io.spring.dependency-management" version "1.0.11.RELEASE" + id 'java' //add support for Java + id 'org.springframework.boot' version "${springbootpluginVersion}" } description = "maxkey-web-mgt" -//springboot jar -apply plugin: 'io.spring.dependency-management' - -//add support for Java -apply plugin: 'java' - - - bootJar { dependsOn jar archiveBaseName = 'maxkey-mgt-boot' diff --git a/maxkey-webs/maxkey-web-openapi/build.gradle b/maxkey-webs/maxkey-web-openapi/build.gradle index 8216fcaac..ff8e8c9fa 100644 --- a/maxkey-webs/maxkey-web-openapi/build.gradle +++ b/maxkey-webs/maxkey-web-openapi/build.gradle @@ -1,28 +1,17 @@ buildscript { - repositories { - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/'} - } dependencies { //springboot jar - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springbootpluginVersion}") } } plugins { - id 'org.springframework.boot' version "${springBootVersion}" - id "io.spring.dependency-management" version "1.0.11.RELEASE" + id 'java' //add support for Java + id 'org.springframework.boot' version "${springbootpluginVersion}" } description = "maxkey-web-openapi" -//springboot jar -apply plugin: 'io.spring.dependency-management' - -//add support for Java -apply plugin: 'java' - - - bootJar { dependsOn jar archiveBaseName = 'maxkey-openapi-boot' diff --git a/setEnvVars.bat b/setEnvVars.bat index 15a31bc21..2e7391388 100644 --- a/setEnvVars.bat +++ b/setEnvVars.bat @@ -1,9 +1,9 @@ echo off echo set env set JAVA_HOME=C:\IDE\jdk-17 -set GRADLE_HOME=C:\ide\gradle-8.8 +set GRADLE_HOME=C:\ide\gradle-9.1.0 -set MXK_VERSION=4.1.9.1 +set MXK_VERSION=4.1.10 set MXK_REPOSITORY=maxkeytop call %JAVA_HOME%/bin/java -version