You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2010/09/14 15:09:18 UTC
svn commit: r996881 - in /mina/trunk: ./ distribution/ mina-core/
mina-example/ mina-filter-compression/ mina-integration-beans/
mina-integration-jmx/ mina-integration-ognl/ mina-integration-xbean/
mina-legal/ mina-statemachine/ mina-transport-apr/ min...
Author: elecharny
Date: Tue Sep 14 13:09:17 2010
New Revision: 996881
URL: http://svn.apache.org/viewvc?rev=996881&view=rev
Log:
reverted the trunk to 2.0.0-RC2-SNAPSHOT, as the vote for 2.0.0 has been cancelled. Fixed the distribution to generate 2 packages, one for the bin, one for the src. Fixed the problem with the build when -Pserial is not used : it now builds again. The serial module is not anymore included into the dist package
Added:
mina/trunk/distribution/bin.xml
mina/trunk/distribution/src.xml
Removed:
mina/trunk/distribution/release.xml
Modified:
mina/trunk/distribution/pom.xml
mina/trunk/mina-core/pom.xml
mina/trunk/mina-example/pom.xml
mina/trunk/mina-filter-compression/pom.xml
mina/trunk/mina-integration-beans/pom.xml
mina/trunk/mina-integration-jmx/pom.xml
mina/trunk/mina-integration-ognl/pom.xml
mina/trunk/mina-integration-xbean/pom.xml
mina/trunk/mina-legal/pom.xml
mina/trunk/mina-statemachine/pom.xml
mina/trunk/mina-transport-apr/pom.xml
mina/trunk/mina-transport-serial/pom.xml
mina/trunk/pom.xml
Added: mina/trunk/distribution/bin.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/bin.xml?rev=996881&view=auto
==============================================================================
--- mina/trunk/distribution/bin.xml (added)
+++ mina/trunk/distribution/bin.xml Tue Sep 14 13:09:17 2010
@@ -0,0 +1,83 @@
+<?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>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <!-- Copy licenses into '/' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy Javadoc into '/docs' -->
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>apidocs*/**</include>
+ <include>xref*/**</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+ <!-- Copy Mina modules into '/dist' -->
+ <dependencySet>
+ <outputDirectory>dist</outputDirectory>
+ <includes>
+ <!-- Including only Mina modules -->
+ <include>${project.groupId}:*</include>
+ </includes>
+ <excludes>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ <exclude>${project.groupId}:mina-transport-serial</exclude>
+ </excludes>
+ </dependencySet>
+
+ <!-- Copy Mina dependencies into '/lib' -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <!-- Excluding Mina modules -->
+ <exclude>${project.groupId}:*</exclude>
+ <exclude>${project.groupId}:mina-transport-serial</exclude>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ <!-- Explicitely excluding RXTX jars -->
+ <exclude>org.rxtx:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: mina/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/distribution/pom.xml (original)
+++ mina/trunk/distribution/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
@@ -43,14 +43,27 @@
<version>2.2-beta-2</version>
<executions>
<execution>
- <id>release</id>
+ <id>src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>release.xml</descriptor>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Added: mina/trunk/distribution/src.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/src.xml?rev=996881&view=auto
==============================================================================
--- mina/trunk/distribution/src.xml (added)
+++ mina/trunk/distribution/src.xml Tue Sep 14 13:09:17 2010
@@ -0,0 +1,79 @@
+<?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>
+ <!-- Copy licenses into '/' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy Javadoc into '/docs' -->
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>apidocs*/**</include>
+ <include>xref*/**</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy sources into '/src' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>KEYS</exclude>
+ <exclude>LICENSE*.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/*.gen</exclude>
+ <exclude>**/.wtpmodules</exclude>
+ <exclude>**/surefire*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>**/velocity.log</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Modified: mina/trunk/mina-core/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-core/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-core/pom.xml (original)
+++ mina/trunk/mina-core/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
Modified: mina/trunk/mina-example/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-example/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-example/pom.xml (original)
+++ mina/trunk/mina-example/pom.xml Tue Sep 14 13:09:17 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
Modified: mina/trunk/mina-filter-compression/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-filter-compression/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-filter-compression/pom.xml (original)
+++ mina/trunk/mina-filter-compression/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
Modified: mina/trunk/mina-integration-beans/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-beans/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-integration-beans/pom.xml (original)
+++ mina/trunk/mina-integration-beans/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
Modified: mina/trunk/mina-integration-jmx/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-jmx/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-integration-jmx/pom.xml (original)
+++ mina/trunk/mina-integration-jmx/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
Modified: mina/trunk/mina-integration-ognl/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-ognl/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-integration-ognl/pom.xml (original)
+++ mina/trunk/mina-integration-ognl/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
Modified: mina/trunk/mina-integration-xbean/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-xbean/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-integration-xbean/pom.xml (original)
+++ mina/trunk/mina-integration-xbean/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: mina/trunk/mina-legal/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-legal/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-legal/pom.xml (original)
+++ mina/trunk/mina-legal/pom.xml Tue Sep 14 13:09:17 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
Modified: mina/trunk/mina-statemachine/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-statemachine/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-statemachine/pom.xml (original)
+++ mina/trunk/mina-statemachine/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
Modified: mina/trunk/mina-transport-apr/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-transport-apr/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-transport-apr/pom.xml (original)
+++ mina/trunk/mina-transport-apr/pom.xml Tue Sep 14 13:09:17 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
Modified: mina/trunk/mina-transport-serial/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-transport-serial/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/mina-transport-serial/pom.xml (original)
+++ mina/trunk/mina-transport-serial/pom.xml Tue Sep 14 13:09:17 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=996881&r1=996880&r2=996881&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Tue Sep 14 13:09:17 2010
@@ -33,7 +33,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
@@ -131,9 +131,6 @@
<module>mina-integration-ognl</module>
<module>mina-integration-jmx</module>
<module>mina-example</module>
-
- <!-- This module *must* be the last one -->
- <module>distribution</module>
</modules>
<dependencyManagement>
@@ -361,14 +358,10 @@
<profile>
<id>distribution</id>
- <activation>
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <modules>
- <module>distribution</module>
- </modules>
+ <modules>
+ <module>mina-transport-serial</module>
+ <module>distribution</module>
+ </modules>
</profile>
</profiles>