Skip to content

Commit

Permalink
Merge branch 'overhaul-mvr-322' of github.com:PreibischLab/BigStitche…
Browse files Browse the repository at this point in the history 
…r-Spark into overhaul-mvr-322
  • Loading branch information
@StephanPreibisch
StephanPreibisch committed Nov 1, 2023
2 parents 5eda0fb + 9935243 commit 7eaf5be
Showing 1 changed file with 31 additions and 33 deletions.
64 changes: 31 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2</artifactId>
<version>6.1.0</version>
<version>6.2.0</version>
</dependency>
<dependency>
<groupId>sc.fiji</groupId>
Expand All @@ -121,46 +121,37 @@
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk-s3.version}</version>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.bigdataviewer</groupId>
<artifactId>bigdataviewer-omezarr</artifactId>
<version>0.1.1</version>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-zarr</artifactId>
<version>0.0.8</version>
<artifactId>n5</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-aws-s3</artifactId>
<version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5</artifactId>
</exclusion>
</exclusions>
<artifactId>n5-zarr</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-aws-s3</artifactId>
<version>4.0.0</version>
</dependency>
<!-- Scala is sensitive to fasterxml version -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.6.5</version>
<version>2.13.4</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<!-- Spark 2.4.7 release comes with scala 2.11.12 -->
<artifactId>spark-core_2.11</artifactId>
<version>2.4.7</version>
<!-- Spark 3.3.2 release comes with scala 2.12.15 -->
<artifactId>spark-core_2.12</artifactId>
<version>3.3.2</version>
<exclusions>
<exclusion>
<artifactId>netty-all</artifactId>
Expand Down Expand Up @@ -216,11 +207,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.11.12</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>2.12.15</version>
</dependency>
<dependency>
<groupId>net.preibisch</groupId>
Expand All @@ -232,8 +219,12 @@
<artifactId>ijp-kheops</artifactId>
</exclusion>
<exclusion>
<groupId>gov.nist.isg</groupId>
<artifactId>pyramidio</artifactId>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
</exclusion>
<exclusion>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
</exclusion>
<exclusion>
<groupId>com.esotericsoftware</groupId>
Expand All @@ -258,7 +249,7 @@
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-hdf5</artifactId>
<version>1.4.2</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
Expand Down Expand Up @@ -320,21 +311,28 @@
<exclude>META-INF/*.txt</exclude>
<exclude>module-info.class</exclude>
<exclude>plugins.config</exclude>
<exclude>META-INF/versions/9/module-info.class</exclude>
<exclude>META-INF/okio.kotlin_module</exclude>
<exclude>META-INF/services/com.fasterxml.jackson.core.JsonFactory</exclude>
</excludes>
</filter>
</filters>
<!-- Additional configuration. -->
<artifactSet>
<excludes>
<exclude>*jackson*</exclude>
<!-- <exclude>com.github.jnr:jnr-ffi</exclude>-->
<exclude>xpp3:xpp3</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.apache.commons.compress</pattern>
<shadedPattern>org.janelia.saalfeldlab.org.apache.commons.compress</shadedPattern>
</relocation>
<!-- Protect newer gson version from the old one preloaded by spark -->
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>org.janelia.saalfeldlab.com.google.gson</shadedPattern>
</relocation>
</relocations>
</configuration>
<!-- binds by default to package phase -->
Expand Down

0 comments on commit 7eaf5be

Please sign in to comment.