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

[AD-189] Load work-around JAR files from branch in Janino forked repository. #3

Merged
merged 8 commits into from
Jun 16, 2021
Merged
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ shadowJar {
exclude 'org/apache/calcite/avatica/remote/Driver*'
exclude 'org/apache/commons/dbcp2/PoolingDriver*'

// NOTE: Patched versions of janino and commons-compiler are being added in resources
dependencies {
exclude(dependency('org.codehaus.janino::'))
}
// Relocate (shadow) the following packages.
relocate 'org.apache.calcite', 'org.apache.calcite.shadow'
relocate 'com.google.guava', 'com.google.guava.shadow'
Expand Down Expand Up @@ -232,6 +228,9 @@ license {
}

repositories {
maven {
url 'https://raw.githubusercontent.com/birschick-bq/janino/brucei/ad-189/maven'
birschick-bq marked this conversation as resolved.
Show resolved Hide resolved
}
mavenCentral()
}

Expand All @@ -242,7 +241,6 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.1'
implementation group: 'com.google.guava', name: 'guava', version: '29.0-jre'
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
implementation group: 'org.apache.calcite', name: 'calcite-core', version: '1.26.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.1.1'
Expand Down
4 changes: 4 additions & 0 deletions calcite-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ license {
}

repositories {
maven {
url 'https://raw.githubusercontent.com/birschick-bq/janino/brucei/ad-189/maven'
}
mavenCentral()
}

Expand All @@ -200,6 +203,7 @@ dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
implementation group: 'org.apache.calcite', name: 'calcite-core', version: '1.26.0'
implementation group: 'org.codehaus.janino', name: 'commons-compiler', version: '3.0.17'
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.1.1'

compileOnly 'org.projectlombok:lombok:1.18.16'
Expand Down
1 change: 0 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.1'
implementation group: 'com.google.guava', name: 'guava', version: '29.0-jre'
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
implementation group: 'org.apache.calcite', name: 'calcite-core', version: '1.26.0'
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
implementation 'io.github.hakky54:sslcontext-kickstart:6.6.1'

Expand Down
Binary file not shown.
Binary file removed src/main/resources/janino-3.1.4-SNAPSHOT.jar
Binary file not shown.