Author: djencks
Date: Tue May 12 00:50:50 2009
New Revision: 773745
URL: http://svn.apache.org/viewvc?rev=773745&view=rev
Log:
PORTALS-14 Provisional commit to show use of proposed 1.2 portals pom
Modified:
portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
Modified: portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0/pom.xml?rev=773745&r1=773744&r2=773745&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-1.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-1.0/pom.xml Tue May 12 00:50:50 2009
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.portals</groupId>
<artifactId>portals-pom</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>portlet-api_1.0_spec</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Java Portlet Specification V1.0</name>
<description>The Java Portlet API version 1.0 developed by the Java
Community Process JSR-168 Expert Group.</description>
@@ -60,8 +60,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- minor fix for the organization name glitch in
portals-pom-1.1 -->
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Package>javax.portlet;version=1.0.0</Export-Package>
<Private-Package/>
<Implementation-Title>${project.name}</Implementation-Title>
@@ -80,6 +78,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/pom.xml?rev=773745&r1=773744&r2=773745&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-2.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-2.0/pom.xml Tue May 12 00:50:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.portals</groupId>
<artifactId>portals-pom</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -68,8 +68,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- minor fix for the organization name glitch in
portals-pom-1.1 -->
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Package>javax.portlet.filter;version=2.0.0,
javax.portlet;version=2.0.0
</Export-Package>
@@ -81,25 +79,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
@@ -108,18 +87,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Used by maven-remote-resources-plugin -->
- <exclude>src/main/appended-resources/META-INF/*</exclude>
- <!-- Generated by maven-remote-resources-plugin -->
- <exclude>velocity.log</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -129,6 +96,7 @@
<build>
<plugins>
<plugin>
+ <!-- only include this in top level project poms -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
