Author: ate
Date: Fri May 22 20:49:42 2009
New Revision: 777707
URL: http://svn.apache.org/viewvc?rev=777707&view=rev
Log:
JS2-1018: Release 2.2.0 preparation
See: http://issues.apache.org/jira/browse/JS2-1018
- overriding the maven-release-plugin to not execute goals "clean verify" but
(only) "install" instead (see embedded comment)
- also removing staging repo for pluto-2.0.0 as it has been released now,
although it isn't yet showning up on Maven Central (should be a matter of time)
- dropping "empty" distributionManagement repository definitions: apache 6 pom
already provides the configuration for repository.apache.org
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=777707&r1=777706&r2=777707&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Fri May 22 20:49:42
2009
@@ -31,14 +31,6 @@
<name>Jetspeed-2 Administration</name>
<repositories>
- <!-- Temporary staging repository providing Pluto 2.0.0 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-027</id>
- <name>Apache Portals Staging Repository For Pluto 2.0.0</name>
-
<url>https://repository.apache.org/content/repositories/portals-staging-027</url>
- </repository>
<repository>
<id>com.bluesunrise.m2</id>
<name>Maven2 BlueSunrise</name>
@@ -351,20 +343,6 @@
</dependencies>
- <distributionManagement>
- <!--
- A dummy repository just to keep the maven deploy plugin happy. To
- deploy: use mvn deploy
- -DaltDeploymentRepository=serverId::default::url See also :
- http://www.apache.org/dev/repository-faq.html
- http://maven.apache.org/plugins/maven-deploy-plugin/deploy-mojo.html
- -->
- <repository>
- <id></id>
- <url></url>
- </repository>
- </distributionManagement>
-
<!-- Build Configuration -->
<build>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=777707&r1=777706&r2=777707&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri May 22 20:49:42 2009
@@ -1300,18 +1300,6 @@
</dependencies>
</dependencyManagement>
- <distributionManagement>
- <!-- A dummy repository just to keep the maven deploy plugin happy.
- To deploy: use mvn deploy
-DaltDeploymentRepository=serverId::default::url
- See also : http://www.apache.org/dev/repository-faq.html
-
http://maven.apache.org/plugins/maven-deploy-plugin/deploy-mojo.html
- -->
- <repository>
- <id></id>
- <url></url>
- </repository>
- </distributionManagement>
-
<dependencies>
<!-- Provided Dependencies -->
@@ -1439,21 +1427,41 @@
</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>
- </configuration>
- </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>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Papache-release</arguments>
+ <!--
+ override default "clean, verify" preparationGoals with just
"install":
+ - clean: causes problems with bootstrapping usage of
jetspeed-maven-plugins which would first need to be build
+ - verify: causes problems with dependencies in submodules on
earlier build (but not yet installed) modules
+ - install: ensures modules artifacts are installed when build so
later modules can have dependencies on them
+ -->
+ <preparationGoals>install</preparationGoals>
+ <!--
+ all submodules should get the parent version, so let the release
plugin take care of this automatically
+ -->
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </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?),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
