Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-5820: upgrade jetty to fix jetty tests in java10 #2567

Merged
merged 4 commits into from
Oct 5, 2018
Merged

GEODE-5820: upgrade jetty to fix jetty tests in java10 #2567

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82d65e8
GEODE-5820: upgrade jetty to fix jetty tests in java10
jinmeiliao Oct 4, 2018
2bcd1bf
update assembly contents
jinmeiliao Oct 4, 2018
2f76687
empty
jinmeiliao Oct 5, 2018
f95635c
open internal modules for jdk 9 and above
jinmeiliao Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mbly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
private static final String JETTY_VERSION = "9.4.8.v20171121";
private static final String JETTY_VERSION = "9.4.12.v20180830";

/**
* Get the version number, download URL, and container name of a generic app server using
Expand Down
16 changes: 8 additions & 8 deletions geode-assembly/src/integrationTest/resources/assembly_content.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,14 +1196,14 @@ lib/javax.transaction-api-1.2.jar
lib/jaxb-api-2.2.11.jar
lib/jaxb-core-2.2.11.jar
lib/jaxb-impl-2.2.11.jar
lib/jetty-http-9.4.8.v20171121.jar
lib/jetty-io-9.4.8.v20171121.jar
lib/jetty-security-9.4.8.v20171121.jar
lib/jetty-server-9.4.8.v20171121.jar
lib/jetty-servlet-9.4.8.v20171121.jar
lib/jetty-util-9.4.8.v20171121.jar
lib/jetty-webapp-9.4.8.v20171121.jar
lib/jetty-xml-9.4.8.v20171121.jar
lib/jetty-http-9.4.12.v20180830.jar
lib/jetty-io-9.4.12.v20180830.jar
lib/jetty-security-9.4.12.v20180830.jar
lib/jetty-server-9.4.12.v20180830.jar
lib/jetty-servlet-9.4.12.v20180830.jar
lib/jetty-util-9.4.12.v20180830.jar
lib/jetty-webapp-9.4.12.v20180830.jar
lib/jetty-xml-9.4.12.v20180830.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-4.1.0.jar
Expand Down
16 changes: 8 additions & 8 deletions geode-assembly/src/integrationTest/resources/dependency_classpath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ javax.transaction-api-1.2.jar
jaxb-api-2.2.11.jar
jaxb-core-2.2.11.jar
jaxb-impl-2.2.11.jar
jetty-http-9.4.8.v20171121.jar
jetty-io-9.4.8.v20171121.jar
jetty-security-9.4.8.v20171121.jar
jetty-server-9.4.8.v20171121.jar
jetty-servlet-9.4.8.v20171121.jar
jetty-util-9.4.8.v20171121.jar
jetty-webapp-9.4.8.v20171121.jar
jetty-xml-9.4.8.v20171121.jar
jetty-http-9.4.12.v20180830.jar
jetty-io-9.4.12.v20180830.jar
jetty-security-9.4.12.v20180830.jar
jetty-server-9.4.12.v20180830.jar
jetty-servlet-9.4.12.v20180830.jar
jetty-util-9.4.12.v20180830.jar
jetty-webapp-9.4.12.v20180830.jar
jetty-xml-9.4.12.v20180830.jar
jgroups-3.6.14.Final.jar
jline-2.12.jar
jna-4.1.0.jar
Expand Down
2 changes: 1 addition & 1 deletion geode-core/src/test/resources/expected-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.8.v20171121</version>
<version>9.4.12.v20180830</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ javax-activation.version = 1.1.1
javax-annotation.version = 1.3.2
# The jetty version is also hard-coded in geode-assembly:test
# at o.a.g.sessions.tests.GenericAppServerInstall.java
jetty.version = 9.4.8.v20171121
jetty.version = 9.4.12.v20180830
jgroups.version = 3.6.14.Final
jna.version = 4.1.0
jopt-simple.version = 5.0.4
Expand Down