Skip to content

Commit

Permalink
Spring Boot 3
Browse files Browse the repository at this point in the history
  • Loading branch information
rwinch committed May 1, 2024
1 parent 8a10a23 commit c9b3cbc
Show file tree
Hide file tree
Showing 94 changed files with 796 additions and 647 deletions.
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# See https://sdkman.io/usage#config
# A summary is to add the following to ~/.sdkman/etc/config
# sdkman_auto_env=true
java=8.0.332-tem
java=17.0.3-tem
27 changes: 13 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
plugins {
id 'org.springframework.boot' version '2.2.1.RELEASE'
id 'org.springframework.boot' version '3.2.5'
id "com.gorylenko.gradle-git-properties" version "2.4.1"
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply from: "gradle/test.gradle"

version = '0.0.1-SNAPSHOT'

jar {
baseName = 'pivotal-github-cla'
}

sourceCompatibility = 1.8
targetCompatibility = 1.8

repositories {
mavenCentral()
}
Expand Down Expand Up @@ -47,19 +39,21 @@ dependencies {
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect')
implementation('org.springframework.boot:spring-boot-starter-security')
implementation('org.springframework.boot:spring-boot-starter-actuator')
implementation('org.springframework.cloud:spring-cloud-spring-service-connector')
implementation('org.springframework.cloud:spring-cloud-cloudfoundry-connector')
implementation('org.springframework.boot:spring-boot-starter-validation')
implementation('org.springframework.session:spring-session-data-redis')
implementation('org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5')
implementation('org.webjars:webjars-locator-core')
implementation('org.webjars:bootstrap:3.3.6')
implementation('org.webjars:jquery:1.11.3')
implementation('org.webjars.bower:select2:4.0.3')
implementation('com.h2database:h2')
implementation('net.sourceforge.nekohtml:nekohtml')
implementation('org.flywaydb:flyway-core')
implementation('mysql:mysql-connector-java:5.1.49')
implementation('org.flywaydb:flyway-mysql')
implementation('mysql:mysql-connector-java:8.0.33')
developmentOnly("org.springframework.boot:spring-boot-devtools")
testImplementation('org.springframework.boot:spring-boot-testcontainers')
testImplementation('org.testcontainers:junit-jupiter')
testImplementation('org.testcontainers:mysql')
testImplementation('org.springframework.boot:spring-boot-configuration-processor')
testImplementation('org.springframework.boot:spring-boot-devtools')
testImplementation('org.springframework.security:spring-security-test')
Expand All @@ -71,10 +65,15 @@ dependencies {
testImplementation('org.seleniumhq.selenium:selenium-support')
testImplementation('org.assertj:assertj-core')
testImplementation('com.squareup.okhttp3:mockwebserver')
testImplementation('org.testcontainers:selenium:1.12.4')
testImplementation('org.testcontainers:selenium')
}



test {
useJUnitPlatform()
}

eclipse {
classpath {
containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/docker/docker-mysql.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# https://hub.docker.com/_/mysql
DIR="$( cd "$(dirname "$0")" ; pwd -P )"
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
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
9 changes: 0 additions & 9 deletions gradle/test.gradle

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit c9b3cbc

Please sign in to comment.