Author: sppatel
Date: Sat Mar  4 10:26:01 2006
New Revision: 383164

URL: http://svn.apache.org/viewcvs?rev=383164&view=rev
Log:
more pom fixes

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,5 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
 	<artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.deployment.model.edit_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,5 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.geronimo.deployment.model</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.deployment.model_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,5 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
 	<artifactId>org.apache.geronimo.devtools.eclipse.core</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.devtools.eclipse.core_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,6 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.devtools</groupId>
   <artifactId>org.apache.geronimo.jetty.j2ee.server.v1</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.jetty.j2ee.server.v1_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,6 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.devtools</groupId>
   <artifactId>org.apache.geronimo.tomcat.j2ee.server.v1</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.tomcat.j2ee.server.v1_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml Sat Mar  4 10:26:01 2006
@@ -1,4 +1,5 @@
-<project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
 	<artifactId>org.apache.geronimo.ui</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.ui_version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=383164&r1=383163&r2=383164&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Mar  4 10:26:01 2006
@@ -101,22 +101,21 @@
     <org.apache.geronimo.installableruntime.tomcat.feature_version>1.0.0</org.apache.geronimo.installableruntime.tomcat.feature_version>
     <org.apache.geronimo.installableruntime.jetty.feature_version>1.0.0</org.apache.geronimo.installableruntime.jetty.feature_version>
     <!-- Ext. Jar Dependency Versions -->
-    <geronimo.version>1.0</geronimo.version>
-    <geronimo_runtime_version>${geronimo.version}</geronimo_runtime_version>
-    <geronimo_spec_version></geronimo_spec_version>
-    <mx4j_version></mx4j_version>
-    <commons_logging_version></commons_logging_version>
-    <cglib_version></cglib_version>
-    <openejb_version></openejb_version>
-    <oro_version></oro_version>
-    <ant_apache_oro_version></ant_apache_oro_version>
-    <ant_optional_version></ant_optional_version>
-    <xercesImpl_version></xercesImpl_version>
-    <xmlParsersAPIs_version></xmlParsersAPIs_version>
-    <xerces_version></xerces_version>
-    <xml_resolver_version></xml_resolver_version>
+    <geronimo_version>1.0</geronimo_version>
+    <geronimo_spec_version>1.0</geronimo_spec_version>
+    <mx4j_version>3.0.1</mx4j_version>
+    <commons_logging_version>1.0.4</commons_logging_version>
+    <cglib_version>2.1.3</cglib_version>
+    <openejb_version>2.0</openejb_version>
+    <oro_version>2.0.8</oro_version>
+    <ant_apache_oro_version>1.6.4</ant_apache_oro_version>
+    <ant_optional_version>1.5.3-1</ant_optional_version>
+    <xercesImpl_version>2.5.0</xercesImpl_version>
+    <xmlParsersAPIs_version>2.6.2</xmlParsersAPIs_version>
+    <xerces_version>2.4.0</xerces_version>
+    <xml_resolver_version>1.1</xml_resolver_version>
     <xbean_version>2.0.0</xbean_version>
-    <stax-api_version>1.0<stax-api_version>
+    <stax-api_version>1.0</stax-api_version>
     <!-- Eclipse Plugin Dependencies -->
     <org.eclipse.osgi_version></org.eclipse.osgi_version>
     <org.eclipse.debug.core_version></org.eclipse.debug.core_version>
@@ -163,11 +162,6 @@
     <org.eclipse.emf.edit.ui_version></org.eclipse.emf.edit.ui_version>
    </properties>
 
-  <dependencyManagement>
-    <dependencies>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -225,9 +219,35 @@
       </plugin>
     </plugins>
   </build>
+  
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>Apache CVS</id>
+      <name>Apache CVS of the Central Repository</name>
+      <url>http://cvs.apache.org/maven-snapshot-repository</url>
+    </repository>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <id>snapshots</id>
+      <name>Maven Central Development Repository</name>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+    </repository>
+  </repositories>
+  
+  <pluginRepositories>
+    <pluginRepository>
+      <id>snapshots</id>
+      <name>Maven Central Plugins Development Repository</name>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <modules>
-    <module>geronimo-emf</module>
     <module>plugins/org.apache.geronimo.deployment.model</module>
     <module>plugins/org.apache.geronimo.deployment.model.edit</module>
     <module>plugins/org.apache.geronimo.devtools.eclipse.core</module>
@@ -237,7 +257,6 @@
     <module>features/org.apache.geronimo.feature</module>
     <module>features/org.apache.geronimo.installableruntime.j2ee.feature</module>
     <module>features/org.apache.geronimo.installableruntime.tomcat.feature</module>
-    <module>assembly</module>
   </modules>
-
+  
 </project>