Author: ptahchiev
Date: Tue Jan 20 12:46:41 2009
New Revision: 736099
URL: http://svn.apache.org/viewvc?rev=736099&view=rev
Log:
Version of aspectJ changed to be 1.5.3 and also removed the cddl license since
the servlet jar is distributed under AL 2.0
Modified:
jakarta/cactus/trunk/LICENSE
jakarta/cactus/trunk/NOTICE
jakarta/cactus/trunk/descriptors/licenses/README.txt
jakarta/cactus/trunk/pom.xml
Modified: jakarta/cactus/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/LICENSE?rev=736099&r1=736098&r2=736099&view=diff
==============================================================================
--- jakarta/cactus/trunk/LICENSE (original)
+++ jakarta/cactus/trunk/LICENSE Tue Jan 20 12:46:41 2009
@@ -226,4 +226,4 @@
The Cargo project is licensed under the Apache License, Version 2.0.
-The Servlet API project is licensed under the CDDL license.
\ No newline at end of file
+The Servlet API project is licensed under the Apache License, Version 2.0
\ No newline at end of file
Modified: jakarta/cactus/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/NOTICE?rev=736099&r1=736098&r2=736099&view=diff
==============================================================================
--- jakarta/cactus/trunk/NOTICE (original)
+++ jakarta/cactus/trunk/NOTICE Tue Jan 20 12:46:41 2009
@@ -26,4 +26,4 @@
The Cargo project distributed under an Apache 2 license,
and is hosted at: http://cargo.codehaus.org/
-The Servlet API project is licensed under the CDDL license.
\ No newline at end of file
+The Servlet API project is licensed under the Apache 2 license.
\ No newline at end of file
Modified: jakarta/cactus/trunk/descriptors/licenses/README.txt
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/descriptors/licenses/README.txt?rev=736099&r1=736098&r2=736099&view=diff
==============================================================================
--- jakarta/cactus/trunk/descriptors/licenses/README.txt (original)
+++ jakarta/cactus/trunk/descriptors/licenses/README.txt Tue Jan 20 12:46:41
2009
@@ -1,7 +1,7 @@
This directory contains the union of all the licenses used by the
Cactus and third party software.
-ServletAPI - Common Development And Distribution License (CDDL) Version 1.0
+ServletAPI - Apache 2.0
AspectJ - Mozilla 1.1
HttpUnit - HttpUnit specific license
Jetty - Apache 2.0
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=736099&r1=736098&r2=736099&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Tue Jan 20 12:46:41 2009
@@ -269,12 +269,12 @@
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.2.1</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
