You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by zh...@apache.org on 2006/02/23 18:17:22 UTC
svn commit: r380159 - in /portals/pluto/trunk: ./ maven-pluto-plugin/
pluto-ant-tasks/ pluto-container/ pluto-descriptor-api/
pluto-descriptor-impl/ pluto-optional-services/ pluto-portal-driver/
pluto-portal/ pluto-taglib/ pluto-testsuite/ pluto-util/
Author: zheng
Date: Thu Feb 23 09:17:14 2006
New Revision: 380159
URL: http://svn.apache.org/viewcvs?rev=380159&view=rev
Log:
Moved dependency versions to parent pom as properties.
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-descriptor-api/pom.xml
portals/pluto/trunk/pluto-descriptor-impl/pom.xml
portals/pluto/trunk/pluto-optional-services/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Thu Feb 23 09:17:14 2006
@@ -9,8 +9,8 @@
<artifactId>pluto</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
+ <!-- Put into maven default plugins group -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pluto-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -26,40 +26,39 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>${maven.version}</version>
</dependency>
<!-- Do not remove this dep: See MNG-1178 -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<resources>
@@ -78,6 +77,9 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
+
</project>
+
+
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Thu Feb 23 09:17:14 2006
@@ -1,72 +1,53 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+
+ <parent>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto.ant</groupId>
<artifactId>pluto-ant-tasks</artifactId>
<packaging>jar</packaging>
<name>Pluto Ant Tasks</name>
<description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets to the Pluto Portal Driver.</description>
-
- <parent>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-util</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <resources>
-
- </resources>
- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <configuration>
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
+
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Thu Feb 23 09:17:14 2006
@@ -20,16 +20,13 @@
<dependencies>
- <!-- ===== ======================= ===== -->
- <!-- ===== Pluto Support Libraries ===== -->
- <!-- ===== ======================= ===== -->
+ <!-- Pluto Support Libraries =========================================== -->
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-api</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-impl</artifactId>
@@ -37,75 +34,53 @@
<scope>runtime</scope>
</dependency>
- <!-- ===== ======================= ===== -->
- <!-- ===== Other Support Libraries ===== -->
- <!-- ===== ======================= ===== -->
+ <!-- Other Support Libraries =========================================== -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <!-- ===== ======================= ===== -->
- <!-- ===== Specification Libraries ===== -->
- <!-- ===== ======================= ===== -->
+ <!-- Specification Libraries =========================================== -->
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>${portlet-api.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
- <!-- ===== ======================= ===== -->
- <!-- ===== Testing Libraries ===== -->
- <!-- ===== ======================= ===== -->
+ <!-- Testing Libraries ================================================= -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
+ <version>${jmock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
- <!-- Assembly Plugin - Create Distributions -->
+ <!-- Assembly Plugin: Create Distributions =========================== -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assemble/bin.xml</descriptor>
</configuration>
</plugin>
- <!-- Surefire Plugin - Exec Tests -->
+ <!-- Surefire Plugin: Exec Tests ===================================== -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -125,4 +100,9 @@
</plugin>
</plugins>
</build>
+
</project>
+
+
+
+
Modified: portals/pluto/trunk/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-descriptor-api/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-api/pom.xml Thu Feb 23 09:17:14 2006
@@ -1,35 +1,34 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+
+ <parent>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-api</artifactId>
<packaging>jar</packaging>
<name>Pluto Descriptor Service API</name>
- <url>http://portals.apache.org/pluto</url>
- <parent>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>portals-pluto-1.0-SNAPSHOT</finalName>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <configuration>
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
</configuration>
</plugin>
Modified: portals/pluto/trunk/pluto-descriptor-impl/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-descriptor-impl/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/pom.xml Thu Feb 23 09:17:14 2006
@@ -1,29 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<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>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptor-impl</artifactId>
- <packaging>jar</packaging>
- <name>Pluto Descriptor Service Implementation</name>
- <url>http://portals.apache.org/pluto</url>
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>pluto-descriptor-impl</artifactId>
+ <packaging>jar</packaging>
+ <name>Pluto Descriptor Service Implementation</name>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>pluto-descriptor-impl-${pom.version}</finalName>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
@@ -41,38 +35,42 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>0.9.6</version>
+ <version>${castor.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
+ <version>${xerces.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
+ <version>${xerces.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
+
+
+
Modified: portals/pluto/trunk/pluto-optional-services/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-optional-services/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-optional-services/pom.xml (original)
+++ portals/pluto/trunk/pluto-optional-services/pom.xml Thu Feb 23 09:17:14 2006
@@ -1,70 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<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>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-optional-services</artifactId>
- <packaging>jar</packaging>
- <name>Pluto Portal Optional Services</name>
- <url>http://portals.apache.org/pluto</url>
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>pluto-optional-services</artifactId>
+ <packaging>jar</packaging>
+ <name>Pluto Portal Optional Services</name>
+
<dependencies>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.1.0</version>
- <scope>compile</scope>
- </dependency>
+
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>${portlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
<resources>
<resource>
<directory>src/resources</directory>
- <includes name="**/*.sql"/>
+ <includes><include>**/*.sql</include></includes>
</resource>
</resources>
<plugins>
@@ -77,10 +81,14 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <configuration>
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
</configuration>
</plugin>
</plugins>
</build>
+
</project>
+
+
+
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Thu Feb 23 09:17:14 2006
@@ -10,13 +10,12 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal-driver</artifactId>
<packaging>jar</packaging>
<name>Pluto Portal Driver</name>
- <url>http://portals.apache.org/pluto</url>
<dependencies>
+
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container</artifactId>
@@ -34,44 +33,44 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
+ <version>${derby.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.7</version>
+ <version>${commons-digester.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>${portlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- We should use groupId 'javax.servlet' here, but there seems to have
@@ -79,38 +78,30 @@
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
+ <version>${jstl.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.4</version>
+ <version>${taglibs.standard.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.5</version>
+ <version>${springframework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.5</version>
+ <version>${springframework.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/resources</directory>
- <includes>
- <include>**/*.sql</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Thu Feb 23 09:17:14 2006
@@ -11,11 +11,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal</artifactId>
<packaging>war</packaging>
<name>Pluto Portal</name>
- <url>http://portals.apache.org/pluto</url>
<dependencies>
@@ -44,7 +42,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
@@ -52,13 +50,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>10.1.1.0</version>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-taglib/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Thu Feb 23 09:17:14 2006
@@ -10,7 +10,6 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
<packaging>jar</packaging>
<name>Pluto Portlet Tag Library</name>
@@ -18,39 +17,27 @@
<dependencies>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>${portlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
- <!--resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <includes><include>**/*.tld</include></includes>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>src/resources/tld</directory>
- <includes name="**/*.tld"/>
- </resource>
- </resources-->
<plugins>
-
<!-- Assembly Plugin - Create Distributions -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Thu Feb 23 09:17:14 2006
@@ -10,53 +10,27 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.pluto</groupId>
<artifactId>pluto-testsuite</artifactId>
<packaging>war</packaging>
<name>Pluto Testsuite Portlet</name>
- <url>http://portals.apache.org/pluto</url>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.9</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>${portlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
+ <version>${jstl.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -66,11 +40,35 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons-digester.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.4</version>
+ <version>${taglibs.standard.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -104,14 +102,6 @@
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
</configuration>
</plugin>
- <!--plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>pluto-testsuite-${pom.version}</finalName>
- </configuration>
- </plugin-->
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Thu Feb 23 09:17:14 2006
@@ -1,5 +1,9 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
@@ -8,90 +12,66 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-util</artifactId>
<name>Pluto Utilities</name>
- <url>http://portals.apache.org/pluto/pluto-1.1</url>
- <inceptionYear>2001</inceptionYear>
<!-- The dependencies for the ApplicationServerHook project
are those which need to be installed!
-->
<dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
-
-
+
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptor-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
+ <artifactId>pluto-descriptor-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptor-impl</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
+ <artifactId>pluto-descriptor-impl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexus.version}</version>
+ <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.0</version>
+ <version>${commons-cli.version}</version>
</dependency>
-
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0-rc4</version>
+ <version>${commons-httpclient.version}</version>
</dependency>
-
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.6</version>
+ <version>${commons-digester.version}</version>
</dependency>
-
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>${commons-beanutils.version}</version>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>${commons-logging.version}</version>
</dependency>
-
-
+
</dependencies>
<distributionManagement>
<site>
<id>website</id>
- <url>scp://minotaur.apache.org/www/portals.apache.org/pluto/pluto-1.1</url>
+ <url>scp://minotaur.apache.org/www/portals.apache.org/pluto/pluto-1.1</url>
</site>
</distributionManagement>
- <build>
- </build>
+
<reporting>
<plugins>
<plugin>
@@ -100,10 +80,16 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <configuration>
<resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
</configuration>
</plugin>
</plugins>
</reporting>
+
</project>
+
+
+
+
+
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pom.xml?rev=380159&r1=380158&r2=380159&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Thu Feb 23 09:17:14 2006
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<name>Apache Pluto</name>
<version>1.1.0-SNAPSHOT</version>
- <!-- Due to a bug in maven 2.0, the description must not container any line breaks or tabs -->
+ <!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
<description>Pluto is the Reference Implementation of the Java Portlet Specfication.</description>
<url>http://portals.apache.org/pluto</url>
@@ -181,6 +181,33 @@
<url>http://www.apache.org/</url>
</organization>
+
+ <!-- Dependency Version Properties ======================================= -->
+
+ <properties>
+ <portlet-api.version>1.0</portlet-api.version>
+ <servlet-api.version>2.3</servlet-api.version>
+ <jsp-api.version>2.0</jsp-api.version>
+ <jstl.version>1.1.2</jstl.version>
+ <taglibs.standard.version>1.0.4</taglibs.standard.version>
+ <xerces.version>2.6.2</xerces.version>
+ <castor.version>0.9.6</castor.version>
+ <commons-digester.version>1.7</commons-digester.version>
+ <commons-cli.version>1.0</commons-cli.version>
+ <commons-httpclient.version>3.0-rc4</commons-httpclient.version>
+ <commons-beanutils.version>1.7.0</commons-beanutils.version>
+ <commons-logging.version>1.0.4</commons-logging.version>
+ <log4j.version>1.2.9</log4j.version>
+ <derby.version>10.1.1.0</derby.version>
+ <springframework.version>1.2.5</springframework.version>
+ <plexus.version>1.0.4</plexus.version>
+ <maven.version>2.0</maven.version>
+ <ant.version>1.6.5</ant.version>
+ <junit.version>3.8.1</junit.version>
+ <jmock.version>1.0.1</jmock.version>
+ <plexus.version>1.0.4</plexus.version>
+ </properties>
+
<!-- Pluto Modules ======================================================= -->