Revert "JAMES-2481 Upgrade Javax HTTP related APIs" This reverts commit 622c540e5a32d1d7978f8fe41d05d5242347084e.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/04d243c0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/04d243c0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/04d243c0 Branch: refs/heads/master Commit: 04d243c0da3ffccaabaacc555c90931814e1115e Parents: 8598891 Author: Matthieu Baechler <matth...@apache.org> Authored: Mon Jul 30 08:26:24 2018 +0200 Committer: benwa <btell...@linagora.com> Committed: Mon Jul 30 18:22:27 2018 +0700 ---------------------------------------------------------------------- pom.xml | 12 +++++++++++- server/protocols/webadmin/webadmin-core/pom.xml | 7 +------ 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/04d243c0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e305604..13e4d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -604,6 +604,7 @@ <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version> <geronimo-javamail.version>1.8.3</geronimo-javamail.version> <slf4j.version>1.7.25</slf4j.version> + <servlet-api.version>2.4</servlet-api.version> <commons-logging.version>1.1.1</commons-logging.version> <dnsjava.version>2.1.1</dnsjava.version> @@ -1827,6 +1828,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1902,7 +1907,12 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.1</version> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet-api.version}</version> </dependency> <dependency> <groupId>jmock</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/04d243c0/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 45edf66..b94ba11 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -101,14 +101,9 @@ <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.1</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>junit</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
