Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit c9b3cbc

Browse files
committed
Spring Boot 3
1 parent 8a10a23 commit c9b3cbc

File tree

94 files changed

+796
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+796
-647
lines changed

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# See https://sdkman.io/usage#config
44
# A summary is to add the following to ~/.sdkman/etc/config
55
# sdkman_auto_env=true
6-
java=8.0.332-tem
6+
java=17.0.3-tem

build.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.2.1.RELEASE'
2+
id 'org.springframework.boot' version '3.2.5'
33
id "com.gorylenko.gradle-git-properties" version "2.4.1"
44
}
55

66
apply plugin: 'java'
77
apply plugin: 'eclipse'
88
apply plugin: 'org.springframework.boot'
99
apply plugin: 'io.spring.dependency-management'
10-
apply from: "gradle/test.gradle"
1110

1211
version = '0.0.1-SNAPSHOT'
1312

14-
jar {
15-
baseName = 'pivotal-github-cla'
16-
}
17-
18-
sourceCompatibility = 1.8
19-
targetCompatibility = 1.8
20-
2113
repositories {
2214
mavenCentral()
2315
}
@@ -47,19 +39,21 @@ dependencies {
4739
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect')
4840
implementation('org.springframework.boot:spring-boot-starter-security')
4941
implementation('org.springframework.boot:spring-boot-starter-actuator')
50-
implementation('org.springframework.cloud:spring-cloud-spring-service-connector')
51-
implementation('org.springframework.cloud:spring-cloud-cloudfoundry-connector')
42+
implementation('org.springframework.boot:spring-boot-starter-validation')
5243
implementation('org.springframework.session:spring-session-data-redis')
5344
implementation('org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5')
5445
implementation('org.webjars:webjars-locator-core')
5546
implementation('org.webjars:bootstrap:3.3.6')
5647
implementation('org.webjars:jquery:1.11.3')
5748
implementation('org.webjars.bower:select2:4.0.3')
58-
implementation('com.h2database:h2')
5949
implementation('net.sourceforge.nekohtml:nekohtml')
6050
implementation('org.flywaydb:flyway-core')
61-
implementation('mysql:mysql-connector-java:5.1.49')
51+
implementation('org.flywaydb:flyway-mysql')
52+
implementation('mysql:mysql-connector-java:8.0.33')
6253
developmentOnly("org.springframework.boot:spring-boot-devtools")
54+
testImplementation('org.springframework.boot:spring-boot-testcontainers')
55+
testImplementation('org.testcontainers:junit-jupiter')
56+
testImplementation('org.testcontainers:mysql')
6357
testImplementation('org.springframework.boot:spring-boot-configuration-processor')
6458
testImplementation('org.springframework.boot:spring-boot-devtools')
6559
testImplementation('org.springframework.security:spring-security-test')
@@ -71,10 +65,15 @@ dependencies {
7165
testImplementation('org.seleniumhq.selenium:selenium-support')
7266
testImplementation('org.assertj:assertj-core')
7367
testImplementation('com.squareup.okhttp3:mockwebserver')
74-
testImplementation('org.testcontainers:selenium:1.12.4')
68+
testImplementation('org.testcontainers:selenium')
7569
}
7670

7771

72+
73+
test {
74+
useJUnitPlatform()
75+
}
76+
7877
eclipse {
7978
classpath {
8079
containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')

ci/scripts/docker/docker-mysql.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
# https://hub.docker.com/_/mysql
33
DIR="$( cd "$(dirname "$0")" ; pwd -P )"
4-
docker run --rm --name pcla-mysql -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v "$DIR/mysql-init.sh:/docker-entrypoint-initdb.d/mysql-init.sh" mysql:5.7.37
4+
docker run --rm --name pcla-mysql -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v "$DIR/mysql-init.sh:/docker-entrypoint-initdb.d/mysql-init.sh" mysql:8.0.36

gradle/test.gradle

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

gradle/wrapper/gradle-wrapper.jar

4.11 KB
Binary file not shown.
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-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)