Phillip Webb
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
0cc313f224
Polish
2017-01-05 11:30:33 -08:00
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
Phillip Webb
4bfecc1307
Merge branch '1.5.x'
2017-01-04 23:52:40 -08:00
Phillip Webb
cc7c2ebb87
Migrate to android-json
...
Migrate from `org.json:json` to the clean room Apache 2.0 licensed
version that was developed for Android.
Fixes gh-5929
2017-01-04 23:00:06 -08:00
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
Phillip Webb
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
Phillip Webb
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
Phillip Webb
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
Phillip Webb
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
Andy Wilkinson
4edab86ba2
Merge branch '1.5.x'
2016-11-16 09:13:32 +00:00
Andy Wilkinson
387a406aad
Merge branch '1.4.x' into 1.5.x
2016-11-16 09:13:17 +00:00
Andy Wilkinson
b3e0a37197
Remove unwanted System.out calls in test code
2016-11-16 09:12:13 +00:00
Andy Wilkinson
9a70a4e261
Merge branch '1.5.x'
2016-11-08 14:43:05 +00:00
Andy Wilkinson
d7ef48a9b6
Merge branch '1.4.x' into 1.5.x
2016-11-08 14:43:00 +00:00
Andy Wilkinson
2c4f39045f
Stop relying on Artemis's on-demand queue creation in CLI JMS test
...
Artemis's on-demand queue cretaion appears to be rather flakey,
sometimes failing with a NullPointerException.
This commit ensures that the queue used by the sample is created
during start up rather than on demand. This will hopefully make the
test that runs the sample more robust.
Closes gh-7346
2016-11-08 14:36:58 +00:00
Andy Wilkinson
becf225911
Simplify CLI integration auto-config test by removing use of Artemis
...
Artemis seems to be a bit flakey which is causing sporadic build
failures, for example due to an NPE in Artemis' code.
2016-11-04 20:58:14 +00:00
Andy Wilkinson
4486d2d209
Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
...
Closes gh-7301
See gh-7029
2016-11-03 20:49:02 +00:00
Dave Syer
13a02a6e55
Merge branch '1.5.x'
2016-10-28 10:33:06 +01:00
Dave Syer
f62abade90
Make DependencyResolutionContext empty by default
...
It's more useful as a building block for other tools that way,
and it's easy to add the spring boot dependencies using public
methods.
2016-10-28 10:32:20 +01:00
Stephane Nicoll
264d8442da
Fix build
2016-10-11 18:33:54 +02:00
Stephane Nicoll
c5cc626d48
Remove remote shell support
...
See gh-7044
2016-10-11 17:59:25 +02:00
Andy Wilkinson
1bb5dc205d
Update samples to use Artemis in place of HornetQ
...
Closes gh-7057
2016-09-29 11:52:09 +01:00
Andy Wilkinson
472117299e
Add some integration tests for the CLI’s quiet mode
...
See gh-6918
2016-09-18 10:56:18 +01:00
Andy Wilkinson
270530c4fd
Fix class loading problems when CLI extensions are installed
...
Previously, CLI extensions where installed into the CLI's lib
directory which meant that they were on the class path of the app
class loader. Following the change to an executable jar's packaging,
this meant that they could not see classes in the CLI and a
ClassNotFoundException would result.
This commit updates the CLI to install extensions into lib/ext and
load commands using a new ClassLoader that has all of the jars in
lib/ext on its class path and that uses the launch class loader as
its parent.
Closes gh-6615
2016-08-11 16:01:18 +01:00
Phillip Webb
99c6194e17
Don't use MockitoJUnitRunner
...
Replace `@RunWith(MockitoJUnitRunner.class)` with direct Mockito
initialization since the running doesn't support parallel test
execution.
2016-06-09 20:55:59 -07:00
Phillip Webb
2f815a907a
Migrate existing tests from deprecated package
...
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:
find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;
See gh-5293
2016-03-23 22:17:50 -07:00
Andy Wilkinson
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
2016-02-25 12:09:42 +00:00
Phillip Webb
89b7704977
Extract spring-boot-test.jar
...
Relocate the `org.springframework.boot.test` package from the
`spring-boot.jar` to `spring-boot-test.jar`.
Fixes gh-5184
2016-02-19 19:28:37 -08:00
Phillip Webb
962a598531
Use AssertJ in spring-boot-cli
...
See gh-5083
2016-02-06 15:51:26 -08:00
Andy Wilkinson
c4f756daee
Fix MavenSettings’ handling of profiles activated by a file
...
Previously, MavenSettings used a FileProfileActivator with no
PathTransformer. If a settings.xml file contains a file-activated
profile this would result in an NPE within Maven. This was made worse
by the NPE not being included in the resulting failure message which
hampered diagnosis of the problem.
This commit updates MavenSettings to configure its FileProfileActivator
with a PathTransformer. It also improves the failure message that’s
created from any problems that are reported by Maven while determining
the active profiles to include a problem’s exception if it has one.
Closes gh-4826
2016-01-18 13:18:16 +00:00
Phillip Webb
0489a3b4de
Polish
2015-12-10 19:43:29 +00:00
Andy Wilkinson
2efc4b8332
Add tests to verify improved exception message formatting
2015-12-07 13:25:12 +00:00
Johnny Lim
1e4f8fdd8e
Polish
2015-11-13 18:06:31 -08:00
Matt Benson
5e7376fb3c
Interpolate property values for repositories
...
Update RepositoryConfigurationFactory to apply a RegexBasedInterpolator
to repository IDs and URLs.
Fixes gh-4318
Closes gh-4319
2015-11-11 14:41:28 -08:00
Phillip Webb
634bb770b2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:58:34 -07:00
Phillip Webb
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
Phillip Webb
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
Andrey Stolyarov
9a63e574b6
Add spring war command
...
Add a `war` command to the CLI to generate WAR archives.
Fixes gh-925
Closes gh-4168
2015-10-14 20:16:21 -07:00
Phillip Webb
c525689b0f
Polish
2015-10-07 23:40:34 -07:00
Phillip Webb
c9fb9916b8
Reformat code using Eclipse Mars
2015-10-07 23:37:10 -07:00
Phillip Webb
e473364e4e
Merge branch '1.2.x'
2015-10-07 23:34:08 -07:00
Phillip Webb
6ab376e2e8
Reformat code use Eclipse Mars
2015-10-07 23:32:31 -07:00
Dave Syer
5d8ccbacdf
Add a convenience AstTransformation base class for BOMs
...
Plugin authors can extend this class, provide missing methods,
and specify a BOM to add to the dependency management lookup
(i.e. dependencies by artifactId)
2015-10-06 09:31:23 +01:00
Phillip Webb
e07df7e4c6
Remove redundant modifiers
2015-09-08 17:01:30 -07:00
Phillip Webb
6e29ee4557
Polish
2015-09-08 16:04:30 -07:00
Phillip Webb
0335053139
Merge branch '1.2.x'
2015-09-08 14:37:16 -07:00
Phillip Webb
15686ed4fd
Reformat code
2015-09-08 14:07:06 -07:00
Phillip Webb
0f6b60d8c8
Organize imports
2015-09-08 14:05:00 -07:00
