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.

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

GEODE-3: add lib jars that will be missing in jdk9 and later #2469

Merged
merged 2 commits into from
Sep 14, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 0 deletions geode-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ def cp = {
it.contains('jackson-core') ||
it.contains('jackson-databind') ||
it.contains('jansi') ||
it.contains('activation') ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep these in alphabetical order.

it.contains('jaxb') ||
it.contains('javax.resource-api') ||
it.contains('javax.servlet-api') ||
it.contains('javax.transaction-api') ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ javadoc/script.js
javadoc/serialized-form.html
javadoc/stylesheet.css
lib/HikariCP-3.2.0.jar
lib/activation-1.1.jar
lib/activation-1.1.1.jar
lib/antlr-2.7.7.jar
lib/classgraph-4.0.6.jar
lib/commons-beanutils-1.9.3.jar
Expand Down Expand Up @@ -1193,6 +1193,9 @@ lib/javax.mail-api-1.6.1.jar
lib/javax.resource-api-1.7.jar
lib/javax.servlet-api-3.1.0.jar
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
HikariCP-3.2.0.jar
activation-1.1.1.jar
antlr-2.7.7.jar
classgraph-4.0.6.jar
commons-beanutils-1.9.3.jar
Expand All @@ -20,6 +21,9 @@ geode-protobuf-1.8.0-SNAPSHOT.jar
geode-protobuf-messages-1.8.0-SNAPSHOT.jar
geode-rebalancer-1.8.0-SNAPSHOT.jar
geode-wan-1.8.0-SNAPSHOT.jar
jaxb-api-2.2.11.jar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add alphabetically

jaxb-core-2.2.11.jar
jaxb-impl-2.2.11.jar
jackson-annotations-2.9.6.jar
jackson-core-2.9.6.jar
jackson-databind-2.9.6.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ javax.mail-api
javax.resource-api
javax.servlet-api
javax.transaction-api
jaxb-api
jaxb-core
jaxb-impl
jetty-http
jetty-io
jetty-security
Expand Down
4 changes: 4 additions & 0 deletions geode-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ dependencies {
compile 'commons-io:commons-io:' + project.'commons-io.version'
compile 'commons-validator:commons-validator:' + project.'commons-validator.version'
compile 'commons-digester:commons-digester:' + project.'commons-digester.version'
compile 'javax.activation:activation:' + project.'javax-activation.version'
compile 'javax.xml.bind:jaxb-api:' + project.'jaxb.version'
compile 'com.sun.xml.bind:jaxb-core:' + project.'jaxb.version'
compile 'com.sun.xml.bind:jaxb-impl:' + project.'jaxb.version'

compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
compile('commons-modeler:commons-modeler:' + project.'commons-modeler.version') {
Expand Down
24 changes: 24 additions & 0 deletions geode-core/src/test/resources/expected-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,30 @@
<version>2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.2.11</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.11</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions gradle/dependency-versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ javax.resource-api.version = 1.7
javax.servlet-api.version = 3.1.0
javax.transaction-api.version = 1.2
jedis.version = 2.9.0
jaxb.version = 2.2.11
javax-activation.version = 1.1.1
# 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
Expand Down