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 2009/05/22 00:12:29 UTC
svn commit: r777287 - /portals/jetspeed-2/portal/trunk/pom.xml
Author: ate
Date: Thu May 21 22:12:29 2009
New Revision: 777287
URL: http://svn.apache.org/viewvc?rev=777287&view=rev
Log:
JS2-1018: Release 2.2.0 preparation
See: http://issues.apache.org/jira/browse/JS2-1018
- removing no longer needed (nor available) staging repository for APA dependencies as these have been released now
- also dropping not needed (anymore) codehause repositories nor default/buildin Maven Central repository
- bumping commons-betwixt version to 0.8 proper, the 20061115 was 0.8-RC1 with only mimimal changes (1 bug fix only) ending up in 0.8
- moving assembly-plugin override/exclude "hack" of the portals-pom-1.2 defined "project" assembly into PluginManagement section
so child poms don't need to configure this themselves anymore (like 3x in jetspeed-installer poms)
Modified:
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=777287&r1=777286&r2=777287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu May 21 22:12:29 2009
@@ -201,47 +201,17 @@
<name>Apache Portals Staging Repository For Pluto 2.0.0</name>
<url>https://repository.apache.org/content/repositories/portals-staging-027</url>
</repository>
- <!-- Temporary staging repository providing APA artifacts under VOTE for release
- Will be removed again after the VOTE has passed and the staging repository promoted
- -->
- <repository>
- <id>repository.apache.org.portals-staging-025</id>
- <name>Apache Portals Staging Repository</name>
- <url>https://repository.apache.org/content/repositories/portals-staging-025</url>
- </repository>
<repository>
<id>com.bluesunrise.m2</id>
<name>Maven2 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven2</url>
</repository>
<repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
<id>com.bluesunrise.m1</id>
<name>Maven1 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven</url>
<layout>legacy</layout>
</repository>
- <repository>
- <id>org.codehaus.m2</id>
- <name>Maven2 Codehaus</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- <repository>
- <id>org.codehaus</id>
- <name>Maven1 Codehaus</name>
- <url>http://dist.codehaus.org</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>org.apache</id>
- <name>Maven1 Apache</name>
- <url>http://repo1.maven.org/maven</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<!-- Properties -->
@@ -280,7 +250,7 @@
<castor.version>1.1.1-xml</castor.version>
<cglib.version>2.1_3</cglib.version>
<commons-beanutils.version>1.7.0</commons-beanutils.version>
- <commons-betwixt.version>20061115</commons-betwixt.version>
+ <commons-betwixt.version>0.8</commons-betwixt.version>
<commons-codec.version>1.3</commons-codec.version>
<commons-collections.version>3.2</commons-collections.version>
<commons-configuration.version>1.1</commons-configuration.version>
@@ -1469,6 +1439,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <!--
+ "hack" to make it possible to override portals-pom-1.2 configuration using descriptorRef "project" which
+ (with the current version of the plugin doesn't produce what we need. This "hack" also requires setting
+ ignoreMissingDescriptor=true (below) See also: http://jira.codehaus.org/browse/MASSEMBLY-409
+ -->
+ <descriptorRefs>
+ <descriptorRef>dummy-does-not-exist</descriptorRef>
+ </descriptorRefs>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
+ <!-- our custom assembly descriptor producing -src archives and excludes velocity.log -->
+ </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?),
@@ -1720,15 +1706,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <!--
- "hack" to make it possible to override portals-pom-1.2 configuration using descriptorRef "project" which
- (with the current version of the plugin doesn't produce what we need. This "hack" also requires setting
- ignoreMissingDescriptor=true (below) See also: http://jira.codehaus.org/browse/MASSEMBLY-409
- -->
- <descriptorRefs>
- <descriptorRef>dummy-does-not-exist</descriptorRef>
- </descriptorRefs>
- <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
<!-- our custom assembly descriptor producing -src archives and excludes velocity.log -->
<descriptors>
<descriptor>src/main/assembly/project-src.xml</descriptor>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org