From fede0d1c98a91ea7437adae01245ecf0eaa226fa Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 16 Oct 2013 13:42:13 -0400 Subject: [PATCH] Add profiles to /env --- .../actuate/endpoint/EnvironmentEndpoint.java | 1 + .../org/springframework/boot/git.properties | 14 +++++++------- .../org/springframework/boot/git.properties | 16 ++++++++-------- .../org/springframework/boot/git.properties | 16 ++++++++-------- .../org/springframework/boot/git.properties | 16 ++++++++-------- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java index 6569ca03305..f841dbfb546 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java @@ -49,6 +49,7 @@ public class EnvironmentEndpoint extends AbstractEndpoint> i @Override public Map invoke() { Map result = new LinkedHashMap(); + result.put("profiles", this.environment.getActiveProfiles()); for (PropertySource source : getPropertySources()) { if (source instanceof EnumerablePropertySource) { EnumerablePropertySource enumerable = (EnumerablePropertySource) source; diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/org/springframework/boot/git.properties b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/org/springframework/boot/git.properties index ec98f87d954..50b41203187 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/org/springframework/boot/git.properties +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/org/springframework/boot/git.properties @@ -1,13 +1,13 @@ #Generated by Git-Commit-Id-Plugin -#Tue Oct 15 11:35:18 EDT 2013 -git.commit.id.abbrev=ea11daf +#Wed Oct 16 13:12:16 EDT 2013 +git.commit.id.abbrev=47cd5dd git.commit.user.email=dsyer@gopivotal.com -git.commit.message.full=Extend PropertiesLauncher to load nested archives\n\nPropertiesLauncher can now be used to run an executable jar, and by\ndefault it will pick up nested archives in lib/ (where the Boot\ntools puts them). User can provide loader.path (colon-separated)\nto change the nested path.\n\n[\#58837492] [bs-330] Add tooling for PropertiesLauncher\n -git.commit.id=ea11dafcbd951b3b23257585bce1f479ca9faa73 -git.commit.message.short=Extend PropertiesLauncher to load nested archives +git.commit.message.full=Tooling for PropertiesLauncher in JAR archives\n\nTo use PropertiesLauncher instead of JarLauncher in an\nexecutable JAR we have provided tooling support. In Maven\n(using the starter parent to default some of the settings)\:\n\n \n org.springframework.boot\n spring-boot-maven-plugin\n \n ZIP\n \n \n\nin Gradle\:\n\n apply plugin\: "spring-boot"\n springBoot {\n layout \= 'ZIP'\n }\n }\n\n[Fixes \#58837492] [bs-330] Add tooling for PropertiesLauncher\n +git.commit.id=47cd5dd679ce10f95aaa795cdec7314189ab3c7c +git.commit.message.short=Tooling for PropertiesLauncher in JAR archives git.commit.user.name=Dave Syer git.build.user.name=Dave Syer git.build.user.email=dsyer@gopivotal.com git.branch=master -git.commit.time=2013-10-15T11\:08\:45-0400 -git.build.time=2013-10-15T11\:35\:18-0400 +git.commit.time=2013-10-16T08\:49\:51-0400 +git.build.time=2013-10-16T13\:12\:16-0400 diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/git.properties b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/git.properties index 7cea85057ff..18427e6d809 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/git.properties +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/git.properties @@ -1,13 +1,13 @@ #Generated by Git-Commit-Id-Plugin -#Wed Oct 16 08:14:33 EDT 2013 -git.commit.id.abbrev=a7ba9ba +#Wed Oct 16 13:12:08 EDT 2013 +git.commit.id.abbrev=47cd5dd git.commit.user.email=dsyer@gopivotal.com -git.commit.message.full=Tooling for PropertiesLauncher\n -git.commit.id=a7ba9ba5cd47a924f9c7668a772957fc05ffa058 -git.commit.message.short=Tooling for PropertiesLauncher +git.commit.message.full=Tooling for PropertiesLauncher in JAR archives\n\nTo use PropertiesLauncher instead of JarLauncher in an\nexecutable JAR we have provided tooling support. In Maven\n(using the starter parent to default some of the settings)\:\n\n \n org.springframework.boot\n spring-boot-maven-plugin\n \n ZIP\n \n \n\nin Gradle\:\n\n apply plugin\: "spring-boot"\n springBoot {\n layout \= 'ZIP'\n }\n }\n\n[Fixes \#58837492] [bs-330] Add tooling for PropertiesLauncher\n +git.commit.id=47cd5dd679ce10f95aaa795cdec7314189ab3c7c +git.commit.message.short=Tooling for PropertiesLauncher in JAR archives git.commit.user.name=Dave Syer git.build.user.name=Dave Syer git.build.user.email=dsyer@gopivotal.com -git.branch=feature/proptool -git.commit.time=2013-10-15T16\:54\:14-0400 -git.build.time=2013-10-16T08\:14\:33-0400 +git.branch=master +git.commit.time=2013-10-16T08\:49\:51-0400 +git.build.time=2013-10-16T13\:12\:08-0400 diff --git a/spring-boot-tools/spring-boot-loader/src/main/resources/org/springframework/boot/git.properties b/spring-boot-tools/spring-boot-loader/src/main/resources/org/springframework/boot/git.properties index 10e364fba2c..7a6ce83a316 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/resources/org/springframework/boot/git.properties +++ b/spring-boot-tools/spring-boot-loader/src/main/resources/org/springframework/boot/git.properties @@ -1,13 +1,13 @@ #Generated by Git-Commit-Id-Plugin -#Wed Oct 16 08:17:37 EDT 2013 -git.commit.id.abbrev=a7ba9ba +#Wed Oct 16 13:12:06 EDT 2013 +git.commit.id.abbrev=47cd5dd git.commit.user.email=dsyer@gopivotal.com -git.commit.message.full=Tooling for PropertiesLauncher\n -git.commit.id=a7ba9ba5cd47a924f9c7668a772957fc05ffa058 -git.commit.message.short=Tooling for PropertiesLauncher +git.commit.message.full=Tooling for PropertiesLauncher in JAR archives\n\nTo use PropertiesLauncher instead of JarLauncher in an\nexecutable JAR we have provided tooling support. In Maven\n(using the starter parent to default some of the settings)\:\n\n \n org.springframework.boot\n spring-boot-maven-plugin\n \n ZIP\n \n \n\nin Gradle\:\n\n apply plugin\: "spring-boot"\n springBoot {\n layout \= 'ZIP'\n }\n }\n\n[Fixes \#58837492] [bs-330] Add tooling for PropertiesLauncher\n +git.commit.id=47cd5dd679ce10f95aaa795cdec7314189ab3c7c +git.commit.message.short=Tooling for PropertiesLauncher in JAR archives git.commit.user.name=Dave Syer git.build.user.name=Dave Syer git.build.user.email=dsyer@gopivotal.com -git.branch=feature/proptool -git.commit.time=2013-10-15T16\:54\:14-0400 -git.build.time=2013-10-16T08\:17\:37-0400 +git.branch=master +git.commit.time=2013-10-16T08\:49\:51-0400 +git.build.time=2013-10-16T13\:12\:06-0400 diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/resources/org/springframework/boot/git.properties b/spring-boot-tools/spring-boot-maven-plugin/src/main/resources/org/springframework/boot/git.properties index 6b11be6bc0e..1a48e6e55b9 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/resources/org/springframework/boot/git.properties +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/resources/org/springframework/boot/git.properties @@ -1,13 +1,13 @@ #Generated by Git-Commit-Id-Plugin -#Wed Oct 16 08:42:05 EDT 2013 -git.commit.id.abbrev=a7ba9ba +#Wed Oct 16 13:12:11 EDT 2013 +git.commit.id.abbrev=47cd5dd git.commit.user.email=dsyer@gopivotal.com -git.commit.message.full=Tooling for PropertiesLauncher\n -git.commit.id=a7ba9ba5cd47a924f9c7668a772957fc05ffa058 -git.commit.message.short=Tooling for PropertiesLauncher +git.commit.message.full=Tooling for PropertiesLauncher in JAR archives\n\nTo use PropertiesLauncher instead of JarLauncher in an\nexecutable JAR we have provided tooling support. In Maven\n(using the starter parent to default some of the settings)\:\n\n \n org.springframework.boot\n spring-boot-maven-plugin\n \n ZIP\n \n \n\nin Gradle\:\n\n apply plugin\: "spring-boot"\n springBoot {\n layout \= 'ZIP'\n }\n }\n\n[Fixes \#58837492] [bs-330] Add tooling for PropertiesLauncher\n +git.commit.id=47cd5dd679ce10f95aaa795cdec7314189ab3c7c +git.commit.message.short=Tooling for PropertiesLauncher in JAR archives git.commit.user.name=Dave Syer git.build.user.name=Dave Syer git.build.user.email=dsyer@gopivotal.com -git.branch=feature/proptool -git.commit.time=2013-10-15T16\:54\:14-0400 -git.build.time=2013-10-16T08\:42\:05-0400 +git.branch=master +git.commit.time=2013-10-16T08\:49\:51-0400 +git.build.time=2013-10-16T13\:12\:11-0400