Author: woonsan
Date: Fri Apr 17 07:36:52 2009
New Revision: 765879
URL: http://svn.apache.org/viewvc?rev=765879&view=rev
Log:
Fixing parent pom and dependencies
Modified:
portals/applications/webcontent/trunk/pom.xml
portals/applications/webcontent/trunk/webcontent-jar/pom.xml
portals/applications/webcontent/trunk/webcontent-war/pom.xml
Modified: portals/applications/webcontent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/pom.xml?rev=765879&r1=765878&r2=765879&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/pom.xml (original)
+++ portals/applications/webcontent/trunk/pom.xml Fri Apr 17 07:36:52 2009
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.portals</groupId>
<artifactId>applications-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.apache.portals.applications</groupId>
@@ -41,24 +41,6 @@
Web Content Application
</description>
- <properties>
- <portlet-api.version>2.0</portlet-api.version>
- <javax.servlet.version>2.4</javax.servlet.version>
-
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
- <xalan.version>2.4.1</xalan.version>
- <xerces.version>2.3.0</xerces.version>
- <xml-apis.version>2.0.2</xml-apis.version>
- <commons-logging.version>1.1</commons-logging.version>
- <portlet-api.version>1.0</portlet-api.version>
- <javax.servlet.version>2.4</javax.servlet.version>
- <junit.version>3.8.1</junit.version>
- <xml-apis.version>2.0.2</xml-apis.version>
-
- <nekohtml.version>0.9.5</nekohtml.version>
- <castor.version>1.1.1-xml</castor.version>
- <commons-httpclient.version>3.0.1</commons-httpclient.version>
-
- </properties>
<!-- Application Modules -->
<modules>
Modified: portals/applications/webcontent/trunk/webcontent-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/pom.xml?rev=765879&r1=765878&r2=765879&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/pom.xml Fri Apr 17
07:36:52 2009
@@ -33,6 +33,21 @@
<packaging>jar</packaging>
<name>Portals Web Content Application JAR</name>
+ <properties>
+ <portlet-api.version>2.0</portlet-api.version>
+ <javax.servlet.version>2.4</javax.servlet.version>
+
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
+ <xalan.version>2.4.1</xalan.version>
+ <xerces.version>2.3.0</xerces.version>
+ <xml-apis.version>2.0.2</xml-apis.version>
+ <commons-logging.version>1.1</commons-logging.version>
+ <junit.version>3.8.1</junit.version>
+ <nekohtml.version>0.9.5</nekohtml.version>
+ <castor.version>1.1.1-xml</castor.version>
+ <commons-httpclient.version>3.0.1</commons-httpclient.version>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
@@ -51,6 +66,12 @@
<version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <version>${org.apache.portals.bridges.common.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-velocity</artifactId>
Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=765879&r1=765878&r2=765879&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Fri Apr 17
07:36:52 2009
@@ -1,69 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or
more
- contributor license agreements. See the NOTICE file distributed
with
- this work for additional information regarding copyright
ownership.
- The ASF licenses this file to You under the Apache License,
Version
- 2.0 (the "License"); you may not use this file except in
compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed
under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR
- CONDITIONS OF ANY KIND, either express or implied. See the
License for
- the specific language governing permissions and limitations
under the
- License. $Id$
- -->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License. $Id$
+ -->
<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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <!-- POM Identification -->
- <artifactId>apa-webcontent-war</artifactId>
- <parent>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-webcontent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <packaging>war</packaging>
- <name>Portals Web Content Application WAR</name>
-
- <!-- Dependencies -->
- <properties>
- <velocity-tools.version>1.3</velocity-tools.version>
- <commons-digester.version>1.8</commons-digester.version>
- <commons-lang.version>2.1</commons-lang.version>
- <commons-collections.version>3.2</commons-collections.version>
- <log4j.version>1.2.14</log4j.version>
- <oro.version>2.0.8</oro.version>
- <commons-digester.version>1.8</commons-digester.version>
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <!-- POM Identification -->
+ <artifactId>apa-webcontent-war</artifactId>
+ <parent>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-webcontent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <packaging>war</packaging>
+ <name>Portals Web Content Application WAR</name>
+
+ <!-- Dependencies -->
+ <properties>
+ <portlet-api.version>2.0</portlet-api.version>
+ <javax.servlet.version>2.4</javax.servlet.version>
+
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
<portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
- </properties>
- <dependencies>
+ <xalan.version>2.4.1</xalan.version>
+ <xerces.version>2.3.0</xerces.version>
+ <xml-apis.version>2.0.2</xml-apis.version>
+ <commons-logging.version>1.1</commons-logging.version>
+ <junit.version>3.8.1</junit.version>
+ <nekohtml.version>0.9.5</nekohtml.version>
+ <castor.version>1.1.1-xml</castor.version>
+ <commons-httpclient.version>3.0.1</commons-httpclient.version>
+ <velocity-tools.version>1.3</velocity-tools.version>
+ <commons-digester.version>1.8</commons-digester.version>
+ <commons-lang.version>2.1</commons-lang.version>
+ <commons-collections.version>3.2</commons-collections.version>
+ <log4j.version>1.2.14</log4j.version>
+ <oro.version>2.0.8</oro.version>
+ </properties>
+
+ <dependencies>
- <!-- Runtime Dependencies -->
+ <!-- Runtime Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>apa-webcontent-jar</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-webapp-logging</artifactId>
-
<version>${portals.applications.apa-webapp-logging.version}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <version>${org.apache.portals.bridges.common.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apa-webcontent-jar</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-webapp-logging</artifactId>
+
<version>${portals.applications.apa-webapp-logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
@@ -73,7 +91,7 @@
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -92,8 +110,8 @@
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
