vmassol 2003/09/21 00:59:03
Modified: framework project.xml project.properties
Log:
- Moved dependency to J2EE jar instead of servlet jar. We had to do it one day I
guess. The drawback is that Maven cannot redistribute the Sun j2ee jar so users will
need to download it manually and install it in their local repository
- Make it work both for J2EE API 1.2 and 1.3
Revision Changes Path
1.7 +3 -3 jakarta-cactus/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 21 Sep 2003 06:53:18 -0000 1.6
+++ project.xml 21 Sep 2003 07:59:03 -0000 1.7
@@ -52,9 +52,9 @@
<url>http://www.httpunit.org/</url>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
+ <groupId>j2ee</groupId>
+ <artifactId>j2ee</artifactId>
+ <version>${cactus.j2ee.version.full}</version>
</dependency>
</dependencies>
<packageGroups>
1.6 +8 -3 jakarta-cactus/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 21 Sep 2003 06:58:16 -0000 1.5
+++ project.properties 21 Sep 2003 07:59:03 -0000 1.6
@@ -2,8 +2,13 @@
# either by defining a build.properties file with the overriden properties
# or by passing them on the command line as system parameters (-D).
-# J2EE API version to use. Valid values are: 12 or 13
-cactus.j2ee.version = 13
+# J2EE API version to use. Valid values are: 1.2 or 1.3. Defaults to 1.3.
+# Tip: If you wish to runt he build for J2EE 1.2, simply type
+# maven -Dcactus.j2ee.version.minor=2 <your goals here>
+cactus.j2ee.version.major = 1
+cactus.j2ee.version.minor = 3
+cactus.j2ee.version = ${cactus.j2ee.version.major}${cactus.j2ee.version.minor}
+cactus.j2ee.version.full = ${cactus.j2ee.version.major}.${cactus.j2ee.version.minor}
# Name of generated jar
maven.final.name = ${pom.artifactId}-${cactus.j2ee.version}-${pom.currentVersion}
@@ -26,4 +31,4 @@
maven.license.licenseFile = ${basedir}/../LICENSE.cactus
# Title to display for the javadoc report
-maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API (J2EE
${cactus.j2ee.version})
+maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API (J2EE
${cactus.j2ee.version.full})
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
