Skip to content

Commit

Permalink
Upgrade to Janino 3.1.2, remove hack around using Jitpack
Browse files Browse the repository at this point in the history
  • Loading branch information
HeartSaVioR committed Mar 19, 2020
1 parent 51d090d commit 5965446
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 27 deletions.
4 changes: 2 additions & 2 deletions dev/deps/spark-deps-hadoop-2.7-hive-1.2
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
commons-cli/1.2//commons-cli-1.2.jar
commons-codec/1.10//commons-codec-1.10.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-compiler/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
commons-compiler/3.1.2//commons-compiler-3.1.2.jar
commons-compress/1.8.1//commons-compress-1.8.1.jar
commons-configuration/1.6//commons-configuration-1.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
Expand Down Expand Up @@ -105,7 +105,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
janino/3.1.2//janino-3.1.2.jar
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
javax.inject/1//javax.inject-1.jar
javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar
Expand Down
4 changes: 2 additions & 2 deletions dev/deps/spark-deps-hadoop-2.7-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
commons-cli/1.2//commons-cli-1.2.jar
commons-codec/1.10//commons-codec-1.10.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-compiler/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
commons-compiler/3.1.2//commons-compiler-3.1.2.jar
commons-compress/1.8.1//commons-compress-1.8.1.jar
commons-configuration/1.6//commons-configuration-1.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
Expand Down Expand Up @@ -118,7 +118,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
janino/3.1.2//janino-3.1.2.jar
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
javax.inject/1//javax.inject-1.jar
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
Expand Down
4 changes: 2 additions & 2 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
commons-cli/1.2//commons-cli-1.2.jar
commons-codec/1.10//commons-codec-1.10.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-compiler/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
commons-compiler/3.1.2//commons-compiler-3.1.2.jar
commons-compress/1.8.1//commons-compress-1.8.1.jar
commons-configuration2/2.1.1//commons-configuration2-2.1.1.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
Expand Down Expand Up @@ -117,7 +117,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
janino/3.1.2//janino-3.1.2.jar
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
javax.inject/1//javax.inject-1.jar
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
Expand Down
20 changes: 3 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@
<!-- org.apache.commons/commons-pool2/-->
<commons-pool2.version>2.6.2</commons-pool2.version>
<datanucleus-core.version>4.1.17</datanucleus-core.version>
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
<janino.version>SPARK-31101-3.1.x-v3</janino.version>
<janino.version>3.1.2</janino.version>
<jersey.version>2.30</jersey.version>
<joda.version>2.10.5</joda.version>
<jodd.version>3.5.2</jodd.version>
Expand Down Expand Up @@ -247,18 +246,6 @@
<CodeCacheSize>1g</CodeCacheSize>
</properties>
<repositories>
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>gcs-maven-central-mirror</id>
<!--
Expand Down Expand Up @@ -2183,14 +2170,13 @@
<version>${hive.parquet.version}</version>
<scope>${hive.parquet.scope}</scope>
</dependency>
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
<dependency>
<groupId>com.github.heartsavior.janino</groupId>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino.version}</version>
</dependency>
<dependency>
<groupId>com.github.heartsavior.janino</groupId>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
<version>${janino.version}</version>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ object SparkBuild extends PomBuild {
"gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
DefaultMavenRepository,
Resolver.mavenLocal,
"jitpack" at "https://jitpack.io",
Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
),
externalResolvers := resolvers.value,
Expand Down
5 changes: 2 additions & 3 deletions sql/catalyst/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,12 @@
<artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
<dependency>
<groupId>com.github.heartsavior.janino</groupId>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>com.github.heartsavior.janino</groupId>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
</dependency>
<dependency>
Expand Down

0 comments on commit 5965446

Please sign in to comment.