Skip to content

Commit ff25ac5

Browse files
committed
Apply Janino 3.0.16, and remove all hack around using Jitpack
1 parent 78f8021 commit ff25ac5

File tree

5 files changed

+11
-26
lines changed

5 files changed

+11
-26
lines changed

dev/deps/spark-deps-hadoop-2.7-hive-1.2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
3535
commons-cli/1.2//commons-cli-1.2.jar
3636
commons-codec/1.10//commons-codec-1.10.jar
3737
commons-collections/3.2.2//commons-collections-3.2.2.jar
38-
commons-compiler/SPARK-31101-3.0.x-v4//commons-compiler-SPARK-31101-3.0.x-v4.jar
38+
commons-compiler/3.0.16//commons-compiler-3.0.16.jar
3939
commons-compress/1.8.1//commons-compress-1.8.1.jar
4040
commons-configuration/1.6//commons-configuration-1.6.jar
4141
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
@@ -105,7 +105,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
105105
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
106106
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
107107
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
108-
janino/SPARK-31101-3.0.x-v4//janino-SPARK-31101-3.0.x-v4.jar
108+
janino/3.0.16//janino-3.0.16.jar
109109
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
110110
javax.inject/1//javax.inject-1.jar
111111
javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar

dev/deps/spark-deps-hadoop-2.7-hive-2.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
3333
commons-cli/1.2//commons-cli-1.2.jar
3434
commons-codec/1.10//commons-codec-1.10.jar
3535
commons-collections/3.2.2//commons-collections-3.2.2.jar
36-
commons-compiler/SPARK-31101-3.0.x-v4//commons-compiler-SPARK-31101-3.0.x-v4.jar
36+
commons-compiler/3.0.16//commons-compiler-3.0.16.jar
3737
commons-compress/1.8.1//commons-compress-1.8.1.jar
3838
commons-configuration/1.6//commons-configuration-1.6.jar
3939
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
@@ -118,7 +118,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
118118
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
119119
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
120120
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
121-
janino/SPARK-31101-3.0.x-v4//janino-SPARK-31101-3.0.x-v4.jar
121+
janino/3.0.16//janino-3.0.16.jar
122122
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
123123
javax.inject/1//javax.inject-1.jar
124124
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar

dev/deps/spark-deps-hadoop-3.2-hive-2.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
3030
commons-cli/1.2//commons-cli-1.2.jar
3131
commons-codec/1.10//commons-codec-1.10.jar
3232
commons-collections/3.2.2//commons-collections-3.2.2.jar
33-
commons-compiler/SPARK-31101-3.0.x-v4//commons-compiler-SPARK-31101-3.0.x-v4.jar
33+
commons-compiler/3.0.16//commons-compiler-3.0.16.jar
3434
commons-compress/1.8.1//commons-compress-1.8.1.jar
3535
commons-configuration2/2.1.1//commons-configuration2-2.1.1.jar
3636
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
@@ -117,7 +117,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
117117
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
118118
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
119119
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
120-
janino/SPARK-31101-3.0.x-v4//janino-SPARK-31101-3.0.x-v4.jar
120+
janino/3.0.16//janino-3.0.16.jar
121121
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
122122
javax.inject/1//javax.inject-1.jar
123123
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar

pom.xml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@
178178
<!-- org.apache.commons/commons-pool2/-->
179179
<commons-pool2.version>2.6.2</commons-pool2.version>
180180
<datanucleus-core.version>4.1.17</datanucleus-core.version>
181-
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
182-
<janino.version>SPARK-31101-3.0.x-v4</janino.version>
181+
<janino.version>3.0.16</janino.version>
183182
<jersey.version>2.30</jersey.version>
184183
<joda.version>2.10.5</joda.version>
185184
<jodd.version>3.5.2</jodd.version>
@@ -247,18 +246,6 @@
247246
<CodeCacheSize>1g</CodeCacheSize>
248247
</properties>
249248
<repositories>
250-
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
251-
<repository>
252-
<id>jitpack.io</id>
253-
<url>https://jitpack.io</url>
254-
<releases>
255-
<enabled>true</enabled>
256-
</releases>
257-
<snapshots>
258-
<enabled>false</enabled>
259-
</snapshots>
260-
</repository>
261-
262249
<repository>
263250
<id>gcs-maven-central-mirror</id>
264251
<!--
@@ -2183,14 +2170,13 @@
21832170
<version>${hive.parquet.version}</version>
21842171
<scope>${hive.parquet.scope}</scope>
21852172
</dependency>
2186-
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
21872173
<dependency>
2188-
<groupId>com.github.heartsavior.janino</groupId>
2174+
<groupId>org.codehaus.janino</groupId>
21892175
<artifactId>janino</artifactId>
21902176
<version>${janino.version}</version>
21912177
</dependency>
21922178
<dependency>
2193-
<groupId>com.github.heartsavior.janino</groupId>
2179+
<groupId>org.codehaus.janino</groupId>
21942180
<artifactId>commons-compiler</artifactId>
21952181
<version>${janino.version}</version>
21962182
</dependency>

sql/catalyst/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,12 @@
9292
<artifactId>scalacheck_${scala.binary.version}</artifactId>
9393
<scope>test</scope>
9494
</dependency>
95-
<!-- FIXME: testing unreleased version of Janino via JitPack... -->
9695
<dependency>
97-
<groupId>com.github.heartsavior.janino</groupId>
96+
<groupId>org.codehaus.janino</groupId>
9897
<artifactId>janino</artifactId>
9998
</dependency>
10099
<dependency>
101-
<groupId>com.github.heartsavior.janino</groupId>
100+
<groupId>org.codehaus.janino</groupId>
102101
<artifactId>commons-compiler</artifactId>
103102
</dependency>
104103
<dependency>

0 commit comments

Comments
 (0)