Commit Graph

55 Commits

Author SHA1 Message Date
Donald J. Brown 6a39976815 Fixing versions that didn't get set by maven for some reason
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_1@649086 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 13:24:25 +00:00
Donald J. Brown a9699d0450 [maven-release-plugin] copy for tag STRUTS_2_1_1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_1@649034 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 10:00:40 +00:00
Donald J. Brown 581252add3 Adding cargo version to fix broken build
WW-2539


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@647660 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 04:46:38 +00:00
Donald J. Brown 8334897347 Moving rest app over the apps area
WW-2312


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@594767 13f79535-47bb-0310-9956-ffa450edef68
2007-11-14 05:06:19 +00:00
Antonio Petrelli a7f74978a4 WW-2147
Now a RAT check is run during the release process.
Fixed files with missing license.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@591790 13f79535-47bb-0310-9956-ffa450edef68
2007-11-04 15:30:32 +00:00
Antonio Petrelli 1c7efe4764 WW-2221
Configured the WAR plugin to put the LICENSE.txt and NOTICE.txt files under META-INF.
Removed redundant LICENSE.txt and NOTICE.txt in blank webapp.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@591754 13f79535-47bb-0310-9956-ffa450edef68
2007-11-04 10:44:35 +00:00
Ted Nathan Husted 8c2dfbd367 WW-1789, WW-2279 Update velocity to 1.5, velocity-tools to 1.3, and Spring to 2.0.7. Apply one-line change to VelocityManager suggested by Rod Vagg.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@590528 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 01:24:43 +00:00
Ted Nathan Husted 2151d7273c WW-1715 Update POMs and backport for 2.1.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@589617 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 13:12:30 +00:00
Ted Nathan Husted 82e768b673 WW-1715 Update POMs and backport for 2.1.0.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@589454 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 01:09:07 +00:00
Antonio Petrelli b25dc1b3c3 WW-2151
Resolved snapshot dependencies by using the latest released version available, with the exception of Plexus (using 1.0-alpha-10) and XWork (still using SNAPSHOT).

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@571941 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 10:41:16 +00:00
Antonio Petrelli f50c16070f WW-2049
First bunch of license headers in sample apps code.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@563238 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 19:53:57 +00:00
Ted Nathan Husted 02249e0558 WW-1715 Update POMs for the 2.1.0 snapshot.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@504540 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 13:23:42 +00:00
Ted Nathan Husted 80d3f05fe7 WW-1685 Update POMs for the next shapshot.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@503763 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 16:48:39 +00:00
Ted Nathan Husted 6489ffdafb WW-1685 Update POMs for 2.0.5 tag.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@503710 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 14:57:11 +00:00
Ted Nathan Husted ac8b7404f1 Update POMs for Struts 2.0.5 SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@500934 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 03:51:53 +00:00
Ted Nathan Husted 238abc3d12 WW-1650 Update POMs for 2.0.4 release.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@500931 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 03:38:40 +00:00
Ted Nathan Husted bce0209ecc WW-1588 Update POMs for 2.0.4-SNAPSHOT (once again).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498062 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 03:49:06 +00:00
Ted Nathan Husted 8bf687db8f WW-1588 Update POMs for 2.0.3 (third try).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498041 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 01:50:47 +00:00
Ted Nathan Husted a97043519c WW-1588 Update POMs for 2.0.4-SNAPSHOT (as discussed).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@497807 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 13:26:15 +00:00
Ted Nathan Husted c66b4ed34a WW-1588 Update POMs for 2.0.3 (second try).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@497787 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 12:10:42 +00:00
Ted Nathan Husted 2573b581c9 WW-1588 Update POMs for 2.1.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@496766 13f79535-47bb-0310-9956-ffa450edef68
2007-01-16 17:01:40 +00:00
Ted Nathan Husted e563bd0e15 WW-1588 Update POMs for Struts 2.0.3 build.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@496715 13f79535-47bb-0310-9956-ffa450edef68
2007-01-16 14:55:03 +00:00
Ted Nathan Husted ef999fe8fc WW-1483 Update POM versions for Struts 2.0.3-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491460 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 18:09:12 +00:00
Ted Nathan Husted ed450a698a WW-1483 Update POM versions for Struts 2.0.2 release. Update feature list.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491439 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 16:10:19 +00:00
Wendy Smoak 42bc64b5af Upgrade the example apps to Spring 2 by removing the Spring 1.2.8 dependencies from the struts2-apps parent pom. If the example app uses the struts2-spring-plugin, it will get its Spring 2 dependencies transitively.
WW-1483

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@490906 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 01:20:08 +00:00
James Mitchell c43ed346a0 fix pom scm locations
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@470345 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 12:11:47 +00:00
Ted Nathan Husted 0bc260e917 WW-1453 Update POMs for next distribution.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@462600 13f79535-47bb-0310-9956-ffa450edef68
2006-10-10 22:09:23 +00:00
Ted Nathan Husted a5f0d67553 WW-1453 Update POMs so as to tag 2.0.1.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@462570 13f79535-47bb-0310-9956-ffa450edef68
2006-10-10 21:16:01 +00:00
James Mitchell 2c577937eb Add license (sorry, I couldn't find a suitable JIRA #)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@451096 13f79535-47bb-0310-9956-ffa450edef68
2006-09-29 03:11:01 +00:00
Ted Nathan Husted 2398426d38 WW-1349 Update POM versions for next iteration (2.0.1)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@449470 13f79535-47bb-0310-9956-ffa450edef68
2006-09-24 19:56:59 +00:00
Ted Nathan Husted 522abf29c0 WW-1349 Various minor updates to prepare for Struts 2.0.0.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@447068 13f79535-47bb-0310-9956-ffa450edef68
2006-09-17 14:09:09 +00:00
Wendy Smoak 7dbefd972f Move the 'copy-sources' antrun plugin execution to <build>/<plugins>, so it will execute by default. (It was incorrectly placed in the hostedqa profile.)
Make sure the files in src/main/resources get included in both WEB-INF/classes and WEB-INF/src.
WW-1305

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@441357 13f79535-47bb-0310-9956-ffa450edef68
2006-09-08 02:54:21 +00:00
Ted Nathan Husted 826781a429 WW-1349 Try to include source with S2 examples, but no joy.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@440694 13f79535-47bb-0310-9956-ffa450edef68
2006-09-06 11:40:40 +00:00
Ted Nathan Husted a13c1b40c9 =WW-1340 Move starter to the sandbox since it now overlaps both blank and the archetype.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@440536 13f79535-47bb-0310-9956-ffa450edef68
2006-09-06 00:07:44 +00:00
Ted Nathan Husted ef8d3af4b8 WW-1388 Move shopping-cart into sandbox, for now.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438222 13f79535-47bb-0310-9956-ffa450edef68
2006-08-29 21:26:14 +00:00
Donald J. Brown 5ca278093a Updated to Spring 1.2.8
Patch provided by Eric Molitor
WW-1394


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@425796 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 18:18:44 +00:00
Ted Nathan Husted 767de1723b WW-1378 Amend version from 2.0 to 2.0.0 to match 1.x conventions. Add Mailreader to apps roster.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@424751 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 15:02:22 +00:00
Ted Nathan Husted 957ad96110 ww-1367 Update applications and taglib references.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@424152 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 01:04:41 +00:00
Donald J. Brown 32f94c1b9e Adding a Maven 2 build for mailreader, integrating it into the regular
maven build, restructuring app source for Maven
WW-1349


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@423349 13f79535-47bb-0310-9956-ffa450edef68
2006-07-19 02:56:36 +00:00
Patrick Lightbody 3cff6992b5 removing jetty configuration from hostedqa profile (it seems to be breaking stuff at the moment)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@420665 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 00:16:40 +00:00
Donald J. Brown 56b589c842 Changing xwork package from com.opensymphony.xwork to
com.opensymphony.xwork2, adding rife as optional
XW-399


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@420385 13f79535-47bb-0310-9956-ffa450edef68
2006-07-10 00:57:05 +00:00
Donald J. Brown 989fae9e17 Trying putting struts2 in the artifact id rather than the group id. This
works better when having maven generate IDE projects so that they don't
conflict with Struts 1 artifacts.  Also fixed up a few other poms.

WW-1367


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@418532 13f79535-47bb-0310-9956-ffa450edef68
2006-07-02 00:16:06 +00:00
Donald J. Brown d6f532c596 Renamed org.apache.struts.action2 package to org.apache.struts2 for apps
WW-1367


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@418530 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 23:58:13 +00:00
Patrick Lightbody 6facdd3f78 new location of xfire jars
git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@415758 13f79535-47bb-0310-9956-ffa450edef68
2006-06-20 18:34:16 +00:00
Wendy Smoak f2f5cce876 Restore the <dependencies> section in apps/pom.xml.
All of the example apps require both struts-core and Spring.

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@410010 13f79535-47bb-0310-9956-ffa450edef68
2006-05-29 01:21:19 +00:00
Wendy Smoak aeca0f7259 Move struts-core out of <dependencyManagement> because it is required by all example apps.
git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@410003 13f79535-47bb-0310-9956-ffa450edef68
2006-05-28 23:19:54 +00:00
Wendy Smoak b0d54e0f7a Move the Spring dependencies into <dependencyManagement>.
Add build/finalName to remove the version number from the packaged webapp filename.

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@409914 13f79535-47bb-0310-9956-ffa450edef68
2006-05-28 03:24:39 +00:00
Wendy Smoak 5a7c9c9e6e Added Cargo plugin configuration for apps.
Usage:  mvn package cargo:start -Dcargo.tomcat5x.home=/path/to/tomcat

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@408821 13f79535-47bb-0310-9956-ffa450edef68
2006-05-23 03:02:18 +00:00
Donald J. Brown 431d293071 Removing showcase profile since it is included in the default build
git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@408481 13f79535-47bb-0310-9956-ffa450edef68
2006-05-21 20:24:41 +00:00
Donald J. Brown 679fe3a04e Adding the showcase back to the default build with the extras dep removed
WW-1306y


git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@408480 13f79535-47bb-0310-9956-ffa450edef68
2006-05-21 20:22:18 +00:00