Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Creates spring-cloud-gcp-autoconfigure module #276

Merged
merged 30 commits into from
Jan 11, 2018
Merged

Creates spring-cloud-gcp-autoconfigure module #276

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f2624c8
Creates spring-cloud-gcp-autoconfigure module
joaoandremartins Dec 18, 2017
932a437
Adds spring-cloud-context to config sample
joaoandremartins Dec 18, 2017
1ec45bf
Adds spring-cloud-gcp-config to starter's dependencies
joaoandremartins Dec 18, 2017
41aea29
Adds static test dep again
joaoandremartins Dec 18, 2017
9213f28
Splits core starter into autoconfigure and core module
joaoandremartins Dec 18, 2017
c669ea9
Removes unnecessary annotation
joaoandremartins Dec 18, 2017
203d0cf
Merge branch 'master' into gh-262-autoconfigure-module
joaoandremartins Dec 18, 2017
0a4362a
Fixes stalled build
joaoandremartins Dec 19, 2017
2942c60
Adds GcpConfigAutoConfiguration back to autoconfigure's spring.factories
joaoandremartins Dec 19, 2017
13dd3d6
Merge branch 'master' into gh-262-autoconfigure-module
joaoandremartins Dec 21, 2017
8303715
EOF new line in spring.factories
joaoandremartins Dec 21, 2017
0f609e0
snicoll's code review
joaoandremartins Jan 2, 2018
2287602
fixes spring.provides
joaoandremartins Jan 2, 2018
77364d4
removes unnecessary spring.factories
joaoandremartins Jan 2, 2018
b231149
fixes build
joaoandremartins Jan 2, 2018
ac3dedb
Finish killing spring-cloud-gcp-config
joaoandremartins Jan 2, 2018
2de9f93
fix build again
joaoandremartins Jan 2, 2018
a53aef5
Merge branch 'master' into gh-262-autoconfigure-module
joaoandremartins Jan 9, 2018
902eea3
Adds the config module back in
joaoandremartins Jan 9, 2018
2b7852a
Adds GoogleConfigPropertySourceLocator to the bootstrap configurators
joaoandremartins Jan 9, 2018
5813ae8
Fixes Javadoc and other bits
joaoandremartins Jan 9, 2018
0d47060
Adds necessary spring.factories
joaoandremartins Jan 9, 2018
c5486c7
Changes import order to fix build in rare conditions
joaoandremartins Jan 9, 2018
2ccc845
Fixes indentation
joaoandremartins Jan 9, 2018
1da213a
Fix indentation
joaoandremartins Jan 9, 2018
96c58fd
New line
joaoandremartins Jan 9, 2018
2d39c0d
Merge branch 'master' into gh-262-autoconfigure-module
joaoandremartins Jan 10, 2018
7c3da59
Merge branch 'master' into gh-262-autoconfigure-module
joaoandremartins Jan 10, 2018
252a533
Changes commons-logging's scope to test
joaoandremartins Jan 10, 2018
13c45aa
Fixes issues with AppEngineCondition
joaoandremartins Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<module>spring-integration-gcp</module>
<module>spring-cloud-gcp-docs</module>
<module>spring-cloud-gcp-examples</module>
<module>spring-cloud-gcp-autoconfigure</module>
<module>spring-cloud-gcp-config</module>
</modules>

<properties>
Expand Down
0 ...rters/spring-cloud-gcp-starter-core/.jdk8 → spring-cloud-gcp-autoconfigure/.jdk8
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions spring-cloud-gcp-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>spring-cloud-gcp</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-cloud-gcp-autoconfigure</artifactId>
<name>Spring Cloud GCP Autoconfigure Module</name>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<!-- Configuration processor -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exclusion for android-json should be added because it indeed conflicts with com.google.cloud.ServiceOptions.getServiceAccountProjectId(ServiceOptions.java:442) use of the org.json.JSONTokener.<init>(Ljava/io/InputStream;)V constructor, which doesn't exist in the stripped down android-json library.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then should we exclude android-json from the other sources and use the one from spring-boot-configuration-processor?
It's hard to fix this issue because I'm not seeing it, so I'm not sure to what extent this is happening because of your (or mine) local configuration.

In the meantime, my toy project is again picking up project ID and creds and I didn't do any change, not sure what happened but things work now...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maven loads dependencies in the order that they are declared. Since spring-boot-configuration-processor comes before spring-cloud-gcp-core in this POM, JSONTokenizer from android-json should get loaded. I'm not sure why you're not seeing it.

For me, actually just switching the order of spring-boot-configuration-processor and spring-cloud-gcp-core fixes the build.

Can you try running mvn dependency:tree on this POM to see in what order dependencies are loaded.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think at this point we need to configure the annotation processor in the compiler plugin. You may lose AP support in the IDE but it's better than the current arrangement IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only spring-boot-configuration-processor is importing android-json for me.

[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ spring-cloud-gcp-autoconfigure ---
[INFO] org.springframework.cloud:spring-cloud-gcp-autoconfigure:jar:1.0.0.BUILD-SNAPSHOT
[INFO] +- org.springframework.boot:spring-boot-autoconfigure:jar:1.5.7.RELEASE:compile
[INFO] | - org.springframework.boot:spring-boot:jar:1.5.7.RELEASE:compile
[INFO] +- org.springframework.boot:spring-boot-configuration-processor:jar:1.5.7.RELEASE:compile
[INFO] | - com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:compile
[INFO] +- org.springframework.cloud:spring-cloud-gcp-core:jar:1.0.0.BUILD-SNAPSHOT:compile
[INFO] | +- com.google.cloud:google-cloud-core:jar:1.14.0:compile
[INFO] | | +- com.google.guava:guava:jar:20.0:compile
[INFO] | | +- joda-time:joda-time:jar:2.9.2:compile
[INFO] | | +- org.json:json:jar:20160810:compile
[INFO] | | +- com.google.http-client:google-http-client:jar:1.23.0:compile
[INFO] | | | - org.apache.httpcomponents:httpclient:jar:4.5.3:compile
[INFO] | | | +- org.apache.httpcomponents:httpcore:jar:4.4.6:compile
[INFO] | | | - commons-codec:commons-codec:jar:1.10:compile
[INFO] | | +- com.google.code.findbugs:jsr305:jar:3.0.0:compile
[INFO] | | +- com.google.api:api-common:jar:1.2.0:compile
[INFO] | | +- com.google.api:gax:jar:1.15.0:compile
[INFO] | | | +- com.google.auto.value:auto-value:jar:1.2:compile
[INFO] | | | +- org.threeten:threetenbp:jar:1.3.3:compile
[INFO] | | | - com.google.auth:google-auth-library-oauth2-http:jar:0.7.1:compile
[INFO] | | | +- com.google.auth:google-auth-library-credentials:jar:0.9.0:compile
[INFO] | | | - com.google.http-client:google-http-client-jackson2:jar:1.23.0:compile
[INFO] | | | - com.fasterxml.jackson.core:jackson-core:jar:2.8.10:compile
[INFO] | | +- com.google.protobuf:protobuf-java-util:jar:3.4.0:compile
[INFO] | | | +- com.google.protobuf:protobuf-java:jar:3.4.0:compile
[INFO] | | | - com.google.code.gson:gson:jar:2.8.1:compile
[INFO] | | +- com.google.api.grpc:proto-google-common-protos:jar:1.0.2:compile
[INFO] | | - com.google.api.grpc:proto-google-iam-v1:jar:0.1.26:compile
[INFO] | - org.springframework:spring-core:jar:4.3.11.RELEASE:compile
[INFO] +- org.springframework:spring-web:jar:4.3.11.RELEASE:compile
[INFO] | +- org.springframework:spring-aop:jar:4.3.11.RELEASE:compile
[INFO] | +- org.springframework:spring-beans:jar:4.3.11.RELEASE:compile
[INFO] | - org.springframework:spring-context:jar:4.3.11.RELEASE:compile
[INFO] | - org.springframework:spring-expression:jar:4.3.11.RELEASE:compile
[INFO] +- commons-logging:commons-logging:jar:1.2:compile
[INFO] +- org.springframework.cloud:spring-cloud-context:jar:1.2.3.RELEASE:compile
[INFO] | - org.springframework.security:spring-security-crypto:jar:4.2.3.RELEASE:compile
[INFO] +- junit:junit:jar:4.12:test
[INFO] | - org.hamcrest:hamcrest-core:jar:1.3:test
[INFO] +- org.slf4j:slf4j-api:jar:1.7.25:compile
[INFO] +- org.mockito:mockito-core:jar:1.10.19:test
[INFO] | - org.objenesis:objenesis:jar:2.1:test
[INFO] - org.springframework.boot:spring-boot-starter-test:jar:1.5.7.RELEASE:test
[INFO] +- org.springframework.boot:spring-boot-test:jar:1.5.7.RELEASE:test
[INFO] +- org.springframework.boot:spring-boot-test-autoconfigure:jar:1.5.7.RELEASE:test
[INFO] +- com.jayway.jsonpath:json-path:jar:2.2.0:test
[INFO] | - net.minidev:json-smart:jar:2.2.1:test
[INFO] | - net.minidev:accessors-smart:jar:1.1:test
[INFO] | - org.ow2.asm:asm:jar:5.0.3:test
[INFO] +- org.assertj:assertj-core:jar:2.6.0:test
[INFO] +- org.hamcrest:hamcrest-library:jar:1.3:test
[INFO] +- org.skyscreamer:jsonassert:jar:1.4.0:test
[INFO] - org.springframework:spring-test:jar:4.3.11.RELEASE:test
[INFO] ------------------------------------------------------------------------

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joaoandremartins Can you just switch the order of spring-boot-configuration-processor and spring-cloud-gcp-core to fix the build for me?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you can exclude the android dependency and expect the APT to work. I believe it's no longer a dependency in Spring Boot 1.5.10 though, so upgrading to snapshots will fix it.

<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-core</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency needed currently?

Copy link
Contributor Author

@joaoandremartins joaoandremartins Dec 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we need it to import GcpProperties, GcpProjectIdProvider, etc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider the case someone decides to add the auto-configuration of GCP to their stack but there are scenarios where they might not use it yet.

IMO, this should be <optional>true</optional> and you should have an extra condition to guard the fact this dependency is not available.

</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-config</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>
9 changes: 7 additions & 2 deletions ...utoconfig/GcpConfigAutoConfiguration.java → ...re/config/GcpConfigAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,26 @@
* limitations under the License.
*/

package org.springframework.cloud.gcp.config.autoconfig;
package org.springframework.cloud.gcp.autoconfigure.config;

import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.config.GcpConfigProperties;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.config.GoogleConfigPropertySourceLocator;
import org.springframework.context.annotation.Configuration;

/**
* Bootstrap auto configuration for Google Cloud Runtime Configurator Starter.
*
* @author Jisha Abubaker
* @author João André Martins
*/
@Configuration
@AutoConfigureAfter(GcpContextAutoConfiguration.class)
@EnableConfigurationProperties(GcpConfigProperties.class)
@ConditionalOnClass(GoogleConfigPropertySourceLocator.class)
public class GcpConfigAutoConfiguration {

}
Expand Down
2 changes: 1 addition & 1 deletion ...toconfig/GcpContextAutoConfiguration.java → ...ure/core/GcpContextAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.gcp.core.autoconfig;
package org.springframework.cloud.gcp.autoconfigure.core;

import java.io.IOException;
import java.util.ArrayList;
Expand Down
7 changes: 7 additions & 0 deletions spring-cloud-gcp-autoconfigure/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration,\
org.springframework.cloud.gcp.autoconfigure.config.GcpConfigAutoConfiguration

org.springframework.cloud.bootstrap.BootstrapConfiguration=\
org.springframework.cloud.gcp.autoconfigure.config.GcpConfigAutoConfiguration,\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not BootstrapConfiguration part. This must be for the org.springframework.boot.autoconfigure.EnableAutoConfiguration property

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is correct, because it's for BootstrapConfiguration, as required by Spring Cloud Config.

org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know enough about that stuff to be positive but the fact those classes are both auto-config and bootstrap config is a smell IMO.

(nothing to do with this issue per se but I thought I'd mention it).

4 changes: 2 additions & 2 deletions ...onfig/GcpConfigAutoConfigurationTest.java → ...onfig/GcpConfigAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* limitations under the License.
*/

package org.springframework.cloud.gcp.config;
package org.springframework.cloud.gcp.autoconfigure.config;

import org.junit.After;
import org.junit.Test;

import org.springframework.boot.test.util.EnvironmentTestUtils;
import org.springframework.cloud.gcp.config.autoconfig.GcpConfigAutoConfiguration;
import org.springframework.cloud.gcp.config.GcpConfigProperties;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;

import static org.junit.Assert.assertEquals;
Expand Down
2 changes: 1 addition & 1 deletion ...fig/GcpContextAutoConfigurationTests.java → ...ore/GcpContextAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.gcp.core.autoconfig;
package org.springframework.cloud.gcp.autoconfigure.core;

import java.util.List;

Expand Down
33 changes: 33 additions & 0 deletions spring-cloud-gcp-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>spring-cloud-gcp</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-cloud-gcp-config</artifactId>
<name>Spring Cloud GCP Config Module</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
</project>
0 ...cloud/gcp/config/GcpConfigProperties.java → ...cloud/gcp/config/GcpConfigProperties.java
View file
Open in desktop
File renamed without changes.
0 ...d/gcp/config/GoogleConfigEnvironment.java → ...d/gcp/config/GoogleConfigEnvironment.java
View file
Open in desktop
File renamed without changes.
0 ...ig/GoogleConfigPropertySourceLocator.java → ...ig/GoogleConfigPropertySourceLocator.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...oogleConfigPropertySourceLocatorTest.java → ...oogleConfigPropertySourceLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class GoogleConfigPropertySourceLocatorTest {
private CredentialsProvider credentialsProvider;

@Before
public void setUp() throws Exception {
public void setUp() {
this.gcpConfigProperties = new GcpConfigProperties();
this.gcpConfigProperties.setName("test");
this.expectedProperties = new HashMap<>();
Expand Down
4 changes: 4 additions & 0 deletions spring-cloud-gcp-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cyclic dependency?
Why should we worry about autoconfig here if it is just core?
Not sure what I am missing, but would like to take your attention on this.

Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spring-boot-autoconfigure, not spring-cloud-gcp-autoconfigure.

We need spring-boot-autoconfigure to get GcpProperties's @ConfigurationProperties annotation. LMK if I should be using another dependency.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! My bad. I see what is that.
Well, I think the problem that all the @ConfigurationProperties must be as a part of our autoconfigure not more.

Not sure how have you arranged it with Stephane, but I feel like something in architecture is still missing. Maybe there is still something in the target modules what is Boot-based? So, that should be moved to the autoconfigure module as well...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other spring-boot projects seem to be keeping their @ConfigurationProperties in the autoconfigure module as well.

I reviewed our project and all @ConfigurationProperties are used only within autoconfigure, except for the config and SQL ones.

For the config one, we might be able to make GoogleConfigPropertySourceLocator take in individual arguments instead of GcpConfigProperties (e.g., config name, enabled, etc.).
The SQL properties are used by the JdbcUrlProviders, but I think we can add those to the autoconfigure module as well..

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the config one, we might be able to make

Are you going to do those changes to avoid this spring-boot-autoconfigure dependency in the core?
Or do you mean to do that in the separate issue?

Thanks

</dependency>
</dependencies>
</project>
0 ...rk/cloud/gcp/core/AppEngineCondition.java → ...rk/cloud/gcp/core/AppEngineCondition.java
View file
Open in desktop
File renamed without changes.
0 ...amework/cloud/gcp/core/GcpProperties.java → ...amework/cloud/gcp/core/GcpProperties.java
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions spring-cloud-gcp-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<artifactId>spring-cloud-gcp-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-pubsub</artifactId>
Expand All @@ -39,6 +44,11 @@
<artifactId>spring-cloud-gcp-storage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-trace</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions spring-cloud-gcp-examples/spring-cloud-gcp-config-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<!-- Optional dependency to enable configuration refresh runtime via /refresh endpoint -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
8 changes: 2 additions & 6 deletions spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,11 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<artifactId>spring-cloud-gcp-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-core</artifactId>
<artifactId>spring-cloud-gcp-config</artifactId>
</dependency>
<!-- Configuration processor -->
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions ...gcp-starters/spring-cloud-gcp-starter-config/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
org.springframework.cloud.gcp.config.autoconfig.GcpConfigAutoConfiguration,\
org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration,\
org.springframework.cloud.gcp.config.GoogleConfigPropertySourceLocator
org.springframework.cloud.gcp.config.GoogleConfigPropertySourceLocator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New line in the end of file.
The IDEA can be configured to do that automatically.

1 change: 1 addition & 0 deletions ...-gcp-starters/spring-cloud-gcp-starter-config/src/main/resources/META-INF/spring.provides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
provides: spring-cloud-gcp-autoconfigure, spring-cloud-gcp-config
16 changes: 2 additions & 14 deletions spring-cloud-gcp-starters/spring-cloud-gcp-starter-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,9 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-core</artifactId>
</dependency>

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>

<!-- ServiceAccountSigner, required by users -->
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-autoconfigure</artifactId>
</dependency>

<!-- @ConfigurationProperties metadata -->
Expand All @@ -39,10 +32,5 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 0 additions & 2 deletions ...d-gcp-starters/spring-cloud-gcp-starter-core/src/main/resources/META-INF/spring.factories
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...ud-gcp-starters/spring-cloud-gcp-starter-core/src/main/resources/META-INF/spring.provides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
provides: spring-cloud-gcp-autoconfigure, spring-cloud-gcp-core
2 changes: 1 addition & 1 deletion ...main/java/org/springframework/cloud/gcp/pubsub/autoconfig/GcpPubSubAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.core.GcpProjectIdProvider;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.pubsub.GcpPubSubProperties;
import org.springframework.cloud.gcp.pubsub.PubSubAdmin;
import org.springframework.cloud.gcp.pubsub.core.PubSubException;
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/springframework/cloud/gcp/sql/autoconfig/GcpCloudSqlAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.core.AppEngineCondition;
import org.springframework.cloud.gcp.core.GcpProjectIdProvider;
import org.springframework.cloud.gcp.core.GcpProperties;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.sql.CloudSqlJdbcInfoProvider;
import org.springframework.cloud.gcp.sql.GcpCloudSqlProperties;
import org.springframework.cloud.gcp.sql.SqlCredentialFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/springframework/cloud/gcp/sql/autoconfig/GcpCloudSqlAutoConfigurationMockTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.sql.CloudSqlJdbcInfoProvider;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
Expand Down
2 changes: 1 addition & 1 deletion .../test/java/org/springframework/cloud/gcp/storage/GoogleStorageAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.core.io.Resource;
import org.springframework.test.context.junit4.SpringRunner;
Expand Down
3 changes: 1 addition & 2 deletions ...rg/springframework/cloud/gcp/trace/autoconfig/StackdriverTraceAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.gcp.core.autoconfig.GcpContextAutoConfiguration;
import org.springframework.cloud.gcp.autoconfigure.core.GcpContextAutoConfiguration;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.cloud.sleuth.log.SleuthLogAutoConfiguration;
Expand All @@ -48,7 +48,6 @@
GcpContextAutoConfiguration.class,
TraceAutoConfiguration.class, SleuthLogAutoConfiguration.class }, properties = {
"spring.cloud.gcp.project-id=proj", "spring.sleuth.sampler.percentage=1.0" })

public abstract class StackdriverTraceAutoConfigurationTests {

@Configuration
Expand Down