You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@portals.apache.org by at...@apache.org on 2010/04/14 22:53:24 UTC
svn commit: r934194 - in /portals/site/pluto: pluto-site-skin/pom.xml
pom.xml src/site/site.xml
Author: ate
Date: Wed Apr 14 20:53:23 2010
New Revision: 934194
URL: http://svn.apache.org/viewvc?rev=934194&view=rev
Log:
Integrating pluto-site-skin again into the site configuration (needs mvn install from the pluto site project first to be able to use)
Modified:
portals/site/pluto/pluto-site-skin/pom.xml
portals/site/pluto/pom.xml
portals/site/pluto/src/site/site.xml
Modified: portals/site/pluto/pluto-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/pluto/pluto-site-skin/pom.xml?rev=934194&r1=934193&r2=934194&view=diff
==============================================================================
--- portals/site/pluto/pluto-site-skin/pom.xml (original)
+++ portals/site/pluto/pluto-site-skin/pom.xml Wed Apr 14 20:53:23 2010
@@ -1,42 +1,47 @@
-<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">
+<!--
+ 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
- <parent>
- <artifactId>pluto</artifactId>
- <groupId>org.apache.pluto</groupId>
- <version>1.1.8-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>pluto-site-skin</artifactId>
- <name>Pluto Website Skin</name>
- <packaging>jar</packaging>
- <description>Pluto Website Resources (CSS, images)</description>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ 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.
+-->
+<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>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <parent>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>pluto-site</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>pluto-site-skin</artifactId>
+ <name>Apache Pluto Website Skin</name>
+ <packaging>jar</packaging>
+ <description>Apache Pluto Website Resources (CSS, images)</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: portals/site/pluto/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/pluto/pom.xml?rev=934194&r1=934193&r2=934194&view=diff
==============================================================================
--- portals/site/pluto/pom.xml (original)
+++ portals/site/pluto/pom.xml Wed Apr 14 20:53:23 2010
@@ -35,6 +35,10 @@
<version>1.0</version>
</parent>
<packaging>pom</packaging>
+
+ <modules>
+ <module>pluto-site-skin</module>
+ </modules>
<!-- this is for a bug Maven, see http://jira.codehaus.org/browse/MSHARED-18
should be removed once Maven incorporates this bug in an official release-->
Modified: portals/site/pluto/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/site/pluto/src/site/site.xml?rev=934194&r1=934193&r2=934194&view=diff
==============================================================================
--- portals/site/pluto/src/site/site.xml (original)
+++ portals/site/pluto/src/site/site.xml Wed Apr 14 20:53:23 2010
@@ -30,9 +30,9 @@ limitations under the License.
</bannerRight>
<publishDate position="left" format="MM-dd-yy hh:mm zz"/>
<skin>
- <groupId>org.apache.portals.pluto</groupId>
+ <groupId>org.apache.portals.site</groupId>
<artifactId>pluto-site-skin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.0</version>
</skin>
<body>