You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by at...@apache.org on 2007/02/27 03:43:22 UTC
svn commit: r512120 - in /portals/bridges/trunk: ./ applications/
applications/jpetstore/ applications/jsf-demo/ applications/perl/
applications/php/ applications/springmvc/ common/ frameworks/ jsf/
mapserver/ perl/ php/ portletfilter/ struts/ velocity/
Author: ate
Date: Mon Feb 26 18:43:21 2007
New Revision: 512120
URL: http://svn.apache.org/viewvc?view=rev&rev=512120
Log:
Release 1.0.1 preparation:
- bump all versions to 1.0.1
- ensure LICENSE.TXT is in the jars
- ensure NOTICE.txt is in the php bridge jar
Added:
portals/bridges/trunk/php/NOTICE.txt
- copied unchanged from r511690, portals/bridges/trunk/NOTICE.txt
Removed:
portals/bridges/trunk/NOTICE.txt
Modified:
portals/bridges/trunk/applications/jpetstore/pom.xml
portals/bridges/trunk/applications/jpetstore/project.xml
portals/bridges/trunk/applications/jsf-demo/pom.xml
portals/bridges/trunk/applications/jsf-demo/project.xml
portals/bridges/trunk/applications/perl/pom.xml
portals/bridges/trunk/applications/perl/project.xml
portals/bridges/trunk/applications/php/pom.xml
portals/bridges/trunk/applications/php/project.xml
portals/bridges/trunk/applications/pom.xml
portals/bridges/trunk/applications/springmvc/pom.xml
portals/bridges/trunk/applications/springmvc/project.xml
portals/bridges/trunk/common/pom.xml
portals/bridges/trunk/frameworks/pom.xml
portals/bridges/trunk/jsf/pom.xml
portals/bridges/trunk/mapserver/pom.xml
portals/bridges/trunk/mapserver/project.properties
portals/bridges/trunk/perl/pom.xml
portals/bridges/trunk/php/pom.xml
portals/bridges/trunk/php/project.xml
portals/bridges/trunk/pom.xml
portals/bridges/trunk/portletfilter/pom.xml
portals/bridges/trunk/project.properties
portals/bridges/trunk/project.xml
portals/bridges/trunk/struts/pom.xml
portals/bridges/trunk/velocity/pom.xml
Modified: portals/bridges/trunk/applications/jpetstore/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jpetstore/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/jpetstore/pom.xml (original)
+++ portals/bridges/trunk/applications/jpetstore/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-applications</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-struts-${struts.version}</artifactId>
- <version>${struts.version}-${portals.bridges.struts.version}</version>
+ <version>${portals.bridges.struts.version}</version>
</dependency>
</dependencies>
Modified: portals/bridges/trunk/applications/jpetstore/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jpetstore/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/jpetstore/project.xml (original)
+++ portals/bridges/trunk/applications/jpetstore/project.xml Mon Feb 26 18:43:21 2007
@@ -226,6 +226,13 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: portals/bridges/trunk/applications/jsf-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/pom.xml (original)
+++ portals/bridges/trunk/applications/jsf-demo/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-applications</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
Modified: portals/bridges/trunk/applications/jsf-demo/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/project.xml (original)
+++ portals/bridges/trunk/applications/jsf-demo/project.xml Mon Feb 26 18:43:21 2007
@@ -182,4 +182,23 @@
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/bridges/trunk/applications/perl/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/perl/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/perl/pom.xml (original)
+++ portals/bridges/trunk/applications/perl/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-applications</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
@@ -57,6 +57,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-perl</artifactId>
+ <version>${org.apache.portals.bridges.perl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<!-- Project Information -->
Modified: portals/bridges/trunk/applications/perl/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/perl/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/perl/project.xml (original)
+++ portals/bridges/trunk/applications/perl/project.xml Mon Feb 26 18:43:21 2007
@@ -81,4 +81,24 @@
</properties>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/bridges/trunk/applications/php/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/php/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/php/pom.xml (original)
+++ portals/bridges/trunk/applications/php/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-applications</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
Modified: portals/bridges/trunk/applications/php/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/php/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/php/project.xml (original)
+++ portals/bridges/trunk/applications/php/project.xml Mon Feb 26 18:43:21 2007
@@ -133,4 +133,31 @@
</properties>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../php/</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/bridges/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/pom.xml (original)
+++ portals/bridges/trunk/applications/pom.xml Mon Feb 26 18:43:21 2007
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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.
-
- $Id:$
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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.4</maven>
- </prerequisites>
-
- <!-- POM Identification -->
-
- <artifactId>portals-bridges-applications</artifactId>
- <parent>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <name>Bridges Applications</name>
- <description>
- Bridges Applications
- </description>
-
- <!-- Application Modules -->
-
- <modules>
- <module>springmvc</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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.
+
+ $Id:$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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.4</maven>
+ </prerequisites>
+
+ <!-- POM Identification -->
+
+ <artifactId>portals-bridges-applications</artifactId>
+ <parent>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges</artifactId>
+ <version>1.0.1</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Bridges Applications</name>
+ <description>
+ Bridges Applications
+ </description>
+
+ <!-- Application Modules -->
+
+ <modules>
+ <module>springmvc</module>
<module>jpetstore</module>
- <module>jsf-demo</module>
- <module>perl</module>
+ <module>jsf-demo</module>
+ <module>perl</module>
<module>php</module>
- </modules>
-
- <!-- Application Dependencies -->
-
- <dependencies>
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- Project Information -->
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/applications</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/applications</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/applications/</url>
- </scm>
-
-</project>
+ </modules>
+
+ <!-- Application Dependencies -->
+
+ <dependencies>
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/applications</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/applications</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/applications/</url>
+ </scm>
+
+</project>
Modified: portals/bridges/trunk/applications/springmvc/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/springmvc/pom.xml (original)
+++ portals/bridges/trunk/applications/springmvc/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-applications</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
@@ -99,6 +99,17 @@
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <version>${org.apache.portals.bridges.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-velocity</artifactId>
+ <version>${org.apache.portals.bridges.velocity.version}</version>
<scope>runtime</scope>
</dependency>
Modified: portals/bridges/trunk/applications/springmvc/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/applications/springmvc/project.xml (original)
+++ portals/bridges/trunk/applications/springmvc/project.xml Mon Feb 26 18:43:21 2007
@@ -7,7 +7,6 @@
<pomVersion>3</pomVersion>
<artifactId>springmvc</artifactId>
<name>Spring Portlet Jetspeed Application</name>
- <currentVersion>1.0.1-dev</currentVersion>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/applications/springmvc</connection>
@@ -203,6 +202,19 @@
<include>**/*.properties</include>
</includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>../${pom.artifactId}/META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: portals/bridges/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/common/pom.xml (original)
+++ portals/bridges/trunk/common/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -46,8 +46,20 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/frameworks/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/frameworks/pom.xml (original)
+++ portals/bridges/trunk/frameworks/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -82,8 +82,19 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/jsf/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/jsf/pom.xml (original)
+++ portals/bridges/trunk/jsf/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -60,8 +60,19 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/mapserver/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/mapserver/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/mapserver/pom.xml (original)
+++ portals/bridges/trunk/mapserver/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -66,8 +66,19 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/mapserver/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/mapserver/project.properties?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/mapserver/project.properties (original)
+++ portals/bridges/trunk/mapserver/project.properties Mon Feb 26 18:43:21 2007
@@ -16,5 +16,4 @@
maven.multiproject.type=jar
maven.license.licenseFile=${basedir}/../LICENSE.TXT
-portals.bridges.mapserver.version = 1.0
Modified: portals/bridges/trunk/perl/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/perl/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/perl/pom.xml (original)
+++ portals/bridges/trunk/perl/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -60,8 +60,19 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/php/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/php/pom.xml (original)
+++ portals/bridges/trunk/php/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -60,8 +60,26 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/php/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/php/project.xml (original)
+++ portals/bridges/trunk/php/project.xml Mon Feb 26 18:43:21 2007
@@ -59,4 +59,16 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: portals/bridges/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/pom.xml (original)
+++ portals/bridges/trunk/pom.xml Mon Feb 26 18:43:21 2007
@@ -29,7 +29,7 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<packaging>pom</packaging>
<name>Portals Bridges</name>
<description>
@@ -100,16 +100,16 @@
<log4j.version>1.2.8</log4j.version>
<castor.version>0.9.4.3</castor.version>
- <org.apache.portals.bridges.common.version>1.0.1-dev</org.apache.portals.bridges.common.version>
- <org.apache.portals.bridges.frameworks.version>1.0.1-dev</org.apache.portals.bridges.frameworks.version>
- <org.apache.portals.bridges.jpetstore.version>1.0.1-dev</org.apache.portals.bridges.jpetstore.version>
- <org.apache.portals.bridges.jsf-demo.version>1.0.1-dev</org.apache.portals.bridges.jsf-demo.version>
- <org.apache.portals.bridges.jsf.version>1.0.1-dev</org.apache.portals.bridges.jsf.version>
- <org.apache.portals.bridges.perl.version>1.0.1-dev</org.apache.portals.bridges.perl.version>
- <org.apache.portals.bridges.php.version>1.0.1-dev</org.apache.portals.bridges.php.version>
- <org.apache.portals.bridges.velocity.version>1.0.1-dev</org.apache.portals.bridges.velocity.version>
- <org.apache.portals.bridges.portletfilter.version>1.0.1-dev</org.apache.portals.bridges.portletfilter.version>
- <portals.bridges.struts.version>1.0.1-dev</portals.bridges.struts.version>
+ <org.apache.portals.bridges.common.version>1.0.1</org.apache.portals.bridges.common.version>
+ <org.apache.portals.bridges.frameworks.version>1.0.1</org.apache.portals.bridges.frameworks.version>
+ <org.apache.portals.bridges.jpetstore.version>1.0.1</org.apache.portals.bridges.jpetstore.version>
+ <org.apache.portals.bridges.jsf-demo.version>1.0.1</org.apache.portals.bridges.jsf-demo.version>
+ <org.apache.portals.bridges.jsf.version>1.0.1</org.apache.portals.bridges.jsf.version>
+ <org.apache.portals.bridges.perl.version>1.0.1</org.apache.portals.bridges.perl.version>
+ <org.apache.portals.bridges.php.version>1.0.1</org.apache.portals.bridges.php.version>
+ <org.apache.portals.bridges.velocity.version>1.0.1</org.apache.portals.bridges.velocity.version>
+ <org.apache.portals.bridges.portletfilter.version>1.0.1</org.apache.portals.bridges.portletfilter.version>
+ <portals.bridges.struts.version>1.0.1</portals.bridges.struts.version>
</properties>
<!-- Default Modules -->
@@ -635,7 +635,7 @@
<id>ate</id>
<email>ate@apache.org</email>
<timezone>+2</timezone>
- <organization>iWise B.V.</organization>
+ <organization>Hippo</organization>
<roles>
<role>Java Developer</role>
</roles>
Modified: portals/bridges/trunk/portletfilter/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/portletfilter/pom.xml (original)
+++ portals/bridges/trunk/portletfilter/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -65,8 +65,19 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Mon Feb 26 18:43:21 2007
@@ -58,7 +58,7 @@
jar.includes=*/project.xml
jar.excludes=
-bridges.includes=frameworks/project.xml,jsf/project.xml,perl/project.xml,perl/project.xml,php/project.xml,portletfilter/project.xml,struts/project.xml,velocity/project.xml
+bridges.includes=common/project.xml,frameworks/project.xml,jsf/project.xml,perl/project.xml,perl/project.xml,php/project.xml,portletfilter/project.xml,struts/project.xml,velocity/project.xml,mapserver/project.xml
# Bridges checkstyle and license properties
# These are use to dynamically set checkstyle and license properties also for subprojects
@@ -84,16 +84,17 @@
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
# bridges versions
-portals.bridges.version=1.0.1-dev
-portals.bridges.common.version=1.0.1-dev
-portals.bridges.frameworks.version=1.0.1-dev
-portals.bridges.jsf.version=1.0.1-dev
-portals.bridges.perl.version=1.0.1-dev
-portals.bridges.php.version=1.0.1-dev
-portals.bridges.python.version=1.0.1-dev
-portals.bridges.struts.version=1.0.1-dev
-portals.bridges.velocity.version=1.0.1-dev
-portals.bridges.portletfilter.version=1.0.1-dev
+portals.bridges.version=1.0.1
+portals.bridges.common.version=1.0.1
+portals.bridges.frameworks.version=1.0.1
+portals.bridges.jsf.version=1.0.1
+portals.bridges.perl.version=1.0.1
+portals.bridges.php.version=1.0.1
+portals.bridges.python.version=1.0.1
+portals.bridges.struts.version=1.0.1
+portals.bridges.velocity.version=1.0.1
+portals.bridges.portletfilter.version=1.0.1
+portals.bridges.mapserver.version=1.0.1
# dependency versions
commons.logging.version=1.0.4
Modified: portals/bridges/trunk/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/project.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/project.xml (original)
+++ portals/bridges/trunk/project.xml Mon Feb 26 18:43:21 2007
@@ -68,7 +68,7 @@
<id>ate</id>
<email>ate@apache.org</email>
<timezone>+2</timezone>
- <organization>iWise B.V.</organization>
+ <organization>Hippo</organization>
<roles>
<role>Java Developer</role>
</roles>
Modified: portals/bridges/trunk/struts/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/struts/pom.xml (original)
+++ portals/bridges/trunk/struts/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -83,8 +83,23 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java/META-INF/tlds/struts-${struts.version}</directory>
+ <targetPath>META-INF/tlds/struts-${struts.version}</targetPath>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/bridges/trunk/velocity/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/pom.xml?view=diff&rev=512120&r1=512119&r2=512120
==============================================================================
--- portals/bridges/trunk/velocity/pom.xml (original)
+++ portals/bridges/trunk/velocity/pom.xml Mon Feb 26 18:43:21 2007
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1-dev</version>
+ <version>1.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
@@ -60,8 +60,26 @@
<!-- Build Configuration -->
- <build/>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>META-INF/tlds/struts-1.2.7/**</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.TXT</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<!-- Project Information -->
<scm>
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org