Skip to content

Commit ebc70ba

Browse files
authored
Spring Boot 2.4.0 M2 Compatibility (#297)
1 parent 58cd28f commit ebc70ba

File tree

272 files changed

+9223
-7903
lines changed

Some content is hidden

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

272 files changed

+9223
-7903
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
.gradle
33
bin/
44

5+
### Maven ###
6+
target/
7+
58
### STS ###
69
.apt_generated
710
.classpath
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright 2007-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import java.net.*;
17+
import java.io.*;
18+
import java.nio.channels.*;
19+
import java.util.Properties;
20+
21+
public class MavenWrapperDownloader {
22+
23+
private static final String WRAPPER_VERSION = "0.5.6";
24+
/**
25+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26+
*/
27+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
30+
/**
31+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32+
* use instead of the default one.
33+
*/
34+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35+
".mvn/wrapper/maven-wrapper.properties";
36+
37+
/**
38+
* Path where the maven-wrapper.jar will be saved to.
39+
*/
40+
private static final String MAVEN_WRAPPER_JAR_PATH =
41+
".mvn/wrapper/maven-wrapper.jar";
42+
43+
/**
44+
* Name of the property which should be used to override the default download url for the wrapper.
45+
*/
46+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
47+
48+
public static void main(String args[]) {
49+
System.out.println("- Downloader started");
50+
File baseDirectory = new File(args[0]);
51+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52+
53+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54+
// wrapperUrl parameter.
55+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56+
String url = DEFAULT_DOWNLOAD_URL;
57+
if(mavenWrapperPropertyFile.exists()) {
58+
FileInputStream mavenWrapperPropertyFileInputStream = null;
59+
try {
60+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61+
Properties mavenWrapperProperties = new Properties();
62+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64+
} catch (IOException e) {
65+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66+
} finally {
67+
try {
68+
if(mavenWrapperPropertyFileInputStream != null) {
69+
mavenWrapperPropertyFileInputStream.close();
70+
}
71+
} catch (IOException e) {
72+
// Ignore ...
73+
}
74+
}
75+
}
76+
System.out.println("- Downloading from: " + url);
77+
78+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
81+
System.out.println(
82+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83+
}
84+
}
85+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
86+
try {
87+
downloadFileFromURL(url, outputFile);
88+
System.out.println("Done");
89+
System.exit(0);
90+
} catch (Throwable e) {
91+
System.out.println("- Error downloading");
92+
e.printStackTrace();
93+
System.exit(1);
94+
}
95+
}
96+
97+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
98+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99+
String username = System.getenv("MVNW_USERNAME");
100+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
101+
Authenticator.setDefault(new Authenticator() {
102+
@Override
103+
protected PasswordAuthentication getPasswordAuthentication() {
104+
return new PasswordAuthentication(username, password);
105+
}
106+
});
107+
}
108+
URL website = new URL(urlString);
109+
ReadableByteChannel rbc;
110+
rbc = Channels.newChannel(website.openStream());
111+
FileOutputStream fos = new FileOutputStream(destination);
112+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113+
fos.close();
114+
rbc.close();
115+
}
116+
117+
}

.mvn/wrapper/maven-wrapper.jar

49.5 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:11.0.4-jre-slim
1+
FROM openjdk:11.0.8-jre-slim
22
LABEL author=cphillipson@pivotal.io
33
COPY build/libs/cf-butler-0.1-SNAPSHOT.jar /app.jar
44
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]

build.gradle

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.3.3.RELEASE'
2+
id 'org.springframework.boot' version '2.4.0-M2'
33
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
4-
id 'com.github.ben-manes.versions' version '0.31.0'
4+
id 'com.github.ben-manes.versions' version '0.33.0'
55
id 'io.franzbecker.gradle-lombok' version '4.0.0'
66
id 'java'
77
id 'jacoco'
@@ -44,10 +44,9 @@ repositories {
4444
}
4545

4646
ext {
47-
set('springCloudServicesVersion', '3.1.2.RELEASE')
48-
set('springCloudVersion', "2020.0.0-M2")
47+
set('springCloudServicesVersion', '3.1.5.RELEASE')
48+
set('springCloudVersion', "2020.0.0-M3")
4949
// @see https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot-dependencies/pom.xml
50-
set('spring-data-releasetrain.version', 'Neumann-RELEASE')
5150
}
5251

5352
dependencyManagement {
@@ -118,26 +117,23 @@ dependencies {
118117
implementation('org.springframework.boot:spring-boot-starter-log4j2')
119118
implementation('com.lmax:disruptor:3.4.2')
120119
implementation('org.springframework.boot:spring-boot-starter-data-r2dbc')
121-
implementation('org.springframework.data:spring-data-relational:2.0.3.RELEASE')
122120
implementation('org.locationtech.jts:jts-core:1.17.1')
123121
implementation('io.r2dbc:r2dbc-spi')
124122
runtime('io.r2dbc:r2dbc-pool')
125123
implementation('io.r2dbc:r2dbc-h2')
126124
if (project.hasProperty("mysql")) {
127-
runtime('com.github.mirromutth:r2dbc-mysql:v0.8.1.RELEASE')
125+
runtime('dev.miku:r2dbc-mysql:0.8.2.RELEASE')
128126
} else {
129127
runtime('io.r2dbc:r2dbc-postgresql')
130128
}
131129
implementation('org.eclipse.jgit:org.eclipse.jgit:5.9.0.202009080501-r')
132130
implementation('org.springframework.boot:spring-boot-starter-mail')
133-
implementation('com.sendgrid:sendgrid-java:4.6.4') {
131+
implementation('com.sendgrid:sendgrid-java:4.6.6') {
134132
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
135133
}
136134
implementation('org.apache.httpcomponents:httpclient:4.5.12')
137-
implementation('org.cloudfoundry:cloudfoundry-client-reactor:4.9.0.RELEASE')
138-
implementation('org.cloudfoundry:cloudfoundry-operations:4.9.0.RELEASE')
139-
implementation('io.projectreactor:reactor-core:3.3.9.RELEASE')
140-
implementation('io.projectreactor.netty:reactor-netty:0.9.11.RELEASE')
135+
implementation('org.cloudfoundry:cloudfoundry-client-reactor:4.10.0.RELEASE')
136+
implementation('org.cloudfoundry:cloudfoundry-operations:4.10.0.RELEASE')
141137
implementation('io.micrometer:micrometer-registry-prometheus')
142138
testImplementation('io.projectreactor:reactor-test')
143139
testImplementation('org.assertj:assertj-core:3.17.2')
@@ -146,10 +142,7 @@ dependencies {
146142
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine')
147143
testImplementation('org.mockito:mockito-core')
148144
testImplementation('org.mockito:mockito-junit-jupiter')
149-
testImplementation('org.springframework.boot:spring-boot-starter-test') {
150-
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
151-
exclude group: 'junit', module: 'junit'
152-
}
145+
testImplementation('org.springframework.boot:spring-boot-starter-test')
153146
testImplementation('org.pitest:pitest-junit5-plugin:0.12')
154147
}
155148

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip

0 commit comments

Comments
 (0)