geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r657153 - in /geronimo/samples/branches/2.1: geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/ samples/CustomerService/CustomerService-ear/ samples/bank/bank-ear/ samples/calculator-stateless-pojo/calculator-stat...
Date Fri, 16 May 2008 18:24:06 GMT
Author: jbohn
Date: Fri May 16 11:24:06 2008
New Revision: 657153

URL: http://svn.apache.org/viewvc?rev=657153&view=rev
Log:
remove copies of artifacts (ears, wars) up to root sample as it causes problems for the maven-release-plugin
which thinks these are local modifications

Modified:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
(original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
Fri May 16 11:24:06 2008
@@ -77,25 +77,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml Fri
May 16 11:24:06 2008
@@ -83,26 +83,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml Fri May 16 11:24:06 2008
@@ -84,25 +84,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
(original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
Fri May 16 11:24:06 2008
@@ -79,27 +79,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml Fri May 16 11:24:06
2008
@@ -84,19 +84,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.war file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${version}.war"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml Fri May 16 11:24:06
2008
@@ -69,26 +69,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml Fri
May 16 11:24:06 2008
@@ -63,26 +63,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml Fri May
16 11:24:06 2008
@@ -89,26 +89,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${artifactId}-${version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml Fri
May 16 11:24:06 2008
@@ -34,28 +34,4 @@
     <name>Geronimo Samples :: LDAP Sample WAR</name>
     <packaging>war</packaging>
 
-    <build>
-        <plugins>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                              <echo>Copying ${pom.build.finalName}.war file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.war"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml Fri May 16 11:24:06
2008
@@ -83,26 +83,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml Fri May 16 11:24:06 2008
@@ -76,26 +76,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml Fri May 16 11:24:06
2008
@@ -63,26 +63,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml?rev=657153&r1=657152&r2=657153&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml Fri May 16 11:24:06
2008
@@ -70,26 +70,6 @@
                     </modules>
                 </configuration>
             </plugin>
-
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 



Mime
View raw message