Repository: mina Updated Branches: refs/heads/2.0 965d9b76a -> a58a925a1
Removed the reference to easymock classextension (https://github.com/apache/mina/pull/6) Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a58a925a Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a58a925a Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a58a925a Branch: refs/heads/2.0 Commit: a58a925a12788bad8c07a241d4d26b9238862e20 Parents: 965d9b7 Author: Emmanuel Lécharny <[email protected]> Authored: Mon Oct 5 17:18:53 2015 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Mon Oct 5 17:18:53 2015 +0200 ---------------------------------------------------------------------- mina-core/pom.xml | 221 +++++++++---------- .../stream/AbstractStreamWriteFilterTest.java | 2 +- pom.xml | 8 - 3 files changed, 109 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/a58a925a/mina-core/pom.xml ---------------------------------------------------------------------- diff --git a/mina-core/pom.xml b/mina-core/pom.xml index 42fb880..03ec79c 100644 --- a/mina-core/pom.xml +++ b/mina-core/pom.xml @@ -1,113 +1,108 @@ -<?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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mina</groupId> - <artifactId>mina-parent</artifactId> - <version>2.0.10-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> - - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</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=${version.slf4j.api} - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> - +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mina</groupId> + <artifactId>mina-parent</artifactId> + <version>2.0.10-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=${version.slf4j.api} + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> + http://git-wip-us.apache.org/repos/asf/mina/blob/a58a925a/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java b/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java index 683f94e..2c28d9d 100644 --- a/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java +++ b/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java @@ -47,7 +47,7 @@ import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.apache.mina.transport.socket.nio.NioSocketConnector; import org.apache.mina.util.AvailablePortFinder; import org.easymock.IArgumentMatcher; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/mina/blob/a58a925a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4630110..a056613 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,6 @@ <!-- Jars --> <version.commons.lang>2.6</version.commons.lang> <version.easymock>2.5.2</version.easymock> - <version.easymockclassextension>2.5.2</version.easymockclassextension> <version.jboss.javassist>3.7.ga</version.jboss.javassist> <version.jdom>1.0</version.jdom> <version.jmock>1.2.0</version.jmock> @@ -348,13 +347,6 @@ </dependency> <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>${version.easymockclassextension}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.agical.rmock</groupId> <artifactId>rmock</artifactId> <version>${version.rmock}</version>
