Skip to content

S
spring-boot
Commit fede0d1c authored by Dave Syer's avatar Dave Syer
Browse files
Options

Add profiles to /env

parent 47cd5dd6
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 31 deletions
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java
View file @ fede0d1c
......@@ -49,6 +49,7 @@ public class EnvironmentEndpoint extends AbstractEndpoint<Map<String, Object>> i
@Override
public Map<String, Object> invoke() {
Map<String, Object> result = new LinkedHashMap<String, Object>();
result.put("profiles", this.environment.getActiveProfiles());
for (PropertySource<?> source : getPropertySources()) {
if (source instanceof EnumerablePropertySource) {
EnumerablePropertySource<?> enumerable = (EnumerablePropertySource<?>) source;
......
spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/org/springframework/boot/git.properties
View file @ fede0d1c
#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 <plugin>\n <groupId>org.springframework.boot</groupId>\n <artifactId>spring-boot-maven-plugin</artifactId>\n <configuration>\n <layout>ZIP</layout>\n </configuration>\n </plugin>\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
spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/git.properties
View file @ fede0d1c
#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 <plugin>\n <groupId>org.springframework.boot</groupId>\n <artifactId>spring-boot-maven-plugin</artifactId>\n <configuration>\n <layout>ZIP</layout>\n </configuration>\n </plugin>\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
spring-boot-tools/spring-boot-loader/src/main/resources/org/springframework/boot/git.properties
View file @ fede0d1c
#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 <plugin>\n <groupId>org.springframework.boot</groupId>\n <artifactId>spring-boot-maven-plugin</artifactId>\n <configuration>\n <layout>ZIP</layout>\n </configuration>\n </plugin>\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
spring-boot-tools/spring-boot-maven-plugin/src/main/resources/org/springframework/boot/git.properties
View file @ fede0d1c
#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 <plugin>\n <groupId>org.springframework.boot</groupId>\n <artifactId>spring-boot-maven-plugin</artifactId>\n <configuration>\n <layout>ZIP</layout>\n </configuration>\n </plugin>\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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment