You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2006/02/01 07:03:26 UTC
svn commit: r374003 - in /geronimo/branches/1.0/assemblies:
j2ee-installer/project.xml j2ee-jetty-server/project.xml
j2ee-tomcat-server/project.xml
Author: jsisson
Date: Tue Jan 31 22:03:15 2006
New Revision: 374003
URL: http://svn.apache.org/viewcvs?rev=374003&view=rev
Log:
GERONIMO-1441 - fix previous change to j2ee-installer that introduced two properties of the same name in a dependency. The changes to the jetty & tomcat assemblies have already been fixed in head by djencks. A dependency marked as a library implies it goes to the repository.
Modified:
geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
Modified: geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/project.xml?rev=374003&r1=374002&r2=374003&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/project.xml Tue Jan 31 22:03:15 2006
@@ -551,7 +551,7 @@
<version>${geronimo_spec_qname_version}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
- <geronimo.assemble>repository</geronimo.assemble>
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
@@ -790,8 +790,8 @@
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
<version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
<geronimo.assemble>library</geronimo.assemble>
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
<dependency>
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml?rev=374003&r1=374002&r2=374003&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml Tue Jan 31 22:03:15 2006
@@ -401,7 +401,7 @@
<version>${geronimo_spec_qname_version}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
- <geronimo.assemble>repository</geronimo.assemble>
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
@@ -471,7 +471,7 @@
<version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
- <!--geronimo.assemble>repository</geronimo.assemble-->
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
<dependency>
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml?rev=374003&r1=374002&r2=374003&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml Tue Jan 31 22:03:15 2006
@@ -400,7 +400,7 @@
<version>${geronimo_spec_qname_version}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
- <geronimo.assemble>repository</geronimo.assemble>
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
@@ -470,7 +470,7 @@
<version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
- <!--geronimo.assemble>repository</geronimo.assemble-->
+ <!--<geronimo.assemble>repository</geronimo.assemble>-->
</properties>
</dependency>
<dependency>