You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2010/11/11 11:32:11 UTC
svn commit: r1033872 - in /incubator/isis/trunk: alternatives/
examples/claims/ examples/claims/commandline/
examples/expenses/commandline/ examples/expenses/webapp/ examples/orders/
examples/shopping-cart/ support/prototype/
Author: kevin
Date: Thu Nov 11 10:32:11 2010
New Revision: 1033872
URL: http://svn.apache.org/viewvc?rev=1033872&view=rev
Log:
Added missing versions and minor edits to remove warnings.
Modified:
incubator/isis/trunk/alternatives/pom.xml
incubator/isis/trunk/examples/claims/commandline/pom.xml
incubator/isis/trunk/examples/claims/pom.xml
incubator/isis/trunk/examples/expenses/commandline/pom.xml
incubator/isis/trunk/examples/expenses/webapp/pom.xml
incubator/isis/trunk/examples/orders/pom.xml
incubator/isis/trunk/examples/shopping-cart/pom.xml
incubator/isis/trunk/support/prototype/pom.xml
Modified: incubator/isis/trunk/alternatives/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/pom.xml (original)
+++ incubator/isis/trunk/alternatives/pom.xml Thu Nov 11 10:32:11 2010
@@ -8,7 +8,6 @@
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis</groupId>
<artifactId>alternatives</artifactId>
<name>Isis Alternatives</name>
Modified: incubator/isis/trunk/examples/claims/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/commandline/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/commandline/pom.xml Thu Nov 11 10:32:11 2010
@@ -17,6 +17,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifest>
@@ -43,7 +44,7 @@
<descriptors>
<descriptor>src/main/assembly/descriptor.xml</descriptor>
</descriptors>
- <finalName>claims-demo-${version}</finalName>
+ <finalName>claims-demo-${project.version}</finalName>
<attach>false</attach>
</configuration>
</plugin>
Modified: incubator/isis/trunk/examples/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/pom.xml Thu Nov 11 10:32:11 2010
@@ -12,57 +12,67 @@
<packaging>pom</packaging>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <useFile>true</useFile>
- <printSummary>false</printSummary>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <showSuccess>false</showSuccess>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
-
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <useFile>true</useFile>
+ <printSummary>false</printSummary>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <showSuccess>false</showSuccess>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.25</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-5</version>
Modified: incubator/isis/trunk/examples/expenses/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expenses/commandline/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expenses/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/expenses/commandline/pom.xml Thu Nov 11 10:32:11 2010
@@ -15,6 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifest>
@@ -44,7 +45,7 @@
<descriptors>
<descriptor>src/main/assembly/descriptor.xml</descriptor>
</descriptors>
- <finalName>expenses-demo-${version}</finalName>
+ <finalName>expenses-demo-${project.version}</finalName>
<attach>false</attach>
</configuration>
</plugin>
Modified: incubator/isis/trunk/examples/expenses/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expenses/webapp/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expenses/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/expenses/webapp/pom.xml Thu Nov 11 10:32:11 2010
@@ -48,11 +48,13 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.25</version>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0.1-alpha-1</version>
<configuration>
<container>
Modified: incubator/isis/trunk/examples/orders/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/orders/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/orders/pom.xml (original)
+++ incubator/isis/trunk/examples/orders/pom.xml Thu Nov 11 10:32:11 2010
@@ -39,6 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifest>
@@ -68,7 +69,7 @@
<descriptors>
<descriptor>src/main/assembly/descriptor.xml</descriptor>
</descriptors>
- <finalName>orders-demo-${version}</finalName>
+ <finalName>orders-demo-${project.version}</finalName>
<attach>false</attach>
</configuration>
</plugin>
Modified: incubator/isis/trunk/examples/shopping-cart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/shopping-cart/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/examples/shopping-cart/pom.xml (original)
+++ incubator/isis/trunk/examples/shopping-cart/pom.xml Thu Nov 11 10:32:11 2010
@@ -12,71 +12,67 @@
<packaging>pom</packaging>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- <executions>
- <execution>
- <id>source</id>
- <phase>compile</phase>
- </execution>
- <execution>
- <id>test</id>
- <phase>test-compile</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <useFile>true</useFile>
- <printSummary>false</printSummary>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <showSuccess>false</showSuccess>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
-
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <useFile>true</useFile>
+ <printSummary>false</printSummary>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <showSuccess>false</showSuccess>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.25</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -85,7 +81,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
-
</plugins>
</build>
Modified: incubator/isis/trunk/support/prototype/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/pom.xml?rev=1033872&r1=1033871&r2=1033872&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/pom.xml (original)
+++ incubator/isis/trunk/support/prototype/pom.xml Thu Nov 11 10:32:11 2010
@@ -17,6 +17,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -36,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<excludes>
<exclude>**/Test*.java</exclude>
@@ -50,6 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<excludes>
<exclude>**/Test*.java</exclude>