Author: rahul
Date: Tue Jan 2 15:11:56 2007
New Revision: 491965
URL: http://svn.apache.org/viewvc?view=rev&rev=491965
Log:
Eliminate any chance that we will end up with JCL 1.1 transitive dependencies
in WEB-INF/lib for these sample/test applications. This is an effect of a
broken JCL 1.1 POM, MNG-1577 (dependencyManagement does not work for transitive
dependencies), and that fact that we added a Digester <dependency> to these
POMs when we upgraded to 1.8 (r482455). A better solution may indeed involve
fixes elsewhere, Shale or otherwise, but this seems necessary for producing a
good set of v1.0.4 artifacts for these sample and test applications.
SHALE-380
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-blank/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-core/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-basic/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-scxml/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-tiger/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-view/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-usecases/pom.xml
Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-blank/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/shale-blank/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/shale-blank/pom.xml Tue Jan
2 15:11:56 2007
@@ -42,6 +42,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-core/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-core/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-core/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-core/pom.xml Tue
Jan 2 15:11:56 2007
@@ -42,6 +42,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-basic/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-basic/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
---
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-basic/pom.xml
(original)
+++
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-basic/pom.xml
Tue Jan 2 15:11:56 2007
@@ -44,6 +44,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-scxml/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-scxml/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
---
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-scxml/pom.xml
(original)
+++
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-dialog-scxml/pom.xml
Tue Jan 2 15:11:56 2007
@@ -43,6 +43,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-tiger/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-tiger/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-tiger/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-tiger/pom.xml
Tue Jan 2 15:11:56 2007
@@ -42,6 +42,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified:
shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-view/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-view/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-view/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/shale-test-view/pom.xml Tue
Jan 2 15:11:56 2007
@@ -42,6 +42,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/shale-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/shale-usecases/pom.xml?view=diff&rev=491965&r1=491964&r2=491965
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/shale-usecases/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/shale-usecases/pom.xml Tue
Jan 2 15:11:56 2007
@@ -42,6 +42,29 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
