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/15 13:32:40 UTC
svn commit: r997286 - in /mina/trunk: ./ 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/ mina-transport-se...
Author: elecharny
Date: Wed Sep 15 11:32:40 2010
New Revision: 997286
URL: http://svn.apache.org/viewvc?rev=997286&view=rev
Log:
reverted back tro 2.0.0-RC2, once more ...
Modified:
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
Modified: mina/trunk/mina-core/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-core/pom.xml?rev=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-core/pom.xml (original)
+++ mina/trunk/mina-core/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-example/pom.xml (original)
+++ mina/trunk/mina-example/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-filter-compression/pom.xml (original)
+++ mina/trunk/mina-filter-compression/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-integration-beans/pom.xml (original)
+++ mina/trunk/mina-integration-beans/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-integration-jmx/pom.xml (original)
+++ mina/trunk/mina-integration-jmx/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-integration-ognl/pom.xml (original)
+++ mina/trunk/mina-integration-ognl/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-integration-xbean/pom.xml (original)
+++ mina/trunk/mina-integration-xbean/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-legal/pom.xml (original)
+++ mina/trunk/mina-legal/pom.xml Wed Sep 15 11:32:40 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>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${version.maven.plugin.api}</version>
+ <version>${version.api.plugin}</version>
<optional>true</optional>
</dependency>
Modified: mina/trunk/mina-statemachine/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-statemachine/pom.xml?rev=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-statemachine/pom.xml (original)
+++ mina/trunk/mina-statemachine/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-transport-apr/pom.xml (original)
+++ mina/trunk/mina-transport-apr/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/mina-transport-serial/pom.xml (original)
+++ mina/trunk/mina-transport-serial/pom.xml Wed Sep 15 11:32:40 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=997286&r1=997285&r2=997286&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Wed Sep 15 11:32:40 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>
@@ -85,9 +85,13 @@
<version.clean.plugin>2.3</version.clean.plugin>
<version.compiler.plugin>2.1</version.compiler.plugin>
<version.deploy.plugin>2.5</version.deploy.plugin>
+ <version.gpg.plugin>1.1</version.gpg.plugin>
<version.jar.plugin>2.3</version.jar.plugin>
<version.javadoc.plugin>2.6.1</version.javadoc.plugin>
<version.jxr.plugin>2.1</version.jxr.plugin>
+ <version.api.plugin>2.2.1</version.api.plugin>
+ <version.project>2.2.1</version.project>
+ <version.model>2.2.1</version.model>
<version.rat.maven.plugin>1.0-alpha-3</version.rat.maven.plugin>
<version.release.plugin>2.0</version.release.plugin>
<version.remote.resources.plugin>1.1</version.remote.resources.plugin>
@@ -96,10 +100,6 @@
<version.shade.plugin>1.3</version.shade.plugin>
<version.surefire.plugin>2.4.3</version.surefire.plugin>
- <version.maven.plugin.api>2.2.1</version.maven.plugin.api>
- <version.maven.project>2.2.1</version.maven.project>
- <version.maven.model>2.2.1</version.maven.model>
-
<!-- Jars -->
<version.commons.lang>2.5</version.commons.lang>
<version.easymock>2.5.2</version.easymock>
@@ -366,6 +366,7 @@
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
+ <exclude>./distribution/**</exclude>
</configuration>
<executions>
<execution>
@@ -383,12 +384,16 @@
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
+ <exclude>./distribution/**</exclude>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <exclude>./distribution/**</exclude>
+ </configuration>
<executions>
<execution>
<id>attach-sources</id>
@@ -402,8 +407,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${version.javadoc.plugin}</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
+ <exclude>./distribution/**</exclude>
</configuration>
<executions>
<execution>
@@ -415,44 +422,6 @@
</executions>
</plugin>
- <!-- Creates the packages -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <executions>
-
- <!-- Creates the sources package -->
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
-
- <!-- Creates the binaries package -->
- <execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
</profile>