Skip to content

Commit 07c000c

Browse files
philwebbphilwebb
committed
Merge branch '1.5.x' into 2.0.x
2 parents da4a720 + 2ff74b1 commit 07c000c

File tree

163 files changed

+640
-432
lines changed

Some content is hidden

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

163 files changed

+640
-432
lines changed

‎CONTRIBUTING.adoc‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ provision a new environment. To use the installer:
153153
* Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
154154
install and click "`next`".
155155
* For the "`Project`" click on "`+`" to add a new setup file. Select "`Github Projects`"
156-
and browser for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
156+
and browse for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
157157
copy of the source code. Click "`OK`" to add the setup file to the list.
158158
* Double-click on "`Spring Boot`" from the project list to add it to the list that will
159159
be provisioned then click "`Next`".
@@ -166,12 +166,20 @@ Once complete you should find that a local workspace has been provisioned comple
166166
all required Eclipse plugins. Projects will be grouped into working-sets to make the code
167167
easier to navigate.
168168

169+
If you want to work on the `spring-boot-gradle-plugin` you should remove the imported Maven
170+
project and reimport it as a Gradle project.
171+
172+
TIP: If you see import errors with `com.sun` packages make sure you have setup a valid
173+
`JavaSE-1.8` environment. From preferences select "`Java`", "`Installed JREs`",
174+
"`Execution Environments`" and make sure "`JavaSE-1.8`" points to a Java 1.8
175+
install (we use AdoptOpenJDK on our CI).
176+
169177

170178

171179
==== Manual Installation with M2Eclipse
172180
If you prefer to install Eclipse yourself you should use the
173181
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
174-
installed it is available from the "Eclipse marketplace".
182+
installed it is available from the "`Eclipse marketplace`".
175183

176184
Spring Boot includes project specific source formatting settings, in order to have these
177185
work with m2eclipse, we provide an additional Eclipse plugin that you can install:

‎eclipse/spring-boot-project.setup‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<setup:Project
33
xmi:version="2.0"
4-
xmlns:xmi="https://www.omg.org/XMI"
4+
xmlns:xmi="http://www.omg.org/XMI"
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
77
xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
88
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
9-
xmlns:setup="https://www.eclipse.org/oomph/setup/1.0"
10-
xmlns:setup.p2="https://www.eclipse.org/oomph/setup/p2/1.0"
9+
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
10+
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
1111
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
1212
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
13-
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
14-
name="spring.boot"
15-
label="Spring Boot">
13+
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
14+
name="spring.boot.2.0.x"
15+
label="Spring Boot 2.0.x">
1616
<setupTask
1717
xsi:type="setup:VariableTask"
1818
type="FOLDER"
@@ -54,8 +54,6 @@
5454
</setupTask>
5555
<setupTask
5656
xsi:type="setup.p2:P2Task">
57-
<requirement
58-
name="epp.package.java"/>
5957
<requirement
6058
name="org.eclipse.platform.feature.group"/>
6159
<requirement
@@ -78,18 +76,10 @@
7876
name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
7977
<requirement
8078
name="org.springframework.ide.eclipse.boot.feature.feature.group"/>
81-
<repository
82-
url="https://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
83-
<repository
84-
url="https://download.eclipse.org/releases/oxygen/"/>
8579
<repository
8680
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
8781
<repository
88-
url="https://download.eclipse.org/egit/github/updates/"/>
89-
<repository
90-
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
91-
<repository
92-
url="https://dist.springsource.com/release/TOOLS/update/e4.7"/>
82+
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
9383
<description>
9484
Install the tools needed in the IDE to work with the
9585
source code for ${scope.project.label}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</property>
2525
</activation>
2626
<properties>
27-
<spring-javaformat.version>0.0.7</spring-javaformat.version>
27+
<spring-javaformat.version>0.0.8</spring-javaformat.version>
2828
</properties>
2929
<build>
3030
<plugins>

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -56,14 +56,16 @@ public AuditListener auditListener() throws Exception {
5656
}
5757

5858
@Bean
59-
@ConditionalOnClass(name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
59+
@ConditionalOnClass(
60+
name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
6061
@ConditionalOnMissingBean(AbstractAuthenticationAuditListener.class)
6162
public AuthenticationAuditListener authenticationAuditListener() throws Exception {
6263
return new AuthenticationAuditListener();
6364
}
6465

6566
@Bean
66-
@ConditionalOnClass(name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
67+
@ConditionalOnClass(
68+
name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
6769
@ConditionalOnMissingBean(AbstractAuthorizationAuditListener.class)
6870
public AuthorizationAuditListener authorizationAuditListener() throws Exception {
6971
return new AuthorizationAuditListener();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/HealthEndpointCloudFoundryExtension.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@
3535
@Target(ElementType.TYPE)
3636
@Retention(RetentionPolicy.RUNTIME)
3737
@Documented
38-
@EndpointExtension(filter = CloudFoundryEndpointFilter.class, endpoint = HealthEndpoint.class)
38+
@EndpointExtension(filter = CloudFoundryEndpointFilter.class,
39+
endpoint = HealthEndpoint.class)
3940
public @interface HealthEndpointCloudFoundryExtension {
4041

4142
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,7 +67,8 @@
6767
* @since 2.0.0
6868
*/
6969
@Configuration
70-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
70+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled",
71+
matchIfMissing = true)
7172
@AutoConfigureAfter(HealthEndpointAutoConfiguration.class)
7273
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
7374
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -68,7 +68,8 @@
6868
* @since 2.0.0
6969
*/
7070
@Configuration
71-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
71+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled",
72+
matchIfMissing = true)
7273
@AutoConfigureAfter({ ServletManagementContextAutoConfiguration.class,
7374
HealthEndpointAutoConfiguration.class })
7475
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorProperties.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@
3030
* @author Andy Wilkinson
3131
* @since 2.0.0
3232
*/
33-
@ConfigurationProperties(prefix = "management.health.elasticsearch", ignoreUnknownFields = false)
33+
@ConfigurationProperties(prefix = "management.health.elasticsearch",
34+
ignoreUnknownFields = false)
3435
public class ElasticsearchHealthIndicatorProperties {
3536

3637
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -87,7 +87,8 @@ public PropertiesMeterFilter propertiesMeterFilter(MetricsProperties properties)
8787
}
8888

8989
@Configuration
90-
@ConditionalOnProperty(value = "management.metrics.binders.jvm.enabled", matchIfMissing = true)
90+
@ConditionalOnProperty(value = "management.metrics.binders.jvm.enabled",
91+
matchIfMissing = true)
9192
static class JvmMeterBindersConfiguration {
9293

9394
@Bean
@@ -124,27 +125,31 @@ static class MeterBindersConfiguration {
124125
"org.slf4j.LoggerFactory" })
125126
@Conditional(LogbackLoggingCondition.class)
126127
@ConditionalOnMissingBean
127-
@ConditionalOnProperty(value = "management.metrics.binders.logback.enabled", matchIfMissing = true)
128+
@ConditionalOnProperty(value = "management.metrics.binders.logback.enabled",
129+
matchIfMissing = true)
128130
public LogbackMetrics logbackMetrics() {
129131
return new LogbackMetrics();
130132
}
131133

132134
@Bean
133-
@ConditionalOnProperty(value = "management.metrics.binders.uptime.enabled", matchIfMissing = true)
135+
@ConditionalOnProperty(value = "management.metrics.binders.uptime.enabled",
136+
matchIfMissing = true)
134137
@ConditionalOnMissingBean
135138
public UptimeMetrics uptimeMetrics() {
136139
return new UptimeMetrics();
137140
}
138141

139142
@Bean
140-
@ConditionalOnProperty(value = "management.metrics.binders.processor.enabled", matchIfMissing = true)
143+
@ConditionalOnProperty(value = "management.metrics.binders.processor.enabled",
144+
matchIfMissing = true)
141145
@ConditionalOnMissingBean
142146
public ProcessorMetrics processorMetrics() {
143147
return new ProcessorMetrics();
144148
}
145149

146150
@Bean
147-
@ConditionalOnProperty(name = "management.metrics.binders.files.enabled", matchIfMissing = true)
151+
@ConditionalOnProperty(name = "management.metrics.binders.files.enabled",
152+
matchIfMissing = true)
148153
@ConditionalOnMissingBean
149154
public FileDescriptorMetrics fileDescriptorMetrics() {
150155
return new FileDescriptorMetrics();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,7 +47,8 @@
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(AtlasMeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.export.atlas", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "management.metrics.export.atlas", name = "enabled",
51+
havingValue = "true", matchIfMissing = true)
5152
@EnableConfigurationProperties(AtlasProperties.class)
5253
public class AtlasMetricsExportAutoConfiguration {
5354

0 commit comments

Comments
 (0)