Commit Graph

49 Commits

Author SHA1 Message Date
Spring Buildmaster
5f959b074f Next Development Version 2016-09-20 20:20:06 +00:00
Spring Buildmaster
a89ef5df6e Next Development Version 2016-07-28 09:18:40 +00:00
Spring Buildmaster
2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Spring Buildmaster
819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Spring Buildmaster
376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Spring Buildmaster
225d877ab9 Next Development Version 2016-02-26 01:06:16 -08:00
Spring Buildmaster
504d3e97ba Next development version 2016-01-21 18:41:30 -08:00
Andy Wilkinson
2aff82bb64 Merge branch '1.2.x' 2016-01-12 10:19:36 +00:00
Spring Buildmaster
8db59059a5 Next Development Version 2015-12-18 05:43:02 -08:00
Stephane Nicoll
bb736e255b Fix SNAPSHOT version 2015-12-17 14:15:14 +01:00
Spring Buildmaster
3f6f57a80e Next Development Version 2015-11-16 03:18:54 -08:00
Andy Wilkinson
f54b5d7ac1 Change ordering of deployment tests to keep Cargo happy
For some reason, Cargo fails when the Tomcat deployment tests are run
after the TomEE deployment tests. It complains that it can’t find one
of its own classes. This commit changes the order so that the TomEE
tests run before the Tomcat tests.

\_(ツ)_/¯
2015-10-28 14:13:29 +00:00
Andy Wilkinson
c4122b8f8d Work around brittle annotation scanning in Mojarra
FacesListener in Mojarra 2.2.12 (used in Glassfish 4.1.1) is a
ServletContainerInitializer that’s annotated to handle types annotated
with javax.annotation.Resource.
OAuth2RestOperationsConfiguration.SessionScopedConfiguration is one such
class. This leads to com.sun.faces.config.DelegatingAnnotationProvider
calling getAnnotations on SessionScopedConfiguration.class. This fails
with a java.lang.ArrayStoreException due to SessionScopedConfiguration
being annotated with @ConditionalOnBean(OAuth2ClientConfiguration) and
OAuth2ClientConfiguration not being on the classpath.
DelegatingAnnotationProvider currently catches NoClassDefFoundErrors
thrown during its annotation processing. It needs to be made more
robust so that it also copes with an ArrayStoreException, in a similar
way to how org.glassfish.apf.impl.AnnotationProcessorImpl was updated to
fix GLASSFISH-21265 [1]. I’ve opened an issue to this effect [2].

In the meantime, we can work around the brittleness in
DelegatingAnnotationProvider by restructuring
SessionScopedConfiguration. This commit moves the use of @Resource into
a nested inner class, ClientContextConfiguration, while leaving the use
of @ConditionalOnBean on SessionScopedConfiguration. This means that it
is now ClientContextConfiguration that is passed to FacesListener and
processed by DelegatingAnnotationProcessor, thereby avoiding exposing
it to the @ConditionalOnBean annotation that it does not handle
gracefully. A Glassfish-based deployment test has also been added to
verify the fix.

Closes gh-2079
Closes gh-4321

[1] https://java.net/jira/browse/GLASSFISH-21265
[2] https://java.net/jira/browse/JAVASERVERFACES-4076
2015-10-28 12:18:22 +00: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
Spring Buildmaster
2b38a861e3 Next Development Version 2015-10-16 05:57:24 -07:00
Andy Wilkinson
5af0903c0e Merge branch '1.2.x' 2015-10-12 15:06:26 +01:00
Andy Wilkinson
9218d5ad11 Use Maven Central as source of Tomcat binaries for deployment tests
Closes gh-4151
2015-10-12 15:05:53 +01:00
Phillip Webb
6ab376e2e8 Reformat code use Eclipse Mars 2015-10-07 23:32:31 -07:00
Andy Wilkinson
3697dd52a0 Use main Apache archive for Tomcat binaries to improve(?) build stability
Mirrors of archive.apache.org only mirror the latest release of each
project so, as new releases are made, builds using older versions will
break as the mirrors are updated.

This commit updates the Tomcat deployment test to use the main Apache
archive site. This should provide long-term access to Tomcat binaries,
improving build stability and ensuring that tagged builds are
repeatable.

Backport of 5f087e6444
2015-10-07 11:57:46 +01:00
Andy Wilkinson
5f087e6444 Use main Apache archive for Tomcat binaries to improve(?) build stability
Mirrors of archive.apache.org only mirror the latest release of each
project so, as new releases are made, builds using older versions will
break as the mirrors are updated. T

This commit updates the Tomcat deployment test to use the main Apache
archive site. This should provide long-term access to Tomcat binaries,
improving build stability and ensuring that tagged builds are
repeatable.
2015-10-06 15:37:41 +01:00
Phillip Webb
7ed1534c7b Exclude validation JARs from deployment tests
Exclude spring-boot-starter-validation since those jars are provided
by the container.
2015-09-21 16:46:57 -07:00
Spring Buildmaster
9409c49c10 Next development version 2015-09-16 09:00:17 -07:00
Phillip Webb
9a779a09b4 Merge branch '1.2.x' 2015-09-10 20:08:08 -07:00
Phillip Webb
e97042507b Restore cargo downloads directory to /tmp
Using the $home directory seems to be causing intermittent failures on
the CI box.

See gh-3861
2015-09-10 15:29:34 -07:00
Phillip Webb
43528abe1e Try to get cargo working 2015-09-08 19:15:35 -07:00
Phillip Webb
67402405db Reformat code 2015-09-08 14:56:40 -07:00
Phillip Webb
f4dcef281c Merge branch '1.2.x' 2015-09-03 11:30:08 -07:00
Phillip Webb
b4e0a77269 Polish POM whitespace 2015-09-03 10:39:49 -07:00
Stephane Nicoll
817111c6d3 Merge branch '1.2.x'
Conflicts:
	spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
	spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
2015-09-01 16:46:22 +02:00
Stephane Nicoll
426a8dc103 Store container installs in home directory
Previously, deployment tests were storing the container archives in the
default location (that is `/tmp`) for a total weight of 160MB. In case
the temp directory is cleaned on CI, these have to be downloaded again.

We're now configuring cargo to store these archives in the home directory
instead. This should improve the speed and the stability of the
deployment tests

Closes gh-3861
2015-09-01 16:41:29 +02:00
Stephane Nicoll
1bf0abc456 Merge branch '1.2.x' 2015-07-20 10:01:16 +02:00
Vladimir Tsanev
8fe9fc25b3 Reserve random port for JBoss tx manager
Closes gh-3546, closes gh-3547
2015-07-20 10:00:51 +02:00
Spring Buildmaster
7ce391db4f Next development version 2015-07-01 22:48:01 -07:00
Andy Wilkinson
0a42a0e0d6 Merge branch '1.2.x' 2015-06-09 15:33:44 +01:00
Andy Wilkinson
4a36c2e041 Increase the timeout period for container startup in deployment tests
The build currently fails intermittently when an external container,
usually TomEE or Wildfly, fails to start within the default timeout
period of two minutes. This commit updates the timeout to 5 minutes for
all containers (Tomcat, TomEE and Wildfly) in the hope that it will
help to stabilise the CI build.
2015-06-09 15:33:38 +01:00
Spring Buildmaster
5d81c87b43 Next Development Version 2015-06-04 00:49:11 -07:00
Stephane Nicoll
b96e878305 Switch to Apache US mirror 2015-05-15 17:38:05 +02:00
Spring Buildmaster
e03c11dda8 Next development version 2015-03-30 22:56:20 -07:00
Phillip Webb
61ac918e87 Move master to 1.3.0.BUILD-SNAPSHOT 2015-02-26 20:34:32 -08:00
Phillip Webb
a57a88f5cf Move master to 1.3.0.BUILD-SNAPSHOT 2015-02-26 17:01:02 -08:00
Spring Buildmaster
8f0ad02237 Next development version 2015-02-26 15:26:53 -08:00
Phillip Webb
8e594c790e Fix eclipse errors and warnings
Fix some eclipse errors and warnings caused by XSD validation errors and
classes in the wrong place.
2015-02-24 12:44:19 -08:00
Spring Buildmaster
60725cd8bd Next development version 2015-01-07 23:37:07 -08:00
Spring Buildmaster
1a788c1741 Next development version 2014-12-10 16:35:50 -08:00
Phillip Webb
90e9187b80 Polish deployment tests 2014-12-07 12:22:57 -08:00
Phillip Webb
e0ba7a4dcb Update WildFly config to also set AJP port
See gh-1736
2014-12-06 06:36:39 -08:00
Phillip Webb
52fd5dde58 Update cargo configuration to also set AJP ports
Fixes gh-1736
2014-12-06 00:35:18 -08:00
Phillip Webb
44dde9fc12 Add deployment integration tests
Add deployment tests for Tomcat, TomEE and WildFly to ensure that
a basic Spring Boot application can be deployed to a traditional
Application server.

Since the deployment tests can be quite slow, they currently only
run in the "full" build profile.

Fixes gh-1736
2014-12-05 23:04:22 -08:00