Commit Graph

174 Commits

Author SHA1 Message Date
Rob Winch ccf96a4d69 SEC-2542: Polish dependency exclusions
This cleans up exclusions so the pom.xml are not as cluttered.
2014-04-02 09:47:29 -05:00
Rob Winch 3118e39de8 SEC-2542: Use exclusions to remove duplicate dependencies
A number of projects had duplicate dependencies on their classpaths
as a result of the same classes being available in more than one
artifact, each with different Maven coordinates. Typically this only
affected the tests, but meant that the actual classes that were
loaded was somewhat unpredictable and had the potential to vary
between an IDE and the command line depending on the order in which
the aritfacts appeared on the classpath. This commit adds a number of
exclusions to remove such duplicates.

In addition to the new exclusions, notable other changes are:

 - Spring Data JPA has been updated to 1.4.1. This brings its
   transitive dependency upon spring-data-commons into line with
   Spring LDAP's and prevents both spring-data-commons-core and
   spring-data-commons from being on the classpath
 - All Servlet API dependencies have been updated to use the official
   artifact with all transitive dependencies on unofficial servlet API
   artifacts being excluded.
 - In places, groovy has been replaced with groovy-all. This removes
   some duplicates caused by groovy's transitive dependencies.
 - JUnit has been updated to 4.11 which brings its transitive Hamcrest
   dependency into line with other components.

There appears to be a bug in Gradle which means that some exclusions
applied to an artifact do not work reliably. To work around this
problem it has been necessary to apply some exclusions at the
configuration level

Conflicts:
	samples/messages-jc/pom.xml
2014-04-02 09:47:26 -05:00
Rob Winch 6be4e3a9fc SEC-2506: Remove Bundlor Support 2014-03-05 13:32:16 -06:00
Rob Winch 4a1a2dfed4 Update min Spring version of 4.0.2.REELASE 2014-02-19 11:16:57 -06:00
Rob Winch e17adad878 SEC-2469: Support Spring LDAP 2.0.1+ 2014-02-12 08:11:26 -06:00
Rob Winch 2df5541905 SEC-2448: Update to HSQL 2.3.1 2013-12-14 10:19:06 -06:00
Rob Winch 4708287ad3 SEC-2444: Convert Java Config samples to thymeleaf and tiles 2013-12-13 15:47:28 -06:00
Rob Winch 6f9085dd5d SEC-2435: Update to Gradle 1.10-rc-2 2013-12-11 17:52:41 -06:00
Rob Winch 0da9b6c64b Update to spring.io 2013-12-09 16:51:45 -06:00
Rob Winch 4672c2a1f7 SEC-2430: Add Maven BOM 2013-12-09 15:51:49 -06:00
Rob Winch 548ed4e14a Update samples to declare repository already added 2013-12-06 14:46:52 -06:00
Rob Winch 6be4de854a Ensure artifactory uses customized pom 2013-12-06 14:46:52 -06:00
Rob Winch 74a6303b6f SEC-2385: Document how to use with Spring 4 2013-12-04 12:38:45 -06:00
Rob Winch 209cf317d6 SEC-2411: Update to Gradle 1.9 2013-11-25 16:57:42 -06:00
Rob Winch e657f89662 Remove checkRepositories 2013-11-01 09:32:24 -05:00
Rob Winch fa3d303f79 Remove repository release checks since init script adds automatically 2013-10-29 16:48:23 -05:00
Rob Winch 76a8bbe98d SEC-2354: Add failOnMissingWebXml=false to sample pom.xml 2013-10-07 08:12:35 -05:00
Rob Winch 88f41cdf62 SEC-2341: Update to Gradle 1.8
Some dependencies were necessary to update due to issues with JUnit
integration.
2013-09-24 15:35:51 -05:00
Rob Winch c156716be8 Ensure single version of org.slf4j 2013-09-18 16:13:03 -05:00
Rob Winch 53a0db6be1 SEC-2313: Gradle javadoc hotfix 2013-09-11 15:30:50 -07:00
Rob Winch 7203faf34f SEC-2300: Update Spring LDAP version to 1.3.2.RELEASE 2013-08-31 11:26:43 -05:00
Rob Winch 3d2f23602f SEC-2294: Update Spring Version to 3.2.4.RELEASE 2013-08-31 11:26:43 -05:00
Rob Winch ae368829f4 Tweak PermGen for tests 2013-08-28 13:30:25 -05:00
Rob Winch e1dfa81a0f GRADLE-1116: Add back workaround for depending on test sources 2013-08-13 09:13:02 -05:00
Rob Winch 337c3cf96c SEC-2255: Update to Gradle 1.7 2013-08-08 16:31:36 -05:00
Rob Winch 54bf6c846b SEC-2097: Remove configure() blocks from gradle/*.gradle 2013-08-08 16:29:43 -05:00
Rob Winch 976d9a9016 SEC-2194: Polish java config sample apps 2013-08-08 14:33:54 -05:00
Rob Winch 1f86d5dad9 SEC-2097: Add Tomcat Gradle plugin 2013-08-05 16:49:34 -05:00
Rob Winch 343a76de13 Use eclipse-wtp instead of eclipse in java projects 2013-08-05 16:49:34 -05:00
Rob Winch 6a1a6b080f No longer using Eclipse classpath container, so remove workarounds for it 2013-08-05 16:49:34 -05:00
Rob Winch ab2b461075 Gradle workaround for test source being deployed 2013-08-05 16:49:34 -05:00
Rob Winch 9d58317731 Use included configuration instead of sourceSets.main.output
Previously the crypto module was not exported in Eclipse because it was
listed as a test dependency to have it added as a dependency. Note that
this was all to work around GRADLE-1116

Now we add an included configuration that is exported for Eclipse, but not
added to the Maven pom (since all the crypto module is included in core).
2013-08-05 16:49:34 -05:00
Rob Winch 388a4dd9db SEC-2194: Add Java Config samples 2013-08-05 16:49:33 -05:00
Rob Winch 5e6ca12b01 SEC-2097: Update integrationTestCompile to use optional and provided
Also update slf4j version and remove explicit commons-logging from pom generation
2013-07-16 15:59:06 -05:00
Rob Winch 7d9f0d688a SEC-2207: Workaround for GRADLE-1116 2013-07-16 15:15:47 -05:00
Rob Winch 41b64e05d0 SEC-2211: check.dependsOn integrationTest 2013-07-16 15:15:47 -05:00
Rob Winch faa8b354b7 SEC-2209: add pom.xml 2013-07-16 15:15:47 -05:00
Rob Winch e5fc063680 SEC-2206: Gradle Propdeps 2013-07-16 15:15:42 -05:00
Rob Winch 07c3fdf8a7 SEC-2195: Update Groovy, Geb, Spock, httpcomponents, and Jetty 2013-07-16 15:02:39 -05:00
Rob Winch 1705c5d796 SEC-2207: Update Gradle to 1.6 2013-07-16 15:02:39 -05:00
Rob Winch 3c178a339e remove snapshot repo references 2013-07-01 13:00:57 -05:00
Rob Winch d0c4e6ca72 SEC-1953: Spring Security Java Config support
This is the initial migration of Spring Security Java Config from the
external project at
https://github.com/SpringSource/spring-security-javaconfig
2013-06-30 17:28:33 -05:00
Jean-Pierre Bergamin c02a1486c0 SEC-2118: Fixing spring and aspectj OSGi version ranges [3.2, 3.2) -> [3.2, 3.3) 2013-02-25 17:05:29 -06:00
Rob Winch 7edb1089a8 SEC-2096: Added release-checks 2012-12-18 15:15:46 -06:00
Rob Winch ebb82e1aa9 SEC-2096: Update to Spring 3.2.0.RELEASE 2012-12-18 15:15:46 -06:00
Rob Winch eaf4843474 Update to Gradle 1.3 2012-11-30 16:33:44 -06:00
Rob Winch 1ed643ca1f SEC-1998: Provide integration with WebAsyncManager#startCallableProcessing
Support integration of the Spring SecurityContext on Callable's used with
WebAsyncManager by registering SecurityContextCallableProcessingInterceptor.
2012-11-28 17:56:03 -06:00
Rob Winch 30780baf24 Externalize powermock dependencies for reuse 2012-11-08 22:49:20 -06:00
Rob Winch f61fab3509 Add fest-assert as default test dependency 2012-11-08 22:49:20 -06:00
Rob Winch ea6b444770 update to spring snapshot dependencies 2012-11-08 22:49:20 -06:00
Rob Winch ace6b804f7 Update to 3.2.x and added eclipse suffix to eclipse projects 2012-11-02 10:48:50 -05:00
Rob Winch c0dfb70ca0 Added generatePom task
This can be used to generate the pom.xml for adding the Spring Security
snapshot jars as a Maven Dependency to another project. For example,
if mywebapp requires the Spring Security 3.1.4.CI-SNAPSHOT jars one
could generate the pom.xml files and then use that to convert the project
into a valid Maven project within the IDE. Then the SNAPSHOT dependendies
could be added to mywebapp. This prevents the need to install the SNAPSHOT
dependencies in the local Maven repository.
2012-11-01 15:18:10 -05:00
Rob Winch 9e35e4aab4 Upgrade to Gradle 1.2 2012-09-21 14:19:24 -05:00
Rob Winch 191fc9c8be Update to Gradle 1.1 2012-09-04 10:14:19 -05:00
Rob Winch ab3031c8b9 SEC-1995: More Maven Central validation changes
Added developer information to the poms.
2012-08-09 23:43:07 -05:00
Rob Winch 5174a8020d SEC-1995: Maven Central validation changes
Ensure projects have the following so that Maven Central publishing works

  - Project name
  - Project description
  - Project URL
  - SCM information
  - Javadoc jar
2012-08-09 23:11:58 -05:00
Rob Winch 8ad0e0e8e8 SEC-1995: Use Gradle Artifactory integration for releases 2012-08-09 14:20:57 -05:00
Rob Winch c025e8db46 Added comment to ide-integration.gradle about STS-2723 2012-07-19 17:46:13 -05:00
Rob Winch 23ef7dac48 SEC-2009: Support ./gradlew eclipse
Previously there were problems when importing with ./gradlew eclipse. For
example GRADLE-1116 and GRADLE-1422.

The changes provide workarounds that are compatible with Gradle 1.0. Note
when importing after using ./gradlew eclipse users may get errors stating
"Element not found". This is only at the time of import and can be ignored.
This is an Eclipse bug logged as
https://bugs.eclipse.org/bugs/show_bug.cgi?id=244315
2012-07-19 17:42:36 -05:00
Rob Winch b28e3a0b2f SEC-1976: include *.aj files in sourceJar 2012-07-09 18:37:05 -05:00
Rob Winch 262ee099df SEC-1994: explicit sourceCompatibility and targetCompatibility of 1.5 in Gradle build 2012-07-08 15:55:48 -05:00
Rob Winch 638e92a3f7 SEC-1992: Updated Spring version to 3.0.7 2012-07-06 10:32:45 -05:00
Rob Winch fde9142d8d SEC-1907: Exclude crypto dependency in core module since classes are bundled in core 2012-07-05 13:56:47 -05:00
Rob Winch a2452ab514 SEC-1906: Update to Gradle 1.0 2012-07-05 12:41:56 -05:00
Rob Winch 2fba10ab61 Use powermock for testing servlet 3.0 functionality instead of distinct classpaths 2012-07-01 12:37:01 -05:00
Rob Winch ea56a98883 SEC-1868: Remove error level logs from SecurityNamespaceHandler when the web classes are not available and not required
To get the detailed errors the FilterChainProxy is loaded again in reportMissingWebClasses
and included in the readerContext fatal log.
2011-12-30 10:51:17 -06:00
Luke Taylor c0c283029a Upgrade Jetty version. 2011-10-30 21:45:58 +00:00
Luke Taylor d6b7b52a79 Update to Spring 3.0.6. 2011-08-19 15:06:26 -07:00
Luke Taylor 8ce4d326f5 Update HttpClient to 4.1.2 and removed incorrect bundlor references to commons version. 2011-08-12 00:23:29 +01:00
Luke Taylor ecfffaaa3f Make aspectj dependencies optional throughout and spring-jdbc/tx optional in core poms. Reduces exclusions required in third-party poms (e.g. spring-social). 2011-06-09 22:57:49 +01:00
Luke Taylor 3e18be1478 SEC-1747: Upgrade to Spring LDAP 1.3.1 2011-05-17 23:39:19 +01:00
Luke Taylor 1618bf1168 Upgrade to logback 0.9.28 2011-04-28 18:48:40 +01:00
Luke Taylor 28444978e5 Change to using pom 'builder' syntax for adding commons logging dep. 2011-04-28 13:45:01 +01:00
Luke Taylor 767f5b2423 Upgrade to gradle 1.0-M3. 2011-04-27 22:13:18 +01:00
Luke Taylor 614d8c0321 SEC-1723: Use standard SpEL syntax for accessing beans in the app context by name. 2011-04-22 13:47:59 +01:00
Luke Taylor ac96f27136 Gradle refactoring. Create separate S3 upload task and extract ide customization into a separate file. 2011-04-21 11:57:18 +01:00
Luke Taylor 23df97f44a Added missing HttpClient version information to openid bundlor template file. 2011-04-20 11:38:26 +01:00
Luke Taylor 315c225bcb Removed unused aspectj gradle file 2011-03-10 23:04:25 +00:00
Luke Taylor 4654f7065a SEC-1693: Expand upper bound on EHCache OSGi version to version 2.5 2011-03-10 19:38:04 +00:00
Rob Winch bd53ff1832 Updated gradle build so that eclipse is configured for AJDT 2011-03-07 22:12:13 -06:00
Rob Winch c7de933cb9 Updated gradle wrapper to gradle-1.0-milestone-1 2011-03-07 22:12:10 -06:00
Luke Taylor db6edfb512 Pull in changes to convert emma, aspectj and bundlor usage to plugins 2011-03-07 17:43:58 +00:00
Luke Taylor dc73bbef3f Add inputs to AspectJ compilation tasks for change-detection purposes. 2011-03-04 17:40:15 +00:00
Luke Taylor 27be72a81c SEC-1677: Split out LDAP server tests from config module. 2011-02-14 19:01:27 +00:00
Luke Taylor 44fb3aa4ab SEC-1677: Create integrationTest task for Java projects and make all tests in itest module run as integration tests only. 2011-02-14 15:03:15 +00:00
Luke Taylor b0df1bd1b0 SEC-1673: Use a map to store the range values use in the bundlor templates. 2011-02-07 16:06:23 +00:00
Luke Taylor 5caa41753a Add check for coverage data before trying to produce report. 2011-02-01 15:41:17 +00:00
Luke Taylor 39b48c6d95 Update gradle wrapper to 0.9.1 in order to use mavenLocal() repo syntax. 2011-01-10 17:27:22 +00:00
Luke Taylor 0ca5157f47 Set project release version to 3.1.0.M2 2010-12-20 22:46:54 +00:00
Luke Taylor f1fe3ce7e6 Update wrapper to gradle 0.9 release 2010-12-19 14:41:41 +00:00
Luke Taylor f85baac943 Updated to Spring 3.0.5 2010-10-27 13:25:40 +01:00
Luke Taylor 7dd8cd2fb9 Make sure ApacheDS work directory is set correctly for separate LDAP test task in config module. 2010-09-16 10:50:12 +01:00
Luke Taylor 551166a577 ApacheDS workDir property should be passed to the test process, not set as a system property in the main build process. 2010-09-14 14:43:21 +01:00
Luke Taylor d1e8b8e29d More tests. Minor refactoring. 2010-08-24 20:57:45 +01:00
Luke Taylor 5902c6b262 Adjustments to coverage generation (enable debug logging when coverage on). 2010-08-24 18:27:44 +01:00
Luke Taylor 837771537f Tweak docs build to only prevent "assemble" from depending on the archive/upload tasks. 2010-08-22 22:42:54 +01:00
Luke Taylor 5fe589e360 Added project property to enable test coverage. 2010-08-22 14:29:31 +01:00
Luke Taylor 68b11854ac Fix emma coverage to also include config LDAP tests (which are run in a separate Test instance) 2010-08-21 18:45:13 +01:00
Luke Taylor 6c96a7b025 Add emma coverage support. 2010-08-21 15:58:59 +01:00
Luke Taylor 9e5189c8ba Upgrade to Spring 3.0.4 and adjust IDEA plugin customization. 2010-08-21 14:15:54 +01:00