Author: sgala
Date: Tue Sep 27 04:11:59 2005
New Revision: 291907
URL: http://svn.apache.org/viewcvs?rev=291907&view=rev
Log:
End parameterizing of log4j, commons-logging, and struts versions and make
including them optional
Modified:
portals/jetspeed-2/trunk/applications/demo/project.xml
portals/jetspeed-2/trunk/applications/gems/project.xml
portals/jetspeed-2/trunk/applications/jpetstore/project.xml
portals/jetspeed-2/trunk/applications/palm/project.xml
portals/jetspeed-2/trunk/applications/perl/project.xml
portals/jetspeed-2/trunk/applications/php/project.xml
portals/jetspeed-2/trunk/applications/rss/project.xml
portals/jetspeed-2/trunk/applications/struts-demo/project.xml
Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Tue Sep 27 04:11:59
2005
@@ -180,20 +180,20 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<type>jar</type>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/gems/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/gems/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/project.xml Tue Sep 27 04:11:59
2005
@@ -53,7 +53,7 @@
<version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/jpetstore/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jpetstore/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jpetstore/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jpetstore/project.xml Tue Sep 27
04:11:59 2005
@@ -44,18 +44,18 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
@@ -142,19 +142,19 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
- <version>1.2.7</version>
+ <version>${struts.version}</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${struts.include}</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>struts</groupId>
<artifactId>struts-el</artifactId>
- <version>1.2.7</version>
+ <version>${struts.version}</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${struts.include}</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/palm/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/palm/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/palm/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/palm/project.xml Tue Sep 27 04:11:59
2005
@@ -106,19 +106,19 @@
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<type>jar</type>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/applications/perl/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/perl/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/perl/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/perl/project.xml Tue Sep 27 04:11:59
2005
@@ -156,18 +156,18 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${common.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
@@ -180,4 +180,4 @@
</properties>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: portals/jetspeed-2/trunk/applications/php/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/php/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/php/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/php/project.xml Tue Sep 27 04:11:59
2005
@@ -120,17 +120,17 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/applications/rss/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.xml Tue Sep 27 04:11:59
2005
@@ -90,7 +90,7 @@
<version>${commons.logging.version}</version>
<type>jar</type>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/struts-demo/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/struts-demo/project.xml?rev=291907&r1=291906&r2=291907&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/struts-demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/struts-demo/project.xml Tue Sep 27
04:11:59 2005
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<id>struts</id>
- <version>1.2.7</version>
+ <version>${struts.version}</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
<war.bundle>true</war.bundle>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
