Updated Branches:
refs/heads/trunk 2422d3313 -> 685324af0
Revert "[maven-release-plugin] prepare release 3.0.0-M1"
This reverts commit b06d2f405501c912db65f3c10d2743805ceee136.
Conflicts:
coap/pom.xml
codec/pom.xml
core/pom.xml
distribution/pom.xml
examples/pom.xml
http/pom.xml
pom.xml
protobuf/pom.xml
thrift/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/685324af
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/685324af
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/685324af
Branch: refs/heads/trunk
Commit: 685324af05c906a57f500dc9cf26acbc4bffab33
Parents: 2422d33
Author: Julien Vermillard <[email protected]>
Authored: Tue Jul 9 15:43:12 2013 +0200
Committer: Julien Vermillard <[email protected]>
Committed: Tue Jul 9 15:43:12 2013 +0200
----------------------------------------------------------------------
coap/pom.xml | 2 +-
codec/pom.xml | 5 +++--
core/pom.xml | 5 +++--
distribution/pom.xml | 2 +-
examples/pom.xml | 2 +-
http/pom.xml | 2 +-
pom.xml | 2 +-
protobuf/pom.xml | 5 +++--
thrift/pom.xml | 5 +++--
9 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/coap/pom.xml
----------------------------------------------------------------------
diff --git a/coap/pom.xml b/coap/pom.xml
index bc39cea..adecb57 100644
--- a/coap/pom.xml
+++ b/coap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-coap</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/codec/pom.xml
----------------------------------------------------------------------
diff --git a/codec/pom.xml b/codec/pom.xml
index d79de40..ae04210 100644
--- a/codec/pom.xml
+++ b/codec/pom.xml
@@ -18,12 +18,13 @@
under the License.
-->
-<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";>
+<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>
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-codec</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 060e4fc..a603c08 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,12 +18,13 @@
under the License.
-->
-<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";>
+<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>
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2979c32..7dfdbb4 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 9d98934..c5519cc 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/http/pom.xml
----------------------------------------------------------------------
diff --git a/http/pom.xml b/http/pom.xml
index 19e2d04..51141dd 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-http</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba02d22..53d8cc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA ${project.version}</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index b58165f..0c025c3 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -18,12 +18,13 @@
under the License.
-->
-<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";>
+<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>
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-protobuf</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/685324af/thrift/pom.xml
----------------------------------------------------------------------
diff --git a/thrift/pom.xml b/thrift/pom.xml
index a424384..17b522c 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -19,12 +19,13 @@
under the License.
-->
-<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";>
+<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>
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>3.0.0-M2-SNAPSHOT</version>
+ <version>3.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-thrift</artifactId>
