You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/07/26 07:02:45 UTC
[27/27] james-project git commit: JAMES-2481 Upgrade Javax HTTP
related APIs
JAMES-2481 Upgrade Javax HTTP related APIs
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/622c540e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/622c540e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/622c540e
Branch: refs/heads/master
Commit: 622c540e5a32d1d7978f8fe41d05d5242347084e
Parents: 1cce562
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 13:29:12 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Jul 26 13:51:07 2018 +0700
----------------------------------------------------------------------
pom.xml | 12 +-----------
server/protocols/webadmin/webadmin-core/pom.xml | 7 ++++++-
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/622c540e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 76219a9..daea437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,7 +604,6 @@
<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>
@@ -1785,10 +1784,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1864,12 +1859,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>jmock</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/622c540e/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 b94ba11..45edf66 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -101,9 +101,14 @@
<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.0.1</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org