You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/12 21:14:39 UTC
svn commit: r421379 - in
/geronimo/sandbox/svkmerge/m2migration/applications/console: ./
console-framework/pom.xml console-framework/project.xml
console-standard/pom.xml console-standard/project.xml
Author: jdillon
Date: Wed Jul 12 12:14:38 2006
New Revision: 421379
URL: http://svn.apache.org/viewvc?rev=421379&view=rev
Log:
Merge #421176 for GERONIMO-1887
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/console/ (props changed)
geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml
Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Wed Jul 12 12:14:38 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console:421368
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml Wed Jul 12 12:14:38 2006
@@ -48,11 +48,6 @@
<dependencies>
<dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<scope>provided</scope>
@@ -72,6 +67,11 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptors</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
</dependency>
<!-- Required for JSPC compilation -->
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml Wed Jul 12 12:14:38 2006
@@ -26,19 +26,11 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons_logging_version}</version>
- <properties>
- <lib>true</lib>
- <server>true</server>
- <deploy>true</deploy>
- </properties>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
</dependency>
<dependency>
<groupId>portlet-api</groupId>
@@ -49,7 +41,7 @@
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal</artifactId>
@@ -57,7 +49,7 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptors</artifactId>
@@ -65,7 +57,7 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
@@ -74,7 +66,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml Wed Jul 12 12:14:38 2006
@@ -90,11 +90,6 @@
</dependency>
<dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml Wed Jul 12 12:14:38 2006
@@ -8,14 +8,6 @@
<dependencies>
<dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${pom.currentVersion}</version>
@@ -130,11 +122,6 @@
<artifactId>geronimo-security-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
-<!-- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
@@ -186,14 +173,6 @@
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
</dependency>
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>${castor_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
<!-- JMS dependencies -->
<dependency>
@@ -237,26 +216,17 @@
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>${ant_version}</version>
-<!-- <properties>
- <repository>true</repository>
- </properties> -->
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>${commons_el_version}</version>
<url>http://jakarta.apache.org/commons/el/</url>
- <properties>
- <repository>true</repository>
- </properties>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
</dependency>
<dependency>
<groupId>taglibs</groupId>