You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/03/19 00:32:35 UTC
svn commit: r638637 - in /portals/jetspeed-2/portal/trunk: ./ applications/
applications/jetspeed-demo/ applications/jetspeed/
components/jetspeed-capability/ components/jetspeed-deploy-tools/
components/jetspeed-page-manager/ components/jetspeed-porta...
Author: ate
Date: Tue Mar 18 16:32:33 2008
New Revision: 638637
URL: http://svn.apache.org/viewvc?rev=638637&view=rev
Log:
Some additonal plugin reorganization and cleanup
Added:
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java (contents, props changed)
- copied, changed from r638208, portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java (contents, props changed)
- copied, changed from r638208, portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DatabaseMojo.java
Removed:
portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DatabaseMojo.java
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
portals/jetspeed-2/portal/trunk/applications/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/SqlScripts.java
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml Tue Mar 18 16:32:33 2008
@@ -72,13 +72,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml Tue Mar 18 16:32:33 2008
@@ -236,13 +236,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: portals/jetspeed-2/portal/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/pom.xml Tue Mar 18 16:32:33 2008
@@ -42,4 +42,5 @@
<module>layout-portlets</module>
-->
</modules>
+
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml Tue Mar 18 16:32:33 2008
@@ -103,13 +103,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml Tue Mar 18 16:32:33 2008
@@ -36,7 +36,7 @@
<packaging>jar</packaging>
<dependencies>
-
+
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -51,7 +51,7 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
+
<!-- Runtime Dependencies -->
<dependency>
<groupId>jaxen</groupId>
@@ -63,7 +63,7 @@
<artifactId>saxpath</artifactId>
<scope>runtime</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -92,15 +92,8 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
-
+
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml Tue Mar 18 16:32:33 2008
@@ -171,13 +171,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Tue Mar 18 16:32:33 2008
@@ -281,13 +281,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml Tue Mar 18 16:32:33 2008
@@ -111,13 +111,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Tue Mar 18 16:32:33 2008
@@ -127,13 +127,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Tue Mar 18 16:32:33 2008
@@ -166,13 +166,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Tue Mar 18 16:32:33 2008
@@ -148,13 +148,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Tue Mar 18 16:32:33 2008
@@ -113,13 +113,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Tue Mar 18 16:32:33 2008
@@ -122,13 +122,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<testResources>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml Tue Mar 18 16:32:33 2008
@@ -39,10 +39,11 @@
<plugins>
<plugin>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-build-maven-plugin</artifactId>
+ <artifactId>jetspeed-db-maven-plugin</artifactId>
<version>${pom.version}</version>
<executions>
<execution>
+ <phase>process-resources</phase>
<goals>
<goal>ddl</goal>
</goals>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/pom.xml Tue Mar 18 16:32:33 2008
@@ -37,10 +37,6 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-maven-utils</artifactId>
</dependency>
<dependency>
@@ -52,16 +48,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.7</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ddlutils</groupId>
- <artifactId>ddlutils</artifactId>
- </dependency>
- <dependency>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- <version>1.4.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml Tue Mar 18 16:32:33 2008
@@ -62,12 +62,6 @@
<groupId>org.apache.ddlutils</groupId>
<artifactId>ddlutils</artifactId>
</dependency>
- <dependency>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- <version>1.4.1</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Copied: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java (from r638208, portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java?p2=portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java&p1=portals/jetspeed-2/portal/trunk/maven/jetspeed-build-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java&r1=638208&r2=638637&rev=638637&view=diff
==============================================================================
(empty)
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DDLGeneratorMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java (from r638208, portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DatabaseMojo.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java?p2=portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java&p1=portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DatabaseMojo.java&r1=638208&r2=638637&rev=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DatabaseMojo.java (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java Tue Mar 18 16:32:33 2008
@@ -20,7 +20,6 @@
import org.apache.jetspeed.maven.utils.Artifacts;
import org.apache.jetspeed.maven.utils.DbConnection;
-import org.apache.jetspeed.maven.utils.SeedConfig;
import org.apache.jetspeed.maven.utils.SqlScripts;
import org.apache.jetspeed.maven.utils.UnpackResources;
import org.apache.maven.plugin.AbstractMojo;
@@ -31,9 +30,9 @@
/**
* @version $Id$
- * @goal run
+ * @goal load
*/
-public class DatabaseMojo extends AbstractMojo
+public class LoadMojo extends AbstractMojo
{
/**
* Database connection
@@ -52,11 +51,6 @@
private UnpackResources unpack;
/**
- * @parameter
- */
- private SeedConfig seedConfig;
-
- /**
* @parameter expression="${settings}"
* @required
* @readonly
@@ -86,7 +80,7 @@
{
if ( skip )
{
- this.getLog().info( "Skipping init-db" );
+ this.getLog().info( "Skipping db load" );
return;
}
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/LoadMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml Tue Mar 18 16:32:33 2008
@@ -54,12 +54,6 @@
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- <version>1.4.1</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml Tue Mar 18 16:32:33 2008
@@ -46,11 +46,5 @@
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- <version>1.4.1</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/SqlScripts.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/SqlScripts.java?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/SqlScripts.java (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/SqlScripts.java Tue Mar 18 16:32:33 2008
@@ -29,7 +29,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.settings.Settings;
/**
* @version $Id$
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=638637&r1=638636&r2=638637&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue Mar 18 16:32:33 2008
@@ -1139,6 +1139,14 @@
<pluginManagement>
<plugins>
+ <!-- Clean: ignore errors -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
<!-- Compiler -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1201,6 +1209,22 @@
<addVersionToProjectName>true</addVersionToProjectName>
</configuration>
</plugin>
+ <plugin>
+ <!-- to ensure the jetspeed-portal-resources artifact is visible as plugin dependency
+ when it itself is build during a full mvn install -P all (mvn bug?),
+ defining it as default provided dependency in pluginManagement.
+ -->
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-build-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
@@ -1245,14 +1269,7 @@
<modules>
<module>jetspeed-api</module>
<module>maven</module>
-<!-- Ate:
- When building/installing jetspeed-portal-resources it is not immediately visible/provided
- as dependent artifact to other plugins like unpack in other modules :(
- This needs further research how to fix this or work around, but for now
- the jetspeed-portal-resources have to be build separately (e.g. with -P init)
-
<module>jetspeed-portal-resources</module>
--->
<module>jetspeed-commons</module>
<module>components</module>
<module>applications</module>
@@ -1280,14 +1297,7 @@
<modules>
<module>jetspeed-api</module>
<module>maven</module>
-<!-- Ate:
- When building/installing jetspeed-portal-resources it is not immediately visible/provided
- as dependent artifact to other plugins like unpack in other modules :(
- This needs further research how to fix this or work around, but for now
- the jetspeed-portal-resources have to be build separately (e.g. with -P init)
-
<module>jetspeed-portal-resources</module>
--->
<module>jetspeed-commons</module>
<module>components</module>
</modules>
@@ -1301,7 +1311,7 @@
<artifactId>jetspeed-db-maven-plugin</artifactId>
<version>${pom.version}</version>
<goals>
- <goal>run</goal>
+ <goal>load</goal>
</goals>
<configuration>
<connection>
@@ -1361,7 +1371,7 @@
<artifactId>jetspeed-db-maven-plugin</artifactId>
<version>${pom.version}</version>
<goals>
- <goal>run</goal>
+ <goal>load</goal>
</goals>
<configuration>
<connection>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org