Author: tv
Date: Mon Mar 23 17:14:19 2009
New Revision: 757451
URL: http://svn.apache.org/viewvc?rev=757451&view=rev
Log:
Fix version of (released) parent-POM
Fix group-ids, fix dependencies
Modified:
turbine/fulcrum/trunk/cache/pom.xml
turbine/fulcrum/trunk/commonsemail/pom.xml
turbine/fulcrum/trunk/crypto/pom.xml
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/mimetype/pom.xml
turbine/fulcrum/trunk/pbe/pom.xml
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/servicemanager/pom.xml
turbine/fulcrum/trunk/site/pom.xml
turbine/fulcrum/trunk/spring/pom.xml
Modified: turbine/fulcrum/trunk/cache/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/pom.xml (original)
+++ turbine/fulcrum/trunk/cache/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,16 +61,10 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
+ <version>4.3.1</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -94,22 +88,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.5</version>
<scope>test</scope>
</dependency>
<!-- To test with Avalon -->
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
+ <version>4.3.1</version>
<scope>test</scope>
</dependency>
<!-- To test with ECM -->
Modified: turbine/fulcrum/trunk/commonsemail/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/commonsemail/pom.xml (original)
+++ turbine/fulcrum/trunk/commonsemail/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,15 +61,9 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -94,13 +88,13 @@
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/crypto/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/crypto/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -75,25 +75,19 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,15 +62,9 @@
<dependencies>
<!-- Avalon dependecies -->
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- Jetty dependencies -->
<dependency>
@@ -93,13 +87,13 @@
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/mimetype/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/pom.xml (original)
+++ turbine/fulcrum/trunk/mimetype/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,25 +61,19 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/pbe/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/pom.xml (original)
+++ turbine/fulcrum/trunk/pbe/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,31 +61,25 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- Fulcrum dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi-crypto</artifactId>
<version>1.0.6-SNAPSHOT</version>
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -79,68 +79,20 @@
<version>1.5.2</version>
<scope>compile</scope>
</dependency>
-<!--
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
- <scope>compile</scope>
- </dependency>
- -->
- <dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
+ <version>4.3.1</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.5</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,31 +62,25 @@
<dependencies>
<!-- Avalon dependencies -->
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- Fulcrum dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pbe</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/servicemanager/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/servicemanager/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,25 +61,19 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- testing dependencies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<scope>test</scope>
Modified: turbine/fulcrum/trunk/site/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/pom.xml (original)
+++ turbine/fulcrum/trunk/site/pom.xml Mon Mar 23 17:14:19 2009
@@ -24,7 +24,7 @@
<artifactId>apache</artifactId>
<version>4</version>
</parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-site</artifactId>
<version>1.0.0</version>
<name>Fulcrum Component Library</name>
Modified: turbine/fulcrum/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=757451&r1=757450&r2=757451&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/pom.xml (original)
+++ turbine/fulcrum/trunk/spring/pom.xml Mon Mar 23 17:14:19 2009
@@ -20,9 +20,9 @@
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";>
<parent>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,25 +62,19 @@
<dependencies>
<!-- Avalon dependencies -->
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- Fulcrum dependecies -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-servicemanager</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- The YaafiContainerBean requires YAAFI -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6-SNAPSHOT</version>
<optional>true</optional>
