Commit Graph

55 Commits

Author SHA1 Message Date
Chris Beams
beafd5566c Polish whitespace and comments in pom files
- Convert spaces to tabs on -ftp/pom.xml

- Normalize multi-line comments to fit the following style:
    <!--
        depend explicitly on 2.0 in order to pick up the new
        release:update-versions goal
    -->

- Revert some of the formatting that the Maven release:update-versions
  goal forced on us. After it failed to perform its duties during the M7
  release, it appears we will not be using it anymore.
2010-09-04 13:24:25 +02:00
Chris Beams
38cc72ac6b Add missing <plugins> tag in <profile> declarations 2010-09-03 20:20:15 +00:00
Chris Beams
a97bf871e5 Move upload-dist into milestone and release profiles (INT-1388)
The following commands now upload zips to dist.springframework.org:

- `mvn -Pmilestone deploy`
- `mvn -Prelease deploy`

The following do not:

- `mvn -Psnapshot deploy`
- `mvn -Pstaging deploy`
2010-09-03 20:12:56 +00:00
Chris Beams
2d88bdd2e8 Increment versions to 2.0.0.BUILD-SNAPSHOT 2010-09-03 20:12:54 +00:00
Mark Fisher
7d73117d7a updates for m7 release 2010-09-03 18:56:05 +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
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
Josh Long
126fa35e2b initial commit of the finished twitter support. 2010-08-24 10:26:47 +00:00
Mark Fisher
59e4b98d39 INT-1295 added groupings for JavaDoc 2010-08-18 20:20:58 +00:00
Josh Long
d85fdaceb0 moving FTP / SFTP support from sandbox. 2010-08-17 03:59:52 +00:00
Mark Fisher
aeee48afbb changing pom version to 2.0.0.BUILD-SNAPSHOT 2010-07-28 19:54:08 +00:00
Chris Beams
d73d34751f Add cbeams@ to static.springframework.org scp config
Necessary because bamboo's public key is in my user's authorized_keys
on static.springframework.org
2010-07-28 19:01:09 +00:00
Mark Fisher
1f29147754 Releasing 2.0.0.M6 2010-07-28 18:41:13 +00:00
Chris Beams
23fb560dc0 Revert 'release' profile
-Prelease was inadvertently causing docbook generation to happen after
zip distribution packaging. Reasons for this are unclear, but given
that it was discovered in the middle of a release, the path of least
resistence is simply to revert the functionality and move on.
2010-07-28 18:17:14 +00:00
Chris Beams
3493163b2a Add milestone and EBR repositories to both poms 2010-07-28 17:14:09 +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
David Syer
47d209d73a FIx warnings and add javadoc links 2010-07-27 12:54:22 +00:00
David Syer
829d6efc08 Fix compiler warnings and move docbook build to a profile 2010-07-27 12:54:18 +00:00
Mark Fisher
082e0dd1c0 INT-910 added spring-integration-groovy to the main build 2010-07-21 17:07:05 +00:00
Mark Fisher
88b2798427 INT-1222 adding the spring-integration-xmpp module to the build/distribution process 2010-07-05 21:39:12 +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
David Syer
d818e8bc57 Fixed pom for clean build: parent must come first 2010-06-25 14:12:38 +00:00
Iwein Fuld
20ecd1a7db upgraded javadoc link from spring 3.0.2.RELEASE to 3.0.3.RELEASE 2010-06-25 06:17:28 +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
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
8d3b9c8eeb switched to single-page html output; the xsl applied in this case brings the L&F of the documentation closer to how it was in M4, which is a bonus 2010-06-02 20:25:09 +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
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
5826ea6362 prepended ${project.basedir} on all relative paths in parent pom to allow for goal invocation from directories other than the root 2010-06-02 08:44:50 +00:00
Chris Beams
2033df31a8 switching bundlor artifactIds back. looks like the issue was actually with 500 errors due to a temporary issue on s3's side. 2010-06-01 21:42:42 +00:00
Chris Beams
4effac42c5 s/com.springsource.bundlor.maven/com.springsource.bundlor/ across all poms 2010-06-01 21:15:12 +00:00
Chris Beams
f6b1d79f0f fixed various javadoc warnings; downgraded maven-javadoc-plugin to 2.5, as that's the version that gets forced when using Maven 2.1.0 anyway. 2010-06-01 17:57:29 +00:00
Chris Beams
1ea7e22171 eliminated <repositories> section from parent pom; using non-central repos only when and where absolutely necessary, and documenting their necessity explicitly. project was built against an empty local maven repo with success. 2010-05-28 18:13:12 +00:00
Chris Beams
82515f8f1e first fully working and integrated mvn install 2010-05-28 18:13:05 +00:00
Chris Beams
5c77f08fa9 now producing exact same assembly structure and content as M4 distribution zip. see src/assembly/distribution.xml and src/main/scripts/build-distribution.sh 2010-05-28 05:44:04 +00:00
Chris Beams
1ed1bbea6c updated distributionManagement settings to prepare for mvn deploy 2010-05-27 13:14:24 +00:00
Josh Long
a6ed81ffbe updated the pom.xml file 2010-05-26 03:33:24 +00:00
Chris Beams
e5219dfe8f eliminated all compiler warnings throughout all projects
updated pom to emit compiler warnings so that any new ones become obvious
added serialVersionUID to classes that could reasonably need to be serialized (GenericMessage, MessageHeaders, etc)
@SuppressWarnings("serial") on all others
@SuppressWarnings("unused") on private static classes used as spring beans for testing (their methods never get called from java)
eliminated all redundant casting
introducted generics metadata where raw types were still being used
changed public API on several FactoryBeans (by adding <Type> information to 'implements FactoryBean' clause)
2010-05-25 23:18:25 +00:00
Chris Beams
c08a7a657e renamed modules org.springframework.integration.* -> spring-integration-*
@Ignore'd SimpleTcpNetOutboundGatewayTests#testOutboundClose() to avoid failure; this failure is correlated to the module name change, but hard to understand how it would be caused by it
2010-05-25 13:21:25 +00:00
Chris Beams
d9123c968d removed exclusion for PropertyPlaceholderConfigurer 2010-05-24 17:51:22 +00:00
Chris Beams
f1b9b1b51d added spring-javadoc css for s2 green L&F; updated pom to reflect; removed old javadoc L&F 2010-05-24 17:51:21 +00:00
Chris Beams
cf6027e3b7 javadoc build infrastructure in place; mvn site will aggregate all javadoc under ${basedir}/target/site/apidocs. note that this is not (yet) in line with the s2 'green' l&f for javadoc; that will come later. 2010-05-20 17:49:39 +00:00
Chris Beams
1df136848e bundlor integration with the Maven build is complete; happens as part of the normal compile lifecycle (read: no special invocation necessary) 2010-05-20 11:08:11 +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