This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 75585bc GEODE-6333: Adding the jetty-server dependency to geode-core.
(#3135)
75585bc is described below
commit 75585bcbae4f97bd76cdaf98e2a2090d88afb7ae
Author: Nabarun Nag <nabarun...@users.noreply.github.com>
AuthorDate: Wed Jan 30 12:28:16 2019 -0800
GEODE-6333: Adding the jetty-server dependency to geode-core. (#3135)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 5 +++++
extensions/geode-modules-session/build.gradle | 4 ++--
geode-assembly/src/test/resources/expected-pom.xml | 5 +++++
geode-common/src/test/resources/expected-pom.xml | 5 +++++
geode-concurrency-test/src/test/resources/expected-pom.xml | 5 +++++
geode-connectors/src/test/resources/expected-pom.xml | 5 +++++
geode-core/build.gradle | 1 +
geode-core/src/test/resources/expected-pom.xml | 10 ++++++++++
geode-cq/src/test/resources/expected-pom.xml | 5 +++++
geode-dunit/src/test/resources/expected-pom.xml | 5 +++++
geode-experimental-driver/src/test/resources/expected-pom.xml | 5 +++++
geode-json/src/test/resources/expected-pom.xml | 5 +++++
geode-junit/src/test/resources/expected-pom.xml | 5 +++++
geode-lucene/src/test/resources/expected-pom.xml | 5 +++++
geode-management/src/test/resources/expected-pom.xml | 5 +++++
geode-old-client-support/src/test/resources/expected-pom.xml | 5 +++++
geode-protobuf-messages/src/test/resources/expected-pom.xml | 7 ++++++-
geode-protobuf/src/test/resources/expected-pom.xml | 5 +++++
geode-pulse/geode-pulse-test/build.gradle | 2 +-
geode-pulse/src/test/resources/expected-pom.xml | 5 +++++
geode-rebalancer/src/test/resources/expected-pom.xml | 5 +++++
geode-wan/src/test/resources/expected-pom.xml | 5 +++++
geode-web-api/src/test/resources/expected-pom.xml | 5 +++++
geode-web-management/src/test/resources/expected-pom.xml | 5 +++++
geode-web/src/test/resources/expected-pom.xml | 5 +++++
gradle/geode-dependency-management.gradle | 1 +
26 files changed, 121 insertions(+), 4 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index d3f81a9..3b594cb 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -648,6 +648,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index b8f6e91..f72eff4 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -44,9 +44,9 @@ dependencies {
integrationTestCompile('org.apache.tomcat:jasper:' +
project.'tomcat6.version')
integrationTestCompile('org.assertj:assertj-core')
integrationTestCompile('org.eclipse.jetty:jetty-http:' +
project.'jetty.version' + ':tests')
- integrationTestCompile('org.eclipse.jetty:jetty-server:' +
project.'jetty.version')
+ integrationTestCompile('org.eclipse.jetty:jetty-server')
integrationTestCompile('org.eclipse.jetty:jetty-servlet:' +
project.'jetty.version' + ':tests')
- integrationTestCompile('org.eclipse.jetty:jetty-util:' +
project.'jetty.version')
+ integrationTestCompile('org.eclipse.jetty:jetty-util')
integrationTestCompile('org.httpunit:httpunit') {
exclude group: 'javax.servlet'
// this version of httpunit contains very outdated xercesImpl
diff --git a/geode-assembly/src/test/resources/expected-pom.xml
b/geode-assembly/src/test/resources/expected-pom.xml
index af1f45a..3649541 100644
--- a/geode-assembly/src/test/resources/expected-pom.xml
+++ b/geode-assembly/src/test/resources/expected-pom.xml
@@ -648,6 +648,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-common/src/test/resources/expected-pom.xml
b/geode-common/src/test/resources/expected-pom.xml
index 877404c..3aa1c82 100644
--- a/geode-common/src/test/resources/expected-pom.xml
+++ b/geode-common/src/test/resources/expected-pom.xml
@@ -647,6 +647,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml
b/geode-concurrency-test/src/test/resources/expected-pom.xml
index 4d1d586..5619ae9 100644
--- a/geode-concurrency-test/src/test/resources/expected-pom.xml
+++ b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -659,6 +659,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-connectors/src/test/resources/expected-pom.xml
b/geode-connectors/src/test/resources/expected-pom.xml
index dbb22a9..2bc26bd 100644
--- a/geode-connectors/src/test/resources/expected-pom.xml
+++ b/geode-connectors/src/test/resources/expected-pom.xml
@@ -721,6 +721,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 413f242..5b7f288 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -229,6 +229,7 @@ dependencies {
compile('org.eclipse.jetty:jetty-webapp') {
ext.optional = true
}
+ compile('org.eclipse.jetty:jetty-server')
compileOnly('org.springframework:spring-webmvc') {
exclude module: 'aopalliance'
exclude module: 'spring-aop'
diff --git a/geode-core/src/test/resources/expected-pom.xml
b/geode-core/src/test/resources/expected-pom.xml
index 48d7baa..a60870b 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -202,6 +202,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>compile</scope>
@@ -927,6 +932,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-cq/src/test/resources/expected-pom.xml
b/geode-cq/src/test/resources/expected-pom.xml
index 936fbc3..b0db234 100644
--- a/geode-cq/src/test/resources/expected-pom.xml
+++ b/geode-cq/src/test/resources/expected-pom.xml
@@ -659,6 +659,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-dunit/src/test/resources/expected-pom.xml
b/geode-dunit/src/test/resources/expected-pom.xml
index 8928227..e0c77c6 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -773,6 +773,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-experimental-driver/src/test/resources/expected-pom.xml
b/geode-experimental-driver/src/test/resources/expected-pom.xml
index 9b64c83..2a29546 100644
--- a/geode-experimental-driver/src/test/resources/expected-pom.xml
+++ b/geode-experimental-driver/src/test/resources/expected-pom.xml
@@ -664,6 +664,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-json/src/test/resources/expected-pom.xml
b/geode-json/src/test/resources/expected-pom.xml
index 937e117..0867884 100644
--- a/geode-json/src/test/resources/expected-pom.xml
+++ b/geode-json/src/test/resources/expected-pom.xml
@@ -647,6 +647,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-junit/src/test/resources/expected-pom.xml
b/geode-junit/src/test/resources/expected-pom.xml
index d7f0bb1..01bbceec 100644
--- a/geode-junit/src/test/resources/expected-pom.xml
+++ b/geode-junit/src/test/resources/expected-pom.xml
@@ -737,6 +737,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-lucene/src/test/resources/expected-pom.xml
b/geode-lucene/src/test/resources/expected-pom.xml
index 2ddd64d..a608bf3 100644
--- a/geode-lucene/src/test/resources/expected-pom.xml
+++ b/geode-lucene/src/test/resources/expected-pom.xml
@@ -732,6 +732,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-management/src/test/resources/expected-pom.xml
b/geode-management/src/test/resources/expected-pom.xml
index 207b8cc..1c81dd3 100644
--- a/geode-management/src/test/resources/expected-pom.xml
+++ b/geode-management/src/test/resources/expected-pom.xml
@@ -669,6 +669,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml
b/geode-old-client-support/src/test/resources/expected-pom.xml
index 3f8044b..3216d01 100644
--- a/geode-old-client-support/src/test/resources/expected-pom.xml
+++ b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -654,6 +654,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-protobuf-messages/src/test/resources/expected-pom.xml
b/geode-protobuf-messages/src/test/resources/expected-pom.xml
index b5fd2aa..9819395 100644
--- a/geode-protobuf-messages/src/test/resources/expected-pom.xml
+++ b/geode-protobuf-messages/src/test/resources/expected-pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -654,6 +654,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-protobuf/src/test/resources/expected-pom.xml
b/geode-protobuf/src/test/resources/expected-pom.xml
index 5b51e60..c935157 100644
--- a/geode-protobuf/src/test/resources/expected-pom.xml
+++ b/geode-protobuf/src/test/resources/expected-pom.xml
@@ -679,6 +679,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-pulse/geode-pulse-test/build.gradle
b/geode-pulse/geode-pulse-test/build.gradle
index 463a04c..203feec 100644
--- a/geode-pulse/geode-pulse-test/build.gradle
+++ b/geode-pulse/geode-pulse-test/build.gradle
@@ -22,7 +22,7 @@ apply from:
"${project.projectDir}/../../gradle/geode-dependency-management.grad
dependencies {
compile('org.awaitility:awaitility')
compile('junit:junit')
- compile('org.eclipse.jetty:jetty-server:' + project.'jetty.version')
+ compile('org.eclipse.jetty:jetty-server')
compile('commons-io:commons-io')
compile('org.apache.commons:commons-lang3')
compile('mx4j:mx4j')
diff --git a/geode-pulse/src/test/resources/expected-pom.xml
b/geode-pulse/src/test/resources/expected-pom.xml
index 6ab740d..323a0d8 100644
--- a/geode-pulse/src/test/resources/expected-pom.xml
+++ b/geode-pulse/src/test/resources/expected-pom.xml
@@ -837,6 +837,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml
b/geode-rebalancer/src/test/resources/expected-pom.xml
index 843dabf..b44413a 100644
--- a/geode-rebalancer/src/test/resources/expected-pom.xml
+++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -683,6 +683,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-wan/src/test/resources/expected-pom.xml
b/geode-wan/src/test/resources/expected-pom.xml
index 5e52d58..b92e050 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -654,6 +654,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-web-api/src/test/resources/expected-pom.xml
b/geode-web-api/src/test/resources/expected-pom.xml
index c1e43ef..f329a7f 100644
--- a/geode-web-api/src/test/resources/expected-pom.xml
+++ b/geode-web-api/src/test/resources/expected-pom.xml
@@ -798,6 +798,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-web-management/src/test/resources/expected-pom.xml
b/geode-web-management/src/test/resources/expected-pom.xml
index cfa9c57..46731e9 100644
--- a/geode-web-management/src/test/resources/expected-pom.xml
+++ b/geode-web-management/src/test/resources/expected-pom.xml
@@ -798,6 +798,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/geode-web/src/test/resources/expected-pom.xml
b/geode-web/src/test/resources/expected-pom.xml
index 25617f2..223969e 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -717,6 +717,11 @@
<version>0.4</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
diff --git a/gradle/geode-dependency-management.gradle
b/gradle/geode-dependency-management.gradle
index b92eb08..8c03715 100644
--- a/gradle/geode-dependency-management.gradle
+++ b/gradle/geode-dependency-management.gradle
@@ -164,6 +164,7 @@ class GeodeDependencyManagementPlugin implements
Plugin<Project> {
dependency(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version:
'1.60')
dependency(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar',
version: '1.6.10')
dependency(group: 'org.eclipse.jetty', name: 'jetty-webapp', version:
project.'jetty.version')
+ dependency(group: 'org.eclipse.jetty', name: 'jetty-server', version:
project.'jetty.version')
dependency(group: 'org.eclipse.persistence', name:
'javax.persistence', version: '2.2.1')
dependency(group: 'org.fusesource.jansi', name: 'jansi', version:
'1.17.1')
dependencySet(group: 'org.hamcrest', version: '1.3') {
