Author: bommel
Date: Sun May 7 02:34:58 2006
New Revision: 404745
URL: http://svn.apache.org/viewcvs?rev=404745&view=rev
Log:
some pom cleanup
Modified:
myfaces/tobago/trunk/contrib/facelets/pom.xml
myfaces/tobago/trunk/contrib/pom.xml
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/example/addressbook/pom.xml
myfaces/tobago/trunk/example/blank/pom.xml
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/facelets/pom.xml
myfaces/tobago/trunk/example/foreach/pom.xml
myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
myfaces/tobago/trunk/example/pom.xml
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/theme/charlotteville/pom.xml
myfaces/tobago/trunk/theme/pom.xml
myfaces/tobago/trunk/theme/richmond/pom.xml
myfaces/tobago/trunk/theme/scarborough/pom.xml
myfaces/tobago/trunk/theme/speyside/pom.xml
myfaces/tobago/trunk/theme/standard/pom.xml
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml
myfaces/tobago/trunk/tobago-tool/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
Modified: myfaces/tobago/trunk/contrib/facelets/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/facelets/pom.xml Sun May 7 02:34:58 2006
@@ -5,7 +5,6 @@
<artifactId>tobago-contrib</artifactId>
<version>1.0.8-SNAPSHOT</version>
</parent>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-facelets</artifactId>
<packaging>jar</packaging>
<name>Tobago Facelets</name>
@@ -47,9 +46,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
</artifactItem>
@@ -78,9 +77,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-apt-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<configuration>
<excludes>
<exclude>org/apache/myfaces/tobago/*</exclude>
@@ -129,15 +128,15 @@
<version>1.0.14</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-tool-apt</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/pom.xml Sun May 7 02:34:58 2006
@@ -7,9 +7,7 @@
</parent>
<packaging>pom</packaging>
<name>Tobago Contrib</name>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-contrib</artifactId>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib</developerConnection>
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Sun May 7 02:34:58 2006
@@ -23,9 +23,9 @@
<plugins>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-apt-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<configuration>
<targetFiles>
<targetFile>org/apache/myfaces/tobago/taglib/component/tobago.tld</targetFile>
@@ -73,7 +73,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -155,9 +154,9 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-tool-apt</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -225,9 +224,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-apt-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<configuration>
<targetFiles>
<targetFile>org/apache/myfaces/tobago/taglib/component/tobago.xml</targetFile>
Modified: myfaces/tobago/trunk/example/addressbook/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/addressbook/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/pom.xml Sun May 7 02:34:58 2006
@@ -32,14 +32,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/example/blank/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/blank/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/blank/pom.xml (original)
+++ myfaces/tobago/trunk/example/blank/pom.xml Sun May 7 02:34:58 2006
@@ -32,29 +32,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/demo/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Sun May 7 02:34:58 2006
@@ -12,9 +12,9 @@
<finalName>tobago-example-demo</finalName>
<plugins>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-theme-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
@@ -43,37 +43,35 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
-
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/facelets/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Sun May 7 02:34:58 2006
@@ -32,29 +32,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-facelets</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/example/foreach/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/foreach/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/foreach/pom.xml (original)
+++ myfaces/tobago/trunk/example/foreach/pom.xml Sun May 7 02:34:58 2006
@@ -34,29 +34,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/nonfacesrequest/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/pom.xml Sun May 7 02:34:58 2006
@@ -32,24 +32,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Sun May 7 02:34:58 2006
@@ -7,7 +7,6 @@
</parent>
<packaging>pom</packaging>
<name>Tobago Examples</name>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
<scm>
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/test/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Sun May 7 02:34:58 2006
@@ -39,29 +39,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sun May 7 02:34:58 2006
@@ -151,6 +151,11 @@
<excludeDefaults>true</excludeDefaults>
<plugins>
+ <!-- <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>-->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -178,6 +183,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <!--<aggregate>true</aggregate>-->
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/j2ee/1.4/docs/api</link>
@@ -201,24 +207,48 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
- <plugin>
+ <!--<plugin>
<inherited>false</inherited>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changes-maven-plugin</artifactId>
- </plugin>
+ </plugin>-->
<plugin>
<inherited>false</inherited>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changelog-maven-plugin</artifactId>
- <configuration><basedir>${basedir}</basedir></configuration>
+ <configuration>
+ <basedir>${basedir}</basedir>
+ </configuration>
</plugin>
+ <!--<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>-->
+
<!-- pmd has problems with annotations -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ <ruleset>/rulesets/imports.xml</ruleset>
+ <!--<ruleset>/rulesets/design.xml/SimplifyBooleanReturnsRule</ruleset>
+ <ruleset>/rulesets/design.xml/SimplifyBooleanExpressions</ruleset>
+ <ruleset>/rulesets/design.xml/AvoidReassigningParametersRule</ruleset>
+ <ruleset>/rulesets/design.xml/FinalFieldCouldBeStatic</ruleset>
+ <ruleset>/rulesets/design.xml/BooleanInstantiation</ruleset>
+ <ruleset>/rulesets/design.xml/NonStaticInitializer</ruleset>
+ <ruleset>/rulesets/design.xml/DefaultLabelNotLastInSwitchStmt</ruleset>
+ <ruleset>/rulesets/design.xml/OptimizableToArrayCallRule</ruleset>
+ <ruleset>/rulesets/coupling.xml/LooseCouplingRule</ruleset>-->
+ </rulesets>
<excludes>
<exclude>**/package-info.java</exclude>
<exclude>org/apache/myfaces/tobago/apt/annotation/*.java</exclude>
@@ -343,7 +373,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- <id>apache-maven-snapshots</id>
+ <id>apache.snapshots</id>
<url>http://cvs.apache.org/maven-snapshot-repository</url>
</repository>
</repositories>
@@ -351,6 +381,18 @@
<build>
<defaultGoal>install</defaultGoal>
<plugins>
+ <!--<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -396,13 +438,13 @@
<distributionManagement>
<repository>
- <id>apache-maven</id>
+ <id>apache.releases</id>
<name>Apache Maven Repository</name>
<url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
</repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
- <id>apache-maven-snapshots</id>
+ <id>apache.snapshots</id>
<name>Apache Maven Snapshot Repository</name>
<url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
</snapshotRepository>
Modified: myfaces/tobago/trunk/theme/charlotteville/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/charlotteville/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/charlotteville/pom.xml (original)
+++ myfaces/tobago/trunk/theme/charlotteville/pom.xml Sun May 7 02:34:58 2006
@@ -17,15 +17,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
@@ -73,7 +72,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
</configuration>
</execution>
Modified: myfaces/tobago/trunk/theme/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/pom.xml (original)
+++ myfaces/tobago/trunk/theme/pom.xml Sun May 7 02:34:58 2006
@@ -7,7 +7,6 @@
</parent>
<packaging>pom</packaging>
<name>Tobago Themes</name>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
<reporting>
Modified: myfaces/tobago/trunk/theme/richmond/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/richmond/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/pom.xml (original)
+++ myfaces/tobago/trunk/theme/richmond/pom.xml Sun May 7 02:34:58 2006
@@ -17,15 +17,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
@@ -40,59 +39,58 @@
</dependency>
</dependencies>
<profiles>
- <profile>
+ <profile>
<!--
mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
-->
- <id>jdk14retro</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>translate</goal>
- </goals>
- <configuration>
- <verify>true</verify>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
+ <id>jdk14retro</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>translate</goal>
+ </goals>
+ <configuration>
+ <verify>true</verify>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>jdk14retro</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.3</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
+ <classifier>jdk14retro</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>rt</artifactId>
+ <version>1.4.0</version>
+ <scope>system</scope>
+ <systemPath>${java14.home}/lib/rt.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/scarborough/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Sun May 7 02:34:58 2006
@@ -31,16 +31,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
@@ -96,7 +94,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
</configuration>
</execution>
Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/speyside/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Sun May 7 02:34:58 2006
@@ -16,18 +16,15 @@
</scm>
<dependencies>
-
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
@@ -36,11 +33,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<profiles>
@@ -98,5 +94,4 @@
</dependencies>
</profile>
</profiles>
-
</project>
Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/standard/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Sun May 7 02:34:58 2006
@@ -16,12 +16,10 @@
</scm>
<dependencies>
-
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
@@ -29,13 +27,11 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<profiles>
@@ -69,7 +65,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
</configuration>
</execution>
@@ -93,5 +89,4 @@
</dependencies>
</profile>
</profiles>
-
</project>
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Sun May 7 02:34:58 2006
@@ -29,9 +29,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>javadoc</classifier>
</artifactItem>
</artifactItems>
@@ -49,9 +49,9 @@
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>tlddoc</classifier>
</artifactItem>
@@ -70,9 +70,9 @@
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-facelets</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
@@ -89,39 +89,39 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
@@ -160,9 +160,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Sun May 7 02:34:58 2006
@@ -25,29 +25,29 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-richmond</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/pom.xml Sun May 7 02:34:58 2006
@@ -5,7 +5,6 @@
<artifactId>tobago-tool</artifactId>
<version>1.0.8-SNAPSHOT</version>
</parent>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>maven-apt-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Apt Plugin</name>
Modified: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml Sun May 7 02:34:58 2006
@@ -5,7 +5,6 @@
<artifactId>tobago-tool</artifactId>
<version>1.0.8-SNAPSHOT</version>
</parent>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>maven-theme-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Tobago Theme Plugin</name>
@@ -19,13 +18,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>2.0</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -36,7 +33,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-tool/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/pom.xml Sun May 7 02:34:58 2006
@@ -7,7 +7,6 @@
</parent>
<packaging>pom</packaging>
<name>Tobago Tool</name>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
<modules>
<module>maven-apt-plugin</module>
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=404745&r1=404744&r2=404745&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Sun May 7 02:34:58 2006
@@ -5,7 +5,6 @@
<artifactId>tobago-tool</artifactId>
<version>1.0.8-SNAPSHOT</version>
</parent>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-apt</artifactId>
<packaging>jar</packaging>
<name>Tobago Apt</name>
@@ -19,13 +18,11 @@
<version>1.6.2</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
|