Skip to content

Commit 176990a

Browse files
Upgrade to Gradle 6.5
assemble and check seem to be functional, haven't tried publishing yet.
1 parent 421b4ff commit 176990a

File tree

5 files changed

+88
-52
lines changed

5 files changed

+88
-52
lines changed

build.gradle

+31-28
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ buildscript {
66
}
77

88
plugins {
9-
id 'net.researchgate.release' version '2.6.0'
10-
id "com.jfrog.bintray" version "1.7.3"
9+
id 'net.researchgate.release' version '2.8.1'
10+
id "com.jfrog.bintray" version "1.8.5"
1111
id 'com.sourcemuse.mongo' version '1.0.7'
1212
}
1313

1414
allprojects {
1515
repositories {
1616
jcenter()
1717
}
18-
apply plugin: 'maven'
1918
apply plugin: 'maven-publish'
2019
apply plugin: 'java'
2120
}
@@ -24,21 +23,20 @@ apply plugin: 'groovy'
2423
apply plugin: 'idea'
2524
apply plugin: 'com.sourcemuse.mongo'
2625

26+
archivesBaseName = 'quartz-mongodb'
27+
projectVersion = "2.2.0-rc1"
28+
2729
jar {
28-
baseName = 'quartz-mongodb'
29-
version = version
30+
archiveVersion = projectVersion
3031
}
3132

3233
repositories {
3334
mavenCentral()
3435
}
3536

36-
sourceCompatibility = 1.8
37-
targetCompatibility = 1.8
38-
3937
configurations {
4038
provided
41-
compile.extendsFrom provided
39+
implementation.extendsFrom provided
4240
}
4341
sourceSets {
4442
main { compileClasspath += configurations.provided }
@@ -50,22 +48,22 @@ idea {
5048
}
5149
}
5250
dependencies {
53-
compile("org.quartz-scheduler:quartz:2.3.2")
54-
compile("org.mongodb:mongodb-driver-sync:4.0.5")
55-
compile("commons-codec:commons-codec:1.10")
56-
compile("org.apache.commons:commons-lang3:3.8")
57-
compile("org.apache.httpcomponents:httpcore:4.4.10")
58-
compile("org.slf4j:slf4j-api:1.7.21")
51+
implementation("org.quartz-scheduler:quartz:2.3.2")
52+
implementation("org.mongodb:mongodb-driver-sync:4.0.5")
53+
implementation("commons-codec:commons-codec:1.10")
54+
implementation("org.apache.commons:commons-lang3:3.8")
55+
implementation("org.apache.httpcomponents:httpcore:4.4.10")
56+
implementation("org.slf4j:slf4j-api:1.7.21")
5957

6058
compileOnly("org.clojure:clojure:1.10.0")
6159

62-
testCompile("org.clojure:clojure:1.10.0")
63-
testCompile("joda-time:joda-time:2.8.2")
64-
testCompile("org.slf4j:slf4j-simple:1.7.10")
65-
testCompile("org.codehaus.groovy:groovy-all:2.5.12")
66-
testCompile("org.spockframework:spock-core:1.3-groovy-2.5")
67-
testRuntime("cglib:cglib-nodep:3.1")
68-
testRuntime("org.objenesis:objenesis:2.1")
60+
testImplementation("org.clojure:clojure:1.10.0")
61+
testImplementation("joda-time:joda-time:2.8.2")
62+
testImplementation("org.slf4j:slf4j-simple:1.7.10")
63+
testImplementation("org.codehaus.groovy:groovy-all:2.5.12")
64+
testImplementation("org.spockframework:spock-core:1.3-groovy-2.5")
65+
testRuntimeOnly("cglib:cglib-nodep:3.1")
66+
testRuntimeOnly("org.objenesis:objenesis:2.1")
6967
}
7068

7169
release {
@@ -95,18 +93,23 @@ artifacts {
9593
archives javadocJar
9694
}
9795

96+
java {
97+
withJavadocJar()
98+
withSourcesJar()
99+
}
98100

99101
publishing {
100102
publications {
101103
QuartzMongoDB(MavenPublication) {
102-
from components.java
103-
groupId 'com.novemberain'
104-
artifactId(jar.baseName)
105-
version(projectVersion)
104+
groupId = 'com.novemberain'
105+
artifactId = archivesBaseName
106+
version = projectVersion
106107

107108
artifact sourceJar {
108109
classifier "sources"
109110
}
111+
112+
from components.java
110113
}
111114
}
112115
}
@@ -152,8 +155,8 @@ bintray {
152155

153156
version {
154157
name = projectVersion
155-
desc = 'MongoDB-backed job store for the Quartz scheduler'
156-
vcsTag = projectVersion
158+
desc = 'MongoDB-backed job store for the Quartz scheduler'
159+
vcsTag = projectVersion
157160
}
158161
}
159162
}

gradle/wrapper/gradle-wrapper.jar

3.63 KB
Binary file not shown.
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 14 19:51:46 MSK 2019
1+
#Tue Jul 14 22:34:43 MSK 2020
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
23
distributionBase=GRADLE_USER_HOME
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

gradlew

+33-20
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='"-Xmx64m"'
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"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

gradlew.bat

+21-1
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
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@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="-Xmx64m"
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
6584

6685
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6786

87+
6888
@rem Execute Gradle
6989
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
7090

0 commit comments

Comments
 (0)