geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r432960 - in /geronimo/trunk: modules/system/pom.xml modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java pom.xml
Date Sun, 20 Aug 2006 10:19:43 GMT
Author: jdillon
Date: Sun Aug 20 03:19:43 2006
New Revision: 432960

URL: http://svn.apache.org/viewvc?rev=432960&view=rev
Log:
Dropping PluginRepositoryExporter, pom bits that generated product-versions.properties (only
used by PluginRepositoryExporter)

Removed:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java
Modified:
    geronimo/trunk/modules/system/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/system/pom.xml?rev=432960&r1=432959&r2=432960&view=diff
==============================================================================
--- geronimo/trunk/modules/system/pom.xml (original)
+++ geronimo/trunk/modules/system/pom.xml Sun Aug 20 03:19:43 2006
@@ -144,18 +144,6 @@
                                     <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ"/>
                                     <entry key="copyright" value="Copyright (C) 2003-${build.year},
The Apache Software Foundation"/>
                                 </propertyfile>
-                                
-                                <mkdir dir="${pom.basedir}/target/resources/META-INF"/>
-                                
-                                <propertyfile
-                                    file="${pom.basedir}/target/resources/META-INF/product-versions.properties"
-                                    comment="Product version information (generated, do not
modify)">
-                                    
-                                    <entry key="geronimo" value="${pom.version}"/>
-                                    <entry key="activemq" value="${activeMqVersion}"/>
-                                    <entry key="openejb" value="${openejbVersion}"/>
-                                    <entry key="tranql" value="${tranqlVersion}"/>
-                                </propertyfile>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=432960&r1=432959&r2=432960&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sun Aug 20 03:19:43 2006
@@ -65,13 +65,6 @@
         <tomcatVersion>5.5.15</tomcatVersion>
         
         <!--
-        HACK: Used by system to build product-versions.properties
-        -->
-        <openejbVersion>2.2-SNAPSHOT</openejbVersion>
-        <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
-        <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
-        
-        <!--
         HACK: Used bu uddi-jetty and uddi-tomcat configs
         -->
         <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
@@ -95,7 +88,7 @@
                 <version>1.1</version>
             </dependency>
 
-            <!-- FIXME: Need to use the correct gid/aid for this dependency -->
+            <!-- FIXME: Need to use the correct groupId/artifactId for this dependency
-->
             <dependency>
                 <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
@@ -350,7 +343,7 @@
             <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql</artifactId>
-                <version>${tranqlVersion}</version>
+                <version>1.4-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -434,13 +427,13 @@
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-core</artifactId>
-                <version>${activeMqVersion}</version>
+                <version>3.2.4-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-ra</artifactId>
-                <version>${activeMqVersion}</version>
+                <version>3.2.4-SNAPSHOT</version>
 
                 <!-- Can't be found anywhere -->
                 <exclusions>
@@ -450,17 +443,21 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
+            
+            <!--
+            FIXME: Remove these and use our modules/activemq-gbean* modules
+            -->
+            
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-gbean-g1_1</artifactId>
-                <version>${activeMqVersion}</version>
+                <version>3.2.4-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-gbean-management-g1_1</artifactId>
-                <version>${activeMqVersion}</version>
+                <version>3.2.4-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -589,19 +586,19 @@
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-core</artifactId>
-                <version>${openejbVersion}</version>
+                <version>2.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-builder</artifactId>
-                <version>${openejbVersion}</version>
+                <version>2.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-pkgen-builder</artifactId>
-                <version>${openejbVersion}</version>
+                <version>2.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -629,6 +626,10 @@
                 <artifactId>jasper-runtime</artifactId>
                 <version>${tomcatVersion}</version>
             </dependency>
+            
+            <!--
+            TODO: Remove geronimo-samples deps and use our own applications/geronimo-example
modules
+            -->
             
             <dependency>
                 <groupId>geronimo-samples</groupId>



Mime
View raw message