Commit Graph

57 Commits

Author SHA1 Message Date
Oleg Zhurakousky
e5f67740e4 INT-1254, fixed parent pom and security pom to pick up version of spring security from parent definition 2010-09-13 14:51:45 -04:00
Chris Beams
2d88bdd2e8 Increment versions to 2.0.0.BUILD-SNAPSHOT 2010-09-03 20:12:54 +00:00
Chris Beams
f4efc62ca7 Increment versions to 2.0.0.M7 2010-09-03 18:23:12 +00:00
Chris Beams
8d9046825e Add Maven profiles to ease deployment (INT-1404)
Use one of the following as appropriate when deploying the project:

* mvn deploy -Psnapshot
* mvn deploy -Pmilestone
* mvn deploy -Prelease

These profiles ensure that artifacts are uploaded to the right
repositories without requiring the buildmaster to change
<deploymentManagement> information manually.
2010-09-02 15:57:58 +00:00
Chris Beams
2c17719313 Introduce Maven release:update-versions plugin (INT-1320)
- Upgrade to version 2.0 of the maven-release-plugin in order to
  get the new 'update-versions' goal, which allows for doing nothing
  other than updating pom versions - no tagging, no checkins, etc.

- Accommodate idiosyncracies of the plugin. When running for the first
  time, it became clear that update-versions not only updates versions
  as advertised, but also formats certain elements of the pom.
  Committing just those format changes now so that future actual version
  updates will not have to deal with this uninvited 'help'.

- How to run the command:

  mvn --batch-mode release:update-versions -DdevelopmentVersion=2.0.0.M7

  This will edit the <version> elements in the poms of the projects listed
  in the root pom's <modules> section.
2010-09-02 15:57:05 +00:00
Chris Beams
63fc819afd Update to spring-commons-serializer 1.0.0.M1 (INT-1400)
Necessary in preparation for release of SI 2.0.0.M7 (INT-1388)
2010-09-02 14:27:46 +00:00
Chris Beams
41e8194239 Revert update to 3.0.4 (INT-1293) due to SpEL issue (SPR-7519)
Upon updating to 3.0.4 the build fails with SpEL error code EL1004E when
executing test method shouldFindSimpleAggregatorMethodWithArray().
Reverting for now, but SPR-7519 has been created for tracking what
appears to be a minor SpEL regression.

- template.mf files now declare range [3.0.3, 4.0.0) for all Spring dependencies

- pom.xml files reverted to dependence on 3.0.3.RELEASE
2010-09-02 12:42:23 +00:00
Chris Beams
4ded74b317 Update pom and template.mf files Spring 3.0.4 (INT-1293) 2010-09-02 10:54:11 +00:00
Chris Beams
9e6e232837 Disconnect samples from parent pom (INT-1316) 2010-09-02 10:22:53 +00:00
Mark Fisher
1b4144f07f adding snapshot repo to parent pom so that commons project can be resolved 2010-08-27 22:18:29 +00:00
David Syer
d98ff8eaa1 INT-1280: ship commons code out to external project 2010-08-25 12:22:27 +00:00
Mark Fisher
6b1795dcc4 reenabled build failure for test failures 2010-07-29 21:47:24 +00:00
Mark Fisher
aeee48afbb changing pom version to 2.0.0.BUILD-SNAPSHOT 2010-07-28 19:54:08 +00:00
Mark Fisher
1f29147754 Releasing 2.0.0.M6 2010-07-28 18:41:13 +00:00
Chris Beams
3493163b2a Add milestone and EBR repositories to both poms 2010-07-28 17:14:09 +00:00
Chris Beams
e1cb00ea48 Include Bundlor-generated manifests in jars
In the 2.0.0.M5 release bundlor successfully created manifests at
target/classes/META-INF/MANIFEST.MF within each subproject directory,
however they were not actually picked up by the maven-jar-plugin when
creating each archive. The samples parent pom has now been configured
to explictly specify the 'manifestFile' and refer to the bundlor-generated
manifest.

Additionally, the spring-integration-samples/pom.xml was updated with
a similar configuration for the maven-jar-plugin, but in this case the
spring-integration-parent/pom.xml configuration is being overwritten.
The samples projects do not use Bundlor, and thus there is no generated
manifest in the location mentioned above. This causes the maven-jar-plugin
to error out for the samples, and as a workaround there is now a zero-length
file at spring-integration-samples/src/main/resources/META-INF/MANIFEST.MF
that samples refer to during jar/war packaging. Ugly, but effective.
2010-07-28 16:23:13 +00:00
Chris Beams
72f9dadc69 Add upload-dist functionality 2010-07-28 16:23:10 +00:00
Chris Beams
c4dd25c1c2 Polish whitespace 2010-07-28 16:23:06 +00:00
Mark Fisher
14aae355f4 Incrementing poms to 2.0.0.BUILD-SNAPSHOT 2010-06-25 19:31:03 +00:00
Mark Fisher
6639886948 Releasing 2.0.0.M5 2010-06-25 18:52:36 +00:00
Mark Fisher
f617c0e678 updated spring-ws version to 1.5.9 in parent pom 2010-06-25 16:05:13 +00:00
David Syer
6e79334d6d INT-1069: Add namespace support for persistent queues 2010-06-19 06:33:53 +00:00
David Syer
1ef2d6a460 Another broken build... 2010-06-18 15:06:04 +00:00
Mark Fisher
9b944d5007 INT-1177 upgraded to Spring Framework 3.0.3 2010-06-15 14:27:16 +00:00
Iwein Fuld
ba191ae393 Added hamcrest-all to test dependencies 2010-06-14 12:41:55 +00:00
Chris Beams
6ee1ba4e25 touched up a number of pom comments; added <dependencyManagement> sections to parent and samples poms to allow for <version> and <scope> inheritance across concrete child modules, thus removing some verbosity 2010-06-04 00:07:16 +00:00
Mark Fisher
8c33adef25 failOnWarnings is now 'true' for bundlor plugin 2010-06-03 19:59:14 +00:00
Chris Beams
bc8e1334f2 added necessary <repository> for resolving org.springframework.build.aws.maven 3.0.0.RELEASE dependency 2010-06-03 14:51:21 +00:00
Chris Beams
bcf8a401c3 upgraded to aws-maven plugin 3.0.0.RELEASE to avoid SimpleStorageServiceWagon AbstractMethodError build failure happening against 2.0.0.RELEASE when attempting a mvn deploy. See http://build.springframework.org/browse/INT-NIGHTLY-911 for full stack trace. The plugin upgrade should work only on the CI server, which has the 3.0.0.RELEASE artifact already installed; it's not yet clear whether and which maven repository the aws-maven plugin is deployed to, so it will fail for anyone else. No matter for most users and use-cases, however, as it's only the deploy/site-deploy targets that need this plugin. Once it's clear where to fetch this from, a <repository> will be added. 2010-06-02 20:25:07 +00:00
Chris Beams
ef62031617 commented out section in distribution.xml assembly descriptor that aggregates dependencies into the lib/ directory until we figure out what our final plan is with distributing third party dependencies. also copied distributionManagement section from root pom to parent pom; unfortunately it looks like this duplication across the poms cannot be avoided. 2010-06-02 19:20:22 +00:00
Chris Beams
1dad825ea9 created spring-integration-parent module to get away from problems documented at http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html; root pom is now responsible for 'process' issues like <modules> management, documentation, assembly and deployment; -parent pom is responsible for inheritable properties and dependencies; a nice separation of concerns in the end. build-distribution.sh script is no longer required as docbook, javadoc and assembly creation are all now attached to the package phase of the lifecycle. mvn -Pstaging deploy site-deploy to dry-run a deployment; mvn deploy site-deploy to do the real thing. nightly CI build will be updated to do the latter and serve as documentation on how to deploy the project. 2010-06-02 18:40:35 +00:00
Chris Beams
b97b2fb090 removed spring build artifacts and externals 2010-05-25 12:12:41 +00:00
Chris Beams
83cac18b6e * unified parent and root poms (eliminates the need for spring-integration-parent, however it's still there to make spring-build happy in the meantime)
* incremental progress on getting docbkx working
  - downgraded docbook 4.5 -> 4.4 because of "URI is not file" errors (`find src/docbkx/*.xml | xargs grep -l '4\.5' | xargs perl -p -i -e 's/4\.5/4.4/g'`)
  - eliminated spring-integration-reference in favor of idiomatic src/docbkx under project root
  - using xsl from spring-ws to get things working. need to figure out how to integrate previous xsl, however (it's still there), because the L&F is quite different now
  - upgraded version of docbkx plugin to 2.0.9
2010-05-20 09:37:33 +00:00
Chris Beams
43310c9cab general pom cleanup
* normalizing version placeholders to use ${groupId}.version as a naming convention e.g.: 'org.springframework.version'
* added properties to parent pom <properties/> section
* spaces -> tabs
* removed empty newlines in poms (favor comments instead of newlines)
* gave all samples nice <name>s
* included ws-inbound-gateway in the samples parent pom <modules> section
* samples now try to run any **/*Tests.java, as per our general conventions
2010-05-19 09:41:37 +00:00
Chris Beams
3bcb5a726a Added log4j to maven build at test time to avoid spurious INFO logging
Updated log4j.xml files to quell debug/info output
Moved src/test/resources/**/* -> src/main/resources/**/* for the time being to fix the jdbc build
Eliminated several System.out.println calls in tests
2010-05-14 15:34:17 +00:00
Chris Beams
0d45dc0fca added missing repository for foundrylogic vpp dependency 2010-05-07 14:41:15 +00:00
David Syer
a8d9c4cfc2 INT-1052: add schema scripts for common platforms 2010-05-06 08:59:13 +00:00
David Syer
8c2c2ca416 Merge branch 'work' 2010-05-03 08:58:21 +00:00
David Syer
ec76ea497a Add bits of missing Eclipse meta data 2010-05-02 04:23:49 +00:00
David Syer
a557123cbb fix ws pom 2010-04-28 08:24:37 +00:00
Mark Fisher
8ec441fc2f adding spring-integration-parent POM to the build 2010-04-06 14:16:06 +00:00
Mark Fisher
40385fb836 INT-1061 Upgraded to Spring 3.0.2 2010-04-02 16:30:41 +00:00
Mark Fisher
2700036a9f INT-990 upgraded to Spring 3.0.1 2010-02-19 21:17:07 +00:00
Iwein Fuld
59783244f1 upgraded spring.version in pom.xml 2009-12-18 14:33:14 +00:00
Mark Fisher
2e72122373 updated parent POM's spring.version property to Spring 3.0 RC3 2009-12-10 15:14:02 +00:00
Mark Fisher
fe9160e1e7 INT-759 updated parent pom 2009-10-02 01:08:40 +00:00
Iwein Fuld
d8bda324fb updated a few outdated Spring versions 2009-09-30 18:54:14 +00:00
Mark Fisher
3be8f7b46d pom updates 2009-08-21 16:46:03 +00:00
Mark Fisher
8723427e1a fixed typo 2009-08-20 18:47:03 +00:00
Mark Fisher
d0caa68a6e updated poms for 2.0.0.BUILD-SNAPSHOT and added spring.version and junit.version properties to parent pom 2009-08-20 18:41:20 +00:00