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/21 02:59:28 UTC
svn commit: r776906 - in /portals/jetspeed-2/portal/trunk:
applications/jetspeed-demo/pom.xml applications/jetspeed-layouts/pom.xml
applications/jetspeed/pom.xml pom.xml src/main/ src/main/assembly/
src/main/assembly/project-src.xml
Author: ate
Date: Thu May 21 00:59:28 2009
New Revision: 776906
URL: http://svn.apache.org/viewvc?rev=776906&view=rev
Log:
JS2-1018: Release 2.2.0 preparation
See: http://issues.apache.org/jira/browse/JS2-1018
- switching to portals-pom-1.2 parent
Added:
portals/jetspeed-2/portal/trunk/src/main/
portals/jetspeed-2/portal/trunk/src/main/assembly/
portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml (with props)
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
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=776906&r1=776905&r2=776906&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml Thu May 21 00:59:28 2009
@@ -60,6 +60,40 @@
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!--
+ workaround for war processing of m-r-r-plugin causing the generated
+ NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml?rev=776906&r1=776905&r2=776906&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml Thu May 21 00:59:28 2009
@@ -51,4 +51,45 @@
</dependencies>
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!--
+ workaround for war processing of m-r-r-plugin causing the generated
+ NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+
</project>
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=776906&r1=776905&r2=776906&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml Thu May 21 00:59:28 2009
@@ -41,8 +41,37 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!--
+ workaround for war processing of m-r-r-plugin causing the generated
+ NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>${pom.groupId}</groupId>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=776906&r1=776905&r2=776906&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu May 21 00:59:28 2009
@@ -21,9 +21,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
+
+ <parent>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portals-pom</artifactId>
+ <version>1.2</version>
+ </parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
@@ -37,17 +40,6 @@
<url>http://portals.apache.org/jetspeed-2</url>
-->
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://portals.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<issueManagement>
<system>Jira</system>
<url>http://issues.apache.org/jira/browse/JS2</url>
@@ -1458,14 +1450,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- force maven-jar-plugin to 2.1 which fixes putting in the "correct" pom.xml in the jar
- I'd like to be able to specify version range [2.1,) but that seems to be utterly broken :(
- -->
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -1475,7 +1459,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -1728,6 +1711,34 @@
<!-- For building website documentation, there's no need to include modules. -->
<modules/>
</profile>
+
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <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 -->
+ <descriptors>
+ <descriptor>src/main/assembly/project-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Added: portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml?rev=776906&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml (added)
+++ portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml Thu May 21 00:59:28 2009
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>velocity.log</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org