60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
3cd40e2488
Update getSupportedSourceVersion() logic
...
Use SourceVersion.latestSupported() rather than @SupportedSourceVersion
since we might build with an earlier JDK.
Fixes gh-2302
2015-01-07 15:04:09 -08:00
358ad0df37
Log stacktrace on additional metadata merge fail
...
See gh-2288
2015-01-07 14:07:28 -08:00
10177fb754
Update @SupportedSourceVersion to RELEASE_8
...
Update the @SupportedSourceVersion annotation to RELEASE_8 since it
should indicate "the latest source version an annotation processor
supports".
Fixes gh-2302
2015-01-07 14:07:28 -08:00
64b9066661
Refine additional metadata detection logic
...
Update the additional metadata detection logic to deal with Gradle
folder layouts.
Fixes gh-2271
2015-01-07 14:07:28 -08:00
2dfa424246
Don't fail build on merge failure
...
Be more lenient when processing additional metadata json files.
Fixes gh-2287
Closes gh-2288
2015-01-06 15:02:05 -08:00
7c29c96da6
Change additional metadata file lookup logic
...
Update ConfigurationMetadataAnnotationProcessor to find the additional
metadata json file using createResource rather than getResource. Prior
to this commit the file could be skipped when multiple files were
contained on the classpath.
Fixes gh-2271
2015-01-06 14:50:56 -08:00
1f775793ee
Use Collections.addAll(...) instead of for loops
...
Replace various for loops which add items to collections with calls
to Collections.addAll(...).
Fixes gh-2277
2015-01-04 11:49:06 -08:00
d7a12a8791
Remove superfluous semi-colons
2014-12-26 20:48:53 -08:00
22bb6f7598
Fix accidental fork logic change
...
Fix accidental change from commit b42c7fca
2014-12-24 19:20:04 -08:00
45c5e25a05
Polish
2014-12-24 10:57:42 -08:00
dbb795298c
Restore proper use of the fork parameter
...
Previously, disabling forking was not possible if JVM arguments or an
agent are specified, even if the fork attribute is explicitly set to
`false`.
The fork attribute is now detected as it should and forking is disabled
when the fork attribute is set to false, even if JVM arguments or an
agent is either specified or discovered.
Fixes gh-2220
2014-12-23 11:15:12 +01:00
843ee14cea
Merge branch '1.1.x'
2014-12-17 20:21:46 +00:00
5c67e6f141
Update war layout to package custom scope dependencies in WEB-INF/lib/
...
Fixes gh-2187
2014-12-17 20:21:29 +00:00
ff714f6c17
Update module layout to package custom scope dependencies in lib/
...
Fixes gh-2187
2014-12-17 20:14:03 +00:00
f2af8b30b0
Code formatting
2014-12-16 09:30:45 -08:00
77427f53cc
Support of Lombok annotated ConfigurationProperties
...
Previously, no configuration properties were discovered on a class using
lombok instead of regular getters/setters.
This commit adds a support for some of the lombok annotations,
specifically that is @Data, @Getter and @Setter. Provides the same
semantic as what lombok is generating.
Closes gh-2114
2014-12-16 10:41:07 +01:00
f4fbc3e339
Fix Maven Spring Loaded detection logic
...
Ensure that the Maven plugin RunMojo attempts to detect the Spring
Loaded agent before deciding if the JVM should be forked.
Fixes gh-2140
2014-12-15 13:10:33 -08:00
5dd40e6999
Polish
2014-12-12 16:33:44 -08:00
8f6f25f88e
Improve property target name
...
Previously, non camel case properties were wrongly resolved, i.e.
getFOO() leading to a 'f-o-o'. While unusual, underscores can also be
added to a property name. In that case, the hyphen should not be added
as the binder consider this to be a single "word". Typically setFoo_Bar
on the "something" prefix is mapped using "something.foo_bar".
All these cases are now handled properly, generating the target name that
the binder expects.
Fixes gh-2118
2014-12-12 14:17:15 +01:00
63e6a25097
Next development version
2014-12-10 18:06:30 -08:00
1a788c1741
Next development version
2014-12-10 16:35:50 -08:00
3523bca79b
Polish
2014-12-09 14:16:14 -08:00
16164b30a9
Do not exclude Flyway's MigrationVersion
...
flyway.init and flyway.target are two options that are missing from the
meta-data following the change in f0bc3c0
2014-12-09 18:17:09 +01:00
4b7c6f61b4
Polish
2014-12-08 13:37:39 -08:00
f0bc3c08e1
Add additional ElementExcludeFilter items
...
Fixes gh-2088
2014-12-08 13:35:13 -08:00
f4fb9ddfe6
Fix wrong file name
2014-12-04 09:35:31 +01:00
ba67e16258
Formatting
2014-12-03 09:12:28 -08:00
509201907c
Polish default value for arrays
...
See gh-1996
2014-12-03 17:32:00 +01:00
7d57cb7081
Add default value for arrays
...
Previously, a property holding an array did not have a proper default
value in the meta-data even though the related field was initialized
properly.
An explicit support for arrays has been added. The "defaultValue" now
holds the default value for singular properties or an array of values for
array-based properties. If the value is initalized with an empty array,
the default value is an empty array as well.
Closes gh-1996
2014-12-03 16:18:54 +01:00
3922808de0
Add exclusion for well-known property types
...
Previously, any valid property was added to the meta-data of the current
group. This can be annoying for types that are not meant to be bound from
a simple string value. ClassLoader is one example.
A list of well-known types has been added: if the property type matches
an element of this list, it is ignored.
Fixes gh-2012
2014-12-02 19:00:25 -08:00
09dac5ff00
Apply formatting and cleanup rules
2014-12-01 19:35:03 -08:00
20bb9c0305
Remove warnings for expected deprecation usage
2014-11-28 15:54:31 +01:00
e507c61481
polish
2014-11-27 15:30:04 +01:00
5b231e600b
Also flag deprecated properties in a @Deprecated class
...
Previously, any property defined in a @Deprecated class were not marked
as deprecated as only the getter or field was inspected for the
annotation.
An additional check on the class has been added to handle this case.
Fixes gh-2014
2014-11-27 15:27:12 +01:00
e56a1ba561
Refine inner class detection algorithm
...
Update the ConfigurationMetadataAnnotationProcessor nested class
algorithm to prevent inner classes being added as both groups and
properties.
Fixes gh-1975
2014-11-21 14:16:37 -08:00
2a9a749329
Polish
2014-11-21 13:27:19 -08:00
5220f584db
Revert spring-boot-configuration-metadata for now
...
See gh-1970
2014-11-21 11:43:34 -08:00
2b19955cee
Remove useless System.out.println
2014-11-21 17:39:42 +01:00
32efff3f30
Avoid creating a nested group for an Enum
...
Previously, an Enum that is defined as an inner class of a
@ConfigurationProperties pojo was wrongly detected as an nested group.
This case is now handled explicitly and covered by a test.
Fixes gh-1971
2014-11-21 17:20:35 +01:00
5f673c9e84
Fix usage of putIfAbsent
2014-11-21 16:13:26 +01:00
0f64a04780
Add easy way to consume configuration metadata
...
Add a companion module that IDE developers can use to read configuration
metadata from multiple sources into a single repository.
ConfigurationMetadataRepository provides access to groups and items as
well as an harmonized view on "sources" (that is the POJOs that have
contributed to a given group).
Closes gh-1970
2014-11-21 16:02:04 +01:00
f75b266d64
Add 'deprecated' field to configuration meta-data
...
Update the ConfigurationMetadataAnnotationProcessor to detect the
@Deprecated annotation on getters or setters.
Fixes gh-1846
2014-11-19 14:15:35 -08:00
7a783f5a18
Merge branch '1.1.x'
2014-11-18 21:31:19 +00:00
863c099161
Add missing copyright headers
2014-11-18 21:29:54 +00:00
e0a0af436f
Add 'module' repacker layout
...
Add a 'module' layout for the repackager which includes all 'compile'
and 'runtime' scope dependencies and does not require a main class.
Fixes gh-1941
2014-11-17 10:20:10 -08:00
f6074ff2f5
Merge branch '1.1.x'
2014-11-13 19:15:23 -08:00
608b1e65a1
Relax servlet check
...
Relax the servlet version check in Maven integration tests.
See gh-1797
2014-11-13 19:14:56 -08:00
3030ad42fc
Merge branch '1.1.x'
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/build.gradle
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-velocity/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
2014-11-13 18:52:49 -08:00
3a9d6242ea
Sync up versions used in Maven integration tests
...
Fixes gh-1797
2014-11-13 18:45:35 -08:00
Spring Buildmaster
Phillip Webb
Kris De Volder
Domingo Suarez Torres
Andy Wilkinson
Stephane Nicoll