commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1243318 - in /commons/proper/digester/trunk: ./ examples/ examples/annotations/atom/ examples/api/addressbook/ examples/api/catalog/ examples/api/dbinsert/ examples/api/document-markup/ examples/edsl/atom/ examples/plugins/pipeline/ exampl...
Date Sun, 12 Feb 2012 20:32:39 GMT
Author: simonetripodi
Date: Sun Feb 12 20:32:38 2012
New Revision: 1243318

URL: http://svn.apache.org/viewvc?rev=1243318&view=rev
Log:
restored the samples parent pom - too much common stuff, it doesn't make any sense replicating
them for each sample. Samples are not deployed nor assembled

Added:
    commons/proper/digester/trunk/examples/pom.xml   (with props)
Modified:
    commons/proper/digester/trunk/examples/annotations/atom/pom.xml
    commons/proper/digester/trunk/examples/api/addressbook/pom.xml
    commons/proper/digester/trunk/examples/api/catalog/pom.xml
    commons/proper/digester/trunk/examples/api/dbinsert/pom.xml
    commons/proper/digester/trunk/examples/api/document-markup/pom.xml
    commons/proper/digester/trunk/examples/edsl/atom/pom.xml
    commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml
    commons/proper/digester/trunk/examples/rss/pom.xml
    commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml
    commons/proper/digester/trunk/pom.xml

Modified: commons/proper/digester/trunk/examples/annotations/atom/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/annotations/atom/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/annotations/atom/pom.xml (original)
+++ commons/proper/digester/trunk/examples/annotations/atom/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-annotations-atom</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: Annotations :: Atom</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/api/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/addressbook/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/addressbook/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/addressbook/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-addressbook</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: API :: Address Book</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/api/catalog/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/catalog/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/catalog/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/catalog/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-catalog</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: API :: Catalog</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/api/dbinsert/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/dbinsert/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/dbinsert/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/dbinsert/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-dbinsert</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: API :: DB Insert</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/api/document-markup/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/document-markup/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/document-markup/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/document-markup/pom.xml Sun Feb 12 20:32:38
2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-document-markup</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: API :: Document Markup</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/edsl/atom/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/edsl/atom/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/edsl/atom/pom.xml (original)
+++ commons/proper/digester/trunk/examples/edsl/atom/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-edsl-atom</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: EDSL :: Atom</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -52,12 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml (original)
+++ commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-plugins-pipeline</artifactId>
@@ -31,26 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: Plugins :: Pipeline</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
     <profile>
       <id>run-uppercase</id>

Added: commons/proper/digester/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/pom.xml?rev=1243318&view=auto
==============================================================================
--- commons/proper/digester/trunk/examples/pom.xml (added)
+++ commons/proper/digester/trunk/examples/pom.xml Sun Feb 12 20:32:38 2012
@@ -0,0 +1,95 @@
+<?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.
+-->
+<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>
+
+  <parent>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-digester3-parent</artifactId>
+    <version>3.3-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+
+  <artifactId>commons-digester3-samples-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Commons Digester :: Examples</name>
+
+  <modules>
+    <module>annotations/atom</module>
+    <module>api/addressbook</module>
+    <module>api/catalog</module>
+    <module>api/dbinsert</module>
+    <module>api/document-markup</module>
+    <module>edsl/atom</module>
+    <module>plugins/pipeline</module>
+    <module>rss</module>
+    <module>xmlrules/addressbook</module>
+  </modules>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>commons-digester3</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <phase>verify</phase>
+              <goals>
+                <goal>java</goal>
+              </goals>
+              <configuration>
+                <classpathScope>compile</classpathScope>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

Propchange: commons/proper/digester/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/digester/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: commons/proper/digester/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: commons/proper/digester/trunk/examples/rss/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/rss/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/rss/pom.xml (original)
+++ commons/proper/digester/trunk/examples/rss/pom.xml Sun Feb 12 20:32:38 2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-rss</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: RSS</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -49,12 +40,6 @@
           <mainClass>org.apache.commons.digester3.rss.RSSDigester</mainClass>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml (original)
+++ commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml Sun Feb 12 20:32:38
2012
@@ -21,9 +21,9 @@
 
   <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-digester3-parent</artifactId>
+    <artifactId>commons-digester3-samples-parent</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>commons-digester3-samples-xmlrules-addressbook</artifactId>
@@ -31,15 +31,6 @@
 
   <name>Apache Commons Digester :: Examples :: XML Rules :: Address Book</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>commons-digester3</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -53,12 +44,6 @@
           </arguments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: commons/proper/digester/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=1243318&r1=1243317&r2=1243318&view=diff
==============================================================================
--- commons/proper/digester/trunk/pom.xml (original)
+++ commons/proper/digester/trunk/pom.xml Sun Feb 12 20:32:38 2012
@@ -160,15 +160,7 @@
   <modules>
     <module>core</module>
     <module>annotations-processor</module>
-    <module>examples/annotations/atom</module>
-    <module>examples/api/addressbook</module>
-    <module>examples/api/catalog</module>
-    <module>examples/api/dbinsert</module>
-    <module>examples/api/document-markup</module>
-    <module>examples/edsl/atom</module>
-    <module>examples/plugins/pipeline</module>
-    <module>examples/rss</module>
-    <module>examples/xmlrules/addressbook</module>
+    <module>examples</module>
   </modules>
 
   <properties>
@@ -266,20 +258,9 @@
           <version>2.8</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>exec-maven-plugin</artifactId>
-          <version>1.1</version>
-          <executions>
-            <execution>
-              <phase>verify</phase>
-              <goals>
-                <goal>java</goal>
-              </goals>
-              <configuration>
-                <classpathScope>compile</classpathScope>
-              </configuration>
-            </execution>
-          </executions>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.7</version>
         </plugin>
       </plugins>
     </pluginManagement>



Mime
View raw message