Skip to content

Commit 6a8ab1f

Browse files
rainboyanrainboyan
committed
Cleanup build srcripts in examples
See gh-10
1 parent dd4f682 commit 6a8ab1f

File tree

10 files changed

+45
-97
lines changed

10 files changed

+45
-97
lines changed

‎examples/grace-hibernate5-mongodb/build.gradle‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
group "examples"
1+
group = "examples"
22

33
dependencies {
44
implementation "org.springframework.boot:spring-boot-starter-logging"
55
implementation "org.springframework.boot:spring-boot-autoconfigure"
66
implementation "org.springframework.boot:spring-boot-starter-actuator"
77
implementation "org.springframework.boot:spring-boot-starter-web"
8-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
9-
implementation "org.graceframework:grace-core:$graceVersion"
10-
implementation "org.graceframework:grace-boot:$graceVersion"
11-
implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
12-
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
8+
implementation "org.graceframework:grace-core"
9+
implementation "org.graceframework:grace-boot"
10+
implementation "org.graceframework:grace-plugin-gsp"
1311
implementation project(":grace-plugin")
14-
implementation "org.graceframework.plugins:hibernate:$hibernatePluginVersion"
15-
implementation "org.hibernate:hibernate-ehcache:$hibernateCoreVersion"
12+
implementation "org.graceframework.plugins:hibernate"
1613

1714
runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion"
1815
runtimeOnly "com.h2database:h2"
19-
runtimeOnly "org.graceframework.plugins:scaffolding:$scaffolingVersion"
20-
runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion"
16+
runtimeOnly "org.graceframework.plugins:scaffolding"
17+
runtimeOnly "org.graceframework.plugins:fields"
2118

22-
testImplementation "org.graceframework:grace-test-support:$testingSupportVersion"
19+
testImplementation "org.graceframework:grace-test-support"
2320
testImplementation "org.testcontainers:mongodb:1.19.0"
2421
testImplementation "io.netty:netty-transport:4.1.72.Final"
2522
testImplementation "io.netty:netty-codec:4.1.72.Final"
@@ -45,10 +42,11 @@ tasks.withType(Test) {
4542
}
4643

4744
webdriverBinaries {
48-
if (!System.getenv().containsKey('CI')) {
49-
chromedriver "$chromeDriverVersion"
50-
geckodriver "$geckodriverVersion"
45+
chromedriver {
46+
version = '126.0.6478.126'
47+
fallbackTo32Bit = true
5148
}
49+
geckodriver '0.33.0'
5250
}
5351
//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug','-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
5452

‎examples/grace-hibernate5-mongodb/gradle.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/grace-mongodb-database-per-tenant/build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1+
group = "examples"
2+
13
dependencies {
24
implementation "org.springframework.boot:spring-boot-starter-logging"
35
implementation "org.springframework.boot:spring-boot-autoconfigure"
46
implementation "org.springframework.boot:spring-boot-starter-actuator"
57
implementation "org.springframework.boot:spring-boot-starter-web"
6-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
7-
implementation "org.graceframework:grace-core:$graceVersion"
8-
implementation "org.graceframework:grace-boot:$graceVersion"
9-
implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
8+
implementation "org.graceframework:grace-core"
9+
implementation "org.graceframework:grace-boot"
10+
implementation "org.graceframework:grace-plugin-gsp"
1011
implementation project(":grace-plugin")
1112

1213
runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion"
1314
runtimeOnly "com.h2database:h2"
1415

15-
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
16-
runtimeOnly "org.graceframework.plugins:scaffolding:$scaffolingVersion"
17-
runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion"
16+
runtimeOnly "org.graceframework.plugins:scaffolding"
17+
runtimeOnly "org.graceframework.plugins:fields"
1818

19-
testImplementation "org.graceframework:grace-test-support:$testingSupportVersion"
19+
testImplementation "org.graceframework:grace-test-support"
2020
testImplementation "org.graceframework.plugins:geb"
2121
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
2222
testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
@@ -38,8 +38,9 @@ tasks.withType(Test) {
3838
}
3939

4040
webdriverBinaries {
41-
if (!System.getenv().containsKey('CI')) {
42-
chromedriver "$chromeDriverVersion"
43-
geckodriver "$geckodriverVersion"
41+
chromedriver {
42+
version = '126.0.6478.126'
43+
fallbackTo32Bit = true
4444
}
45-
}
45+
geckodriver '0.33.0'
46+
}

‎examples/grace-mongodb-database-per-tenant/gradle.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/grace-mongodb/build.gradle‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1-
group "examples"
1+
group = "examples"
22

33
dependencies {
44
implementation "org.springframework.boot:spring-boot-starter-logging"
55
implementation "org.springframework.boot:spring-boot-autoconfigure"
66
implementation "org.springframework.boot:spring-boot-starter-actuator"
77
implementation "org.springframework.boot:spring-boot-starter-web"
8-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
9-
implementation "org.graceframework:grace-core:$graceVersion"
10-
implementation "org.graceframework:grace-boot:$graceVersion"
11-
implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
8+
implementation "org.graceframework:grace-core"
9+
implementation "org.graceframework:grace-boot"
10+
implementation "org.graceframework:grace-plugin-gsp"
1211
implementation project(":grace-plugin")
13-
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
1412

1513
runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion"
1614
runtimeOnly "com.h2database:h2"
17-
runtimeOnly "org.graceframework.plugins:scaffolding:$scaffolingVersion"
18-
runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion"
15+
runtimeOnly "org.graceframework.plugins:scaffolding"
16+
runtimeOnly "org.graceframework.plugins:fields"
1917

20-
testImplementation "org.graceframework:grace-gorm-testing-support:$testingSupportVersion"
21-
testImplementation "org.graceframework:grace-web-testing-support:$testingSupportVersion"
22-
testImplementation "io.netty:netty-transport:4.1.72.Final"
23-
testImplementation "io.netty:netty-codec:4.1.72.Final"
24-
testImplementation "io.netty:netty-handler:4.1.72.Final"
25-
testImplementation "org.testcontainers:mongodb:1.19.0"
18+
testImplementation "org.graceframework:grace-test-support"
19+
// testImplementation "org.testcontainers:mongodb:1.19.0"
2620

2721
testImplementation "org.graceframework.plugins:geb"
2822
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
@@ -45,11 +39,9 @@ tasks.withType(Test) {
4539
}
4640

4741
webdriverBinaries {
48-
if (!System.getenv().containsKey('CI')) {
49-
chromedriver "$chromeDriverVersion"
50-
geckodriver "$geckodriverVersion"
42+
chromedriver {
43+
version = '126.0.6478.126'
44+
fallbackTo32Bit = true
5145
}
52-
}
53-
54-
55-
46+
geckodriver '0.33.0'
47+
}

‎examples/grace-mongodb/gradle.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/springboot-mongodb/build.gradle‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
dependencies {
6-
classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
7-
}
8-
}
9-
101
apply plugin: 'org.springframework.boot'
2+
apply plugin: 'io.spring.dependency-management'
113

12-
ext['groovy.version'] = "$groovyVersion"
4+
group = 'example'
135

146
dependencies {
15-
implementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
16-
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
7+
implementation "org.springframework.boot:spring-boot-starter-web"
178
implementation project(":grace-plugin")
189

19-
testImplementation"org.springframework.boot:spring-boot-starter-test:$springBootVersion"
10+
testImplementation"org.springframework.boot:spring-boot-starter-test"
2011
testImplementation"org.spockframework:spock-core:$spockVersion"
2112
}

‎examples/springboot-mongodb/gradle.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/test-data-service/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
group = "examples"
2+
13
dependencies {
24
implementation "org.springframework.boot:spring-boot-starter-logging"
35
implementation "org.springframework.boot:spring-boot-autoconfigure"
46
implementation "org.graceframework:grace-core"
57
implementation "org.springframework.boot:spring-boot-starter-actuator"
6-
implementation "org.springframework.boot:spring-boot-starter-tomcat"
8+
implementation "org.springframework.boot:spring-boot-starter-web"
79
implementation "org.graceframework:grace-plugin-codecs"
810
implementation "org.graceframework:grace-plugin-services"
911
implementation "org.graceframework:grace-plugin-datasource"
@@ -12,7 +14,6 @@ dependencies {
1214
implementation "org.graceframework.plugins:cache"
1315
implementation "org.graceframework.plugins:events"
1416
implementation project(":grace-plugin")
15-
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
1617
implementation "org.graceframework.plugins:views-json"
1718
implementation "org.graceframework.plugins:views-json-templates"
1819
// implementation 'org.graceframework.plugins:spring-security-core:4.0.3'

‎examples/test-data-service/gradle.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)