This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new c37d64b30 Revert the 2.0.27 tag
c37d64b30 is described below
commit c37d64b305000ce8e699a480e67bd2bee7ec691e
Author: emmanuel lecharny <[email protected]>
AuthorDate: Sat Sep 28 15:03:14 2024 +0200
Revert the 2.0.27 tag
---
distribution/pom.xml | 2 +-
mina-core/pom.xml | 2 +-
mina-core/pom.xml.next | 108 ---------------------
mina-core/pom.xml.releaseBackup | 108 ---------------------
mina-core/pom.xml.tag | 108 ---------------------
.../org/apache/mina/core/buffer/MacronTest.java | 2 -
mina-example/pom.xml | 2 +-
mina-filter-compression/pom.xml | 2 +-
mina-http/pom.xml | 2 +-
mina-integration-beans/pom.xml | 2 +-
mina-integration-jmx/pom.xml | 2 +-
mina-integration-jmx/pom.xml.next | 91 -----------------
mina-integration-jmx/pom.xml.releaseBackup | 91 -----------------
mina-integration-jmx/pom.xml.tag | 91 -----------------
mina-integration-ognl/pom.xml | 2 +-
mina-integration-xbean/pom.xml | 2 +-
mina-legal/pom.xml | 2 +-
mina-statemachine/pom.xml | 2 +-
mina-transport-apr/pom.xml | 2 +-
mina-transport-serial/pom.xml | 2 +-
pom.xml | 2 +-
21 files changed, 14 insertions(+), 613 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a3ad89a77..9d8d2f5fb 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index 2c22aa08e..f94bc2efa 100644
--- a/mina-core/pom.xml
+++ b/mina-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
diff --git a/mina-core/pom.xml.next b/mina-core/pom.xml.next
deleted file mode 100644
index 2c22aa08e..000000000
--- a/mina-core/pom.xml.next
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
- </parent>
-
- <artifactId>mina-core</artifactId>
- <name>Apache MINA Core</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
- <Export-Package>
- org.apache.mina.core;version=${project.version};-noimport:=true,
-
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.core.file;version=${project.version};-noimport:=true,
-
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
-
org.apache.mina.core.future;version=${project.version};-noimport:=true,
-
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
-
org.apache.mina.core.service;version=${project.version};-noimport:=true,
-
org.apache.mina.core.session;version=${project.version};-noimport:=true,
-
org.apache.mina.core.write;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
- org.apache.mina.proxy;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
- org.apache.mina.util;version=${project.version};-noimport:=true,
-
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
-
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/mina-core/pom.xml.releaseBackup b/mina-core/pom.xml.releaseBackup
deleted file mode 100644
index f94bc2efa..000000000
--- a/mina-core/pom.xml.releaseBackup
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.26-SNAPSHOT</version>
- </parent>
-
- <artifactId>mina-core</artifactId>
- <name>Apache MINA Core</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
- <Export-Package>
- org.apache.mina.core;version=${project.version};-noimport:=true,
-
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.core.file;version=${project.version};-noimport:=true,
-
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
-
org.apache.mina.core.future;version=${project.version};-noimport:=true,
-
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
-
org.apache.mina.core.service;version=${project.version};-noimport:=true,
-
org.apache.mina.core.session;version=${project.version};-noimport:=true,
-
org.apache.mina.core.write;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
- org.apache.mina.proxy;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
- org.apache.mina.util;version=${project.version};-noimport:=true,
-
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
-
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/mina-core/pom.xml.tag b/mina-core/pom.xml.tag
deleted file mode 100644
index 8100cde85..000000000
--- a/mina-core/pom.xml.tag
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.26</version>
- </parent>
-
- <artifactId>mina-core</artifactId>
- <name>Apache MINA Core</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
- <Export-Package>
- org.apache.mina.core;version=${project.version};-noimport:=true,
-
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.core.file;version=${project.version};-noimport:=true,
-
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
-
org.apache.mina.core.future;version=${project.version};-noimport:=true,
-
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
-
org.apache.mina.core.service;version=${project.version};-noimport:=true,
-
org.apache.mina.core.session;version=${project.version};-noimport:=true,
-
org.apache.mina.core.write;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
-
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
-
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
- org.apache.mina.proxy;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
-
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
-
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
- org.apache.mina.util;version=${project.version};-noimport:=true,
-
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
-
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git
a/mina-core/src/test/java/org/apache/mina/core/buffer/MacronTest.java
b/mina-core/src/test/java/org/apache/mina/core/buffer/MacronTest.java
index e49d7e838..2a5cc134e 100644
--- a/mina-core/src/test/java/org/apache/mina/core/buffer/MacronTest.java
+++ b/mina-core/src/test/java/org/apache/mina/core/buffer/MacronTest.java
@@ -31,8 +31,6 @@ public class MacronTest {
/**
* Based on
mina-core\src\test\java\org\apache\mina\core\buffer\IoBufferTest.testGetString(CharsetDecoder)
* in branch 2.1.X
- *
- * @throws CharacterCodingException
*/
@Test
public void testMacron() throws CharacterCodingException {
diff --git a/mina-example/pom.xml b/mina-example/pom.xml
index c965067e4..a53fcd1cc 100644
--- a/mina-example/pom.xml
+++ b/mina-example/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index 57568fe96..3511ae7f3 100644
--- a/mina-filter-compression/pom.xml
+++ b/mina-filter-compression/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index 17315d185..e3961ca30 100644
--- a/mina-http/pom.xml
+++ b/mina-http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-http</artifactId>
diff --git a/mina-integration-beans/pom.xml b/mina-integration-beans/pom.xml
index cd0f6b396..03360775f 100644
--- a/mina-integration-beans/pom.xml
+++ b/mina-integration-beans/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index 1357149c9..eef6f1f72 100644
--- a/mina-integration-jmx/pom.xml
+++ b/mina-integration-jmx/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
diff --git a/mina-integration-jmx/pom.xml.next
b/mina-integration-jmx/pom.xml.next
deleted file mode 100644
index 1357149c9..000000000
--- a/mina-integration-jmx/pom.xml.next
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
- </parent>
-
- <artifactId>mina-integration-jmx</artifactId>
- <name>Apache MINA JMX Integration</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-ognl</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
- <Export-Package>
-
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
- ognl;version=${version.ognl},
- org.apache.mina.core.filterchain;version=${project.version},
- org.apache.mina.core.service;version=${project.version},
- org.apache.mina.core.session;version=${project.version},
- org.apache.mina.filter.executor;version=${project.version},
- org.apache.mina.integration.beans;version=${project.version},
- org.apache.mina.integration.ognl;version=${project.version},
- org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/mina-integration-jmx/pom.xml.releaseBackup
b/mina-integration-jmx/pom.xml.releaseBackup
deleted file mode 100644
index eef6f1f72..000000000
--- a/mina-integration-jmx/pom.xml.releaseBackup
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.26-SNAPSHOT</version>
- </parent>
-
- <artifactId>mina-integration-jmx</artifactId>
- <name>Apache MINA JMX Integration</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-ognl</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
- <Export-Package>
-
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
- ognl;version=${version.ognl},
- org.apache.mina.core.filterchain;version=${project.version},
- org.apache.mina.core.service;version=${project.version},
- org.apache.mina.core.session;version=${project.version},
- org.apache.mina.filter.executor;version=${project.version},
- org.apache.mina.integration.beans;version=${project.version},
- org.apache.mina.integration.ognl;version=${project.version},
- org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/mina-integration-jmx/pom.xml.tag b/mina-integration-jmx/pom.xml.tag
deleted file mode 100644
index 6d48f1457..000000000
--- a/mina-integration-jmx/pom.xml.tag
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-parent</artifactId>
- <version>2.0.26</version>
- </parent>
-
- <artifactId>mina-integration-jmx</artifactId>
- <name>Apache MINA JMX Integration</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-core</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-beans</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mina-integration-ognl</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
- <Export-Package>
-
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
- </Export-Package>
- <Import-Package>
- ognl;version=${version.ognl},
- org.apache.mina.core.filterchain;version=${project.version},
- org.apache.mina.core.service;version=${project.version},
- org.apache.mina.core.session;version=${project.version},
- org.apache.mina.filter.executor;version=${project.version},
- org.apache.mina.integration.beans;version=${project.version},
- org.apache.mina.integration.ognl;version=${project.version},
- org.slf4j;version=${osgi-min-version.slf4j.api}
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/mina-integration-ognl/pom.xml b/mina-integration-ognl/pom.xml
index 0e1a2b2a2..6cbf923ba 100644
--- a/mina-integration-ognl/pom.xml
+++ b/mina-integration-ognl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 0c6a19b74..5b98f5a21 100644
--- a/mina-integration-xbean/pom.xml
+++ b/mina-integration-xbean/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-xbean</artifactId>
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index 16daf82d7..4767c7287 100644
--- a/mina-legal/pom.xml
+++ b/mina-legal/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index ceaacade7..a09adcb35 100644
--- a/mina-statemachine/pom.xml
+++ b/mina-statemachine/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index a228a5cf7..f2f0cd810 100644
--- a/mina-transport-apr/pom.xml
+++ b/mina-transport-apr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index 232d38066..a8491ecf9 100644
--- a/mina-transport-serial/pom.xml
+++ b/mina-transport-serial/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
diff --git a/pom.xml b/pom.xml
index adb2abf1e..974f0770c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.27-SNAPSHOT</version>
+ <version>2.0.26-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
