Author: ate
Date: Tue May 12 21:06:39 2009
New Revision: 774084
URL: http://svn.apache.org/viewvc?rev=774084&view=rev
Log:
- Adding the organization definition again as proposed by David Jencks
- Restoring the initial assembly-plugin configuration as provided by David
Jencks using the redefined assembly project descriptor again.
Note: I'm not sure yet this works as intended, I'll actually have to make a
release on portlet-api_2.0_spec first to see if it won't also include the
temporary velocity.log file.
If it does include velocity.log however, I currently inclined to simply
ignore that for now, no harm done by having that in the -project distro really,
even if its a temporary build artifact
Modified:
portals/portals-pom/trunk/pom.xml
Modified: portals/portals-pom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portals-pom/trunk/pom.xml?rev=774084&r1=774083&r2=774084&view=diff
==============================================================================
--- portals/portals-pom/trunk/pom.xml (original)
+++ portals/portals-pom/trunk/pom.xml Tue May 12 21:06:39 2009
@@ -43,6 +43,12 @@
</description>
<url>http://portals.apache.org</url>
+
+ <organization>
+ <name>The Apache Software Foundation Portals Project</name>
+ <url>http://portals.apache.org/</url>
+ </organization>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -81,11 +87,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/project.xml</descriptor>
- </descriptors>
- </configuration>
</plugin>
</plugins>
</build>
@@ -98,7 +99,11 @@
<artifactId>maven-assembly-plugin</artifactId>
<!-- version 2.2-beta-3 does not work, see
http://jira.codehaus.org/browse/MASSEMBLY-405 -->
<version>2.2-beta-2</version>
- <!-- no predefined project assembly here as it is too limiting: each
root project should configure a custom assembly -->
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ </configuration>
<executions>
<execution>
<id>make-assembly</id>
