cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r571341 - in /cocoon/trunk/blocks: cocoon-welcome/pom.xml pom.xml
Date Thu, 30 Aug 2007 23:12:58 GMT
Author: reinhard
Date: Thu Aug 30 16:12:57 2007
New Revision: 571341

URL: http://svn.apache.org/viewvc?rev=571341&view=rev
Log:
cleanup welcome block pom.xml

Modified:
    cocoon/trunk/blocks/cocoon-welcome/pom.xml
    cocoon/trunk/blocks/pom.xml

Modified: cocoon/trunk/blocks/cocoon-welcome/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/pom.xml?rev=571341&r1=571340&r2=571341&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-welcome/pom.xml Thu Aug 30 16:12:57 2007
@@ -1,14 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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.
+-->
+<!--+
+    | @version $Id: pom.xml 565574 2007-08-13 23:47:50Z gkossakowski $
+    +-->
+<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>
+  <packaging>jar</packaging>
+  
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>5-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-welcome</artifactId>
-  <name>cocoon-welcome</name>
-  <version>1.0.0-M1-SNAPSHOT</version>
+  <version>1.0.0-M1-SNAPSHOT</version>  
+  <name>Cocoon Welcome (Samples)</name>
+  
   <build>
     <plugins>
       <plugin>
@@ -25,44 +50,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.3</version>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8888</port>
-              <maxIdleTime>30000</maxIdleTime>
-            </connector>
-          </connectors>
-          <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-          <contextPath>/</contextPath>
-          <systemProperties>
-            <systemProperty>
-              <name>org.apache.cocoon.mode</name>
-              <value>dev</value>
-            </systemProperty>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -80,4 +70,5 @@
       <version>1.0.0-RC2-SNAPSHOT</version>
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=571341&r1=571340&r2=571341&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Aug 30 16:12:57 2007
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.0.2</version>
+        <version>6.1.5</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">



Mime
View raw message