You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/29 23:31:49 UTC
svn commit: r438226 - in /geronimo/genesis/trunk: config/clover-config/
config/pom.xml config/project-config/pom.xml plugins/pom.xml pom.xml
Author: jdillon
Date: Tue Aug 29 14:31:49 2006
New Revision: 438226
URL: http://svn.apache.org/viewvc?rev=438226&view=rev
Log:
Drop clover
Removed:
geronimo/genesis/trunk/config/clover-config/
Modified:
geronimo/genesis/trunk/config/pom.xml
geronimo/genesis/trunk/config/project-config/pom.xml
geronimo/genesis/trunk/plugins/pom.xml
geronimo/genesis/trunk/pom.xml
Modified: geronimo/genesis/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/pom.xml?rev=438226&r1=438225&r2=438226&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/pom.xml (original)
+++ geronimo/genesis/trunk/config/pom.xml Tue Aug 29 14:31:49 2006
@@ -38,7 +38,6 @@
<modules>
<module>logging-config</module>
- <module>clover-config</module>
<module>checkstyle-config</module>
<module>project-config</module>
<module>geronimo-skin</module>
Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=438226&r1=438225&r2=438226&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Tue Aug 29 14:31:49 2006
@@ -132,6 +132,7 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<type>jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -139,8 +140,6 @@
<dependencies>
- <!-- Test Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>logging-config</artifactId>
@@ -152,7 +151,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -173,6 +171,10 @@
<testResource>
<directory>${pom.basedir}/src/test/resources</directory>
</testResource>
+
+ <!--
+ TODO: Drop this... its not got much meaning
+ -->
<testResource>
<directory>${pom.basedir}/src/test/data</directory>
</testResource>
@@ -181,12 +183,6 @@
<extensions>
<extension>
<groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>clover-config</artifactId>
- <version>1.1-SNAPSHOT</version>
- </extension>
-
- <extension>
- <groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>checkstyle-config</artifactId>
<version>1.1-SNAPSHOT</version>
</extension>
@@ -240,18 +236,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <generateHtml>true</generateHtml>
- <jdk>1.4</jdk>
- <!-- Pulled as resource from clover-config plugin -->
- <licenseLocation>org/apache/geronimo/clover.license</licenseLocation>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-one-plugin</artifactId>
<version>1.0</version>
</plugin>
@@ -299,6 +283,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <!--
+ FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+ until war plugin is updated.
+ -->
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -322,19 +317,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!--
NOTE: Project pom should define:
@@ -569,12 +551,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.2</version>
</plugin>
<plugin>
Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=438226&r1=438225&r2=438226&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Tue Aug 29 14:31:49 2006
@@ -41,6 +41,7 @@
</description>
<dependencies>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -68,6 +69,7 @@
<version>1.2</version>
<type>jar</type>
</dependency>
+
</dependencies>
<build>
Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=438226&r1=438225&r2=438226&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Tue Aug 29 14:31:49 2006
@@ -141,7 +141,6 @@
</activation>
<modules>
- <module>config/clover-config</module>
<module>config/checkstyle-config</module>
</modules>
</profile>