Skip to content

Commit 482ec65

Browse files
tisonkuntisonkun
authored
Upgrade Gradle and Gralde Node Plugin to fix build issues (#510)
*(If this PR fixes a github issue, please add `Fixes #<xyz>`.)* Fixes #<xyz> *(or if this PR is one task of a github issue, please add `Master Issue: #<xyz>` to link to the master issue.)* Master Issue: #<xyz> ### Motivation *Explain here the context, and why you're making that change. What is the problem you're trying to solve.* ### Modifications *Describe the modifications you've done.* ### Verifying this change - [ ] Make sure that the change passes the `./gradlew build` checks. Signed-off-by: tison <wander4096@gmail.com>
1 parent bb837de commit 482ec65

File tree

7 files changed

+351
-282
lines changed

7 files changed

+351
-282
lines changed

‎.github/workflows/gradle.yml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
name: Java CI
219

3-
on:
20+
on:
421
push:
5-
branches:
6-
- master
7-
pull_request:
8-
branches:
9-
- master
22+
branches: [master]
23+
pull_request: [master]
1024

1125
jobs:
1226
build:
13-
1427
runs-on: ubuntu-latest
15-
1628
steps:
17-
- uses: actions/checkout@v2
18-
- name: Set up JDK 1.8
19-
uses: actions/setup-java@v1
20-
with:
21-
java-version: 1.8
22-
- name: Build with Gradle
23-
run: ./gradlew build
29+
- uses: actions/checkout@v3
30+
- name: Set up JDK 1.8
31+
uses: actions/setup-java@v3
32+
with:
33+
java-version: 1.8
34+
- name: Build with Gradle
35+
run: ./gradlew build

‎build.gradle

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ configurations {
4545
all*.exclude group: 'log4j', module: 'log4j'
4646
}
4747

48-
dependencies {
49-
}
50-
51-
task wrapper(type: Wrapper) {
52-
gradleVersion = '4.8.1'
53-
}
48+
dependencies {}
5449

5550
apply from: 'gradle/license.gradle'
5651
apply plugin: 'io.spring.dependency-management'
@@ -69,8 +64,10 @@ task licenseCheckNode(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
6964
}
7065

7166
// Add VERSION
72-
task incrementVersion<<{
73-
new File(projectDir, "VERSION").text = version
67+
task incrementVersion {
68+
doLast {
69+
new File(projectDir, "VERSION").text = version
70+
}
7471
}
7572

7673
dependencyManagement {
@@ -105,59 +102,63 @@ jar {
105102
ext['log4j2.version'] = '2.17.1'
106103

107104
dependencies {
108-
compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
109-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
110-
compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-zuul', version: springBootVersion
111-
compile group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: springMybatisVersion
112-
compile group: 'com.github.pagehelper', name: 'pagehelper', version: pagehelperVersion
113-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: springBootVersion
114-
compile group: 'org.postgresql', name: 'postgresql', version: postgresqlVersion
115-
compile (group: 'org.herddb', name: 'herddb-jdbc', version: herddbVersion) {
105+
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
106+
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
107+
testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
108+
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
109+
110+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
111+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
112+
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-zuul', version: springBootVersion
113+
implementation group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: springMybatisVersion
114+
implementation group: 'com.github.pagehelper', name: 'pagehelper', version: pagehelperVersion
115+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: springBootVersion
116+
implementation group: 'org.postgresql', name: 'postgresql', version: postgresqlVersion
117+
implementation (group: 'org.herddb', name: 'herddb-jdbc', version: herddbVersion) {
116118
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
117119
}
118-
compile group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion
119-
compile group: 'org.hibernate', name: 'hibernate-validator', 'version': hibernateValidatorVersion
120-
compile group: 'io.jsonwebtoken', name: 'jjwt-api', version: jsonWebTokenApiVersion
121-
compile group: 'io.jsonwebtoken', name: 'jjwt-impl', version: jsonWebTokenImplVersion
122-
compile group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: jsonWebTokenImplVersion
123-
compile group: 'com.github.pagehelper', name: 'pagehelper-spring-boot-starter', version: pageHelperVersion
124-
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
125-
compile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
126-
compile group: 'org.apache.pulsar', name: 'pulsar-common', version: pulsarVersion
127-
compile group: 'org.apache.pulsar', name: 'pulsar-client-admin-original', version: pulsarVersion
128-
compile group: 'org.apache.pulsar', name: 'pulsar-client-auth-athenz', version: pulsarVersion
129-
compile group: 'org.apache.pulsar', name: 'pulsar-client-auth-sasl', version: pulsarVersion
130-
compile group: 'com.yahoo.athenz', name: 'athenz-zts-java-client', version: athenzVersion
131-
compile group: 'io.springfox', name: 'springfox-swagger2', version: swagger2Version
132-
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: swaggeruiVersion
133-
compile group: 'org.apache.pulsar', name: 'pulsar-broker', version: pulsarVersion
134-
compile group: 'commons-validator', name: 'commons-validator', version: commonsValidatorVersion
135-
compile (group: 'org.bkvm', name: 'bkvm', version: bkvmVersion, ext: 'war', classifier:'war-no-libs') {
120+
implementation group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion
121+
implementation group: 'org.hibernate', name: 'hibernate-validator', 'version': hibernateValidatorVersion
122+
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: jsonWebTokenApiVersion
123+
implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: jsonWebTokenImplVersion
124+
implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: jsonWebTokenImplVersion
125+
implementation group: 'com.github.pagehelper', name: 'pagehelper-spring-boot-starter', version: pageHelperVersion
126+
implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
127+
implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
128+
implementation group: 'org.apache.pulsar', name: 'pulsar-common', version: pulsarVersion
129+
implementation group: 'org.apache.pulsar', name: 'pulsar-client-admin-original', version: pulsarVersion
130+
implementation group: 'org.apache.pulsar', name: 'pulsar-client-auth-athenz', version: pulsarVersion
131+
implementation group: 'org.apache.pulsar', name: 'pulsar-client-auth-sasl', version: pulsarVersion
132+
implementation group: 'com.yahoo.athenz', name: 'athenz-zts-java-client', version: athenzVersion
133+
implementation group: 'io.springfox', name: 'springfox-swagger2', version: swagger2Version
134+
implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: swaggeruiVersion
135+
implementation group: 'org.apache.pulsar', name: 'pulsar-broker', version: pulsarVersion
136+
implementation group: 'commons-validator', name: 'commons-validator', version: commonsValidatorVersion
137+
implementation (group: 'org.bkvm', name: 'bkvm', version: bkvmVersion, ext: 'war', classifier:'war-no-libs') {
136138
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
137139
exclude group: 'org.herddb', module: '*'
138140
}
139-
compile (group: 'org.bkvm', name: 'bkvm', version: bkvmVersion, classifier:'classes') {
141+
implementation (group: 'org.bkvm', name: 'bkvm', version: bkvmVersion, classifier:'classes') {
140142
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
141143
exclude group: 'org.herddb', module: '*'
142144
}
143-
compile (group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: tomcatVersion)
144-
compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version: jerseyVersion
145-
compile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: jerseyVersion
146-
compile group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jerseyVersion
147-
compile group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVersion
148-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security'
149-
compile group: 'org.springframework.security', name: 'spring-security-config'
150-
compile group: 'org.casbin', name: 'casdoor-spring-boot-starter', version: '1.3.0'
151-
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
145+
implementation (group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: tomcatVersion)
146+
implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version: jerseyVersion
147+
implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: jerseyVersion
148+
implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jerseyVersion
149+
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVersion
150+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
151+
implementation group: 'org.springframework.security', name: 'spring-security-config'
152+
implementation group: 'org.casbin', name: 'casdoor-spring-boot-starter', version: '1.3.0'
152153
compileOnly group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springBootVersion
153-
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
154-
testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
155-
testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: apiMockitoVersion
156-
testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: mockitoJunit4Version
154+
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
155+
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
156+
testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: apiMockitoVersion
157+
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: mockitoJunit4Version
157158

158159
constraints {
159-
compile("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}")
160-
compile("org.bouncycastle:bcprov-ext-jdk15on:${bouncycastleVersion}")
161-
compile("org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}")
160+
implementation("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}")
161+
implementation("org.bouncycastle:bcprov-ext-jdk15on:${bouncycastleVersion}")
162+
implementation("org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}")
162163
}
163164
}

‎front-end/build.gradle

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,14 @@
1212
* limitations under the License.
1313
*/
1414

15-
buildscript {
16-
repositories {
17-
mavenCentral()
18-
maven {
19-
url "https://plugins.gradle.org/m2/"
20-
}
21-
}
22-
dependencies {
23-
classpath 'com.moowork.gradle:gradle-node-plugin:1.2.0'
24-
}
15+
plugins {
16+
id 'base'
17+
id "com.github.node-gradle.node" version "3.5.1"
2518
}
26-
apply plugin: 'base'
27-
apply plugin: 'com.moowork.node' // gradle-node-plugin
2819

2920
node {
30-
/* gradle-node-plugin configuration
31-
https://github.com/srs/gradle-node-plugin/blob/master/docs/node.md
32-
Task name pattern:
33-
./gradlew npm_<command> Executes an NPM command.
34-
*/
35-
// Version of node to use.
3621
version = '10.14.1'
37-
// Version of npm to use.
3822
npmVersion = '6.4.1'
39-
// If true, it will download node using above parameters.
40-
// If false, it will try to use globally installed node.
4123
download = true
4224
}
4325

@@ -50,6 +32,5 @@ task npmBuildProd(type: NpmTask) {
5032
args = ['run', 'build:prod']
5133
}
5234

53-
5435
assemble.dependsOn npm_run_build
5536

‎gradle/wrapper/gradle-wrapper.jar

6.19 KB
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-4.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)