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/09 01:08:53 UTC
svn commit: r420218 - in /geronimo/sandbox/svkmerge/m2migration:
applications/uddi-db/pom.xml applications/uddi-server/pom.xml pom.xml
Author: jdillon
Date: Sat Jul 8 16:08:53 2006
New Revision: 420218
URL: http://svn.apache.org/viewvc?rev=420218&view=rev
Log:
Re-arrange properties, post inspection of which of these are actually in use by child poms
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml?rev=420218&r1=420217&r2=420218&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml Sat Jul 8 16:08:53 2006
@@ -44,7 +44,6 @@
<dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
- <version>${juddiVersion}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml?rev=420218&r1=420217&r2=420218&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml Sat Jul 8 16:08:53 2006
@@ -17,10 +17,7 @@
<!-- $Rev$ $Date$ -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -32,10 +29,11 @@
</parent>
<artifactId>geronimo-uddi-server</artifactId>
- <packaging>war</packaging>
<name>Geronimo Applications :: UDDI Server</name>
+ <packaging>war</packaging>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
@@ -45,7 +43,6 @@
<dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
- <version>${juddiVersion}</version>
<scope>provided</scope>
</dependency>
@@ -54,6 +51,7 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</dependency>
+
</dependencies>
<build>
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=420218&r1=420217&r2=420218&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sat Jul 8 16:08:53 2006
@@ -99,42 +99,60 @@
<properties>
- <!--
- | TODO: Remove all properties which are not used outside of this pom.xml
- | or where the number of artifacts is minimal.
- -->
+ <!-- FIXME: These properties are currently needed in child poms, so we need to keep them around -->
- <!-- Geronimo specification versions -->
+ <asn1Version>0.3.2</asn1Version>
+ <apachedsVersion>0.9.2</apachedsVersion>
+ <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
+ <commonsCliVersion>1.0</commonsCliVersion>
+ <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
+ <cglibVersion>2.1_3</cglibVersion>
+ <tomcatVersion>5.5.15</tomcatVersion>
+ <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
+ <derbyVersion>10.1.1.0</derbyVersion>
+ <xpp3Version>1.1.3.3</xpp3Version>
+ <xstreamVersion>1.1.3</xstreamVersion>
+ <xercesVersion>2.6.2</xercesVersion>
+ <xmlApisVersion>1.0.b2</xmlApisVersion>
+ <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
+ <log4jVersion>1.2.8</log4jVersion>
+ <mx4jVersion>3.0.1</mx4jVersion>
+ <plutoVersion>1.0.1</plutoVersion>
+ <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
+ <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
+ <tranqlConnectorVersion>1.3-SNAPSHOT</tranqlConnectorVersion>
+ <jettyVersion>5.1.10</jettyVersion>
+ <wadiVersion>2.0M1</wadiVersion>
+ <openejbVersion>2.2-SNAPSHOT</openejbVersion>
+ <kerberosCommonVersion>0.5</kerberosCommonVersion>
+ <kerberosProtocolVersion>0.5</kerberosProtocolVersion>
+ <ldapProtocolVersion>0.9.2</ldapProtocolVersion>
+ <minaVersion>0.7.3</minaVersion>
+ <geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
+ <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
+ <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
+
+ <!-- FIXME: Unroll these properties, they are only used with in this one file -->
<geronimoSpecActivationVersion>1.1</geronimoSpecActivationVersion>
<geronimoSpecCorbaVersion>1.0</geronimoSpecCorbaVersion>
<geronimoSpecEjbVersion>1.0.1</geronimoSpecEjbVersion>
<geronimoSpecJ2eeVersion>1.1</geronimoSpecJ2eeVersion>
<geronimoSpecJ2eeConnectorVersion>1.0.1</geronimoSpecJ2eeConnectorVersion>
- <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
<geronimoSpecJ2eeJaccVersion>1.0.1</geronimoSpecJ2eeJaccVersion>
<geronimoSpecJ2eeManagementVersion>1.0.1</geronimoSpecJ2eeManagementVersion>
<geronimoSpecJavamailVersion>1.1</geronimoSpecJavamailVersion>
<geronimoSpecJaxrVersion>1.0.1</geronimoSpecJaxrVersion>
<geronimoSpecJaxrpcVersion>1.0.1</geronimoSpecJaxrpcVersion>
- <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
<geronimoSpecJspVersion>1.0.1</geronimoSpecJspVersion>
<geronimoSpecJtaVersion>1.0.1</geronimoSpecJtaVersion>
- <geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
<geronimoSpecSaajVersion>1.0.1</geronimoSpecSaajVersion>
<geronimoSpecServletVersion>1.0.1</geronimoSpecServletVersion>
-
- <!-- External dependency versions -->
-
<activeIoVersion>2.0-r118</activeIoVersion>
- <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
<antlrVersion>2.7.2</antlrVersion>
- <apachedsVersion>0.9.2</apachedsVersion>
<asmVersion>1.4.3</asmVersion>
- <asn1Version>0.3.2</asn1Version>
<axisVersion>1.4</axisVersion>
<castorVersion>0.9.5.3</castorVersion>
- <cglibVersion>2.1_3</cglibVersion>
<commonsBeanutilsVersion>1.6.1</commonsBeanutilsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
<commonsCollectionsVersion>3.1</commonsCollectionsVersion>
@@ -146,12 +164,10 @@
<commonsIoVersion>1.1</commonsIoVersion>
<commonsJxpathVersion>1.1</commonsJxpathVersion>
<commonsLangVersion>2.0</commonsLangVersion>
- <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
<commonsModelerVersion>20060524</commonsModelerVersion>
<commonsPoolVersion>1.2</commonsPoolVersion>
<commonsPrimitivesVersion>20041207.202534</commonsPrimitivesVersion>
<concurrentVersion>1.3.4</concurrentVersion>
- <derbyVersion>10.1.1.0</derbyVersion> <!-- NOTE: Must keep derbyVersion property -->
<dom4jVersion>1.4</dom4jVersion>
<dwrVersion>1.1.1</dwrVersion>
<eclipseCompilerVersion>3.0.1</eclipseCompilerVersion>
@@ -161,47 +177,26 @@
<javaccVersion>2.1</javaccVersion>
<jdbmVersion>0.20-dev</jdbmVersion>
<jdomVersion>1.0</jdomVersion>
- <jettyVersion>5.1.10</jettyVersion>
<jstlVersion>1.1.1</jstlVersion>
<juddiVersion>0.9rc4</juddiVersion>
<junitVersion>3.8.1</junitVersion>
- <kerberosCommonVersion>0.5</kerberosCommonVersion>
- <kerberosProtocolVersion>0.5</kerberosProtocolVersion>
- <ldapProtocolVersion>0.9.2</ldapProtocolVersion>
- <log4jVersion>1.2.8</log4jVersion>
- <mavenRarPluginVersion>2.1</mavenRarPluginVersion>
- <minaVersion>0.7.3</minaVersion>
<mockobjectsVersion>0.09</mockobjectsVersion>
- <mx4jVersion>3.0.1</mx4jVersion>
- <openejbVersion>2.2-SNAPSHOT</openejbVersion>
<oroVersion>2.0.8</oroVersion>
<p2psocketsVersion>1.1.2</p2psocketsVersion>
- <plutoVersion>1.0.1</plutoVersion>
<portletApiVersion>1.0</portletApiVersion>
<regexpVersion>1.3</regexpVersion>
<scoutVersion>0.5</scoutVersion>
<standardTaglibsVersion>1.1.1</standardTaglibsVersion>
<staxApiVersion>1.0</staxApiVersion>
- <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
- <tomcatVersion>5.5.15</tomcatVersion>
- <tranqlConnectorVersion>1.3-SNAPSHOT</tranqlConnectorVersion>
- <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
- <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
<velocityVersion>1.4</velocityVersion>
<wadiActiveClusterVersion>1.2-20051115174934</wadiActiveClusterVersion>
<wadiSpringVersion>1.5.2</wadiSpringVersion>
- <wadiVersion>2.0M1</wadiVersion>
-
<wsdl4jVersion>1.5.2</wsdl4jVersion>
- <xercesVersion>2.6.2</xercesVersion>
<xfireVersion>20050202</xfireVersion>
- <xmlApisVersion>1.0.b2</xmlApisVersion>
<xmlbeansVersion>2.0.0</xmlbeansVersion>
- <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
<xmlpullVersion>1.1.3.4d_b4_min</xmlpullVersion>
<xmlResolverVersion>1.1</xmlResolverVersion>
- <xpp3Version>1.1.3.3</xpp3Version>
- <xstreamVersion>1.1.3</xstreamVersion>
+
</properties>
<dependencyManagement>
@@ -698,6 +693,12 @@
<type>rar</type>
</dependency>
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddiVersion}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -813,6 +814,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-one-plugin</artifactId>
<version>1.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-rar-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>