Merge remote-tracking branch 'origin/master'

张洋洋

2025-01-10 6903d8ecf8f40369d3af29d7db2affd27b526fea

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

 libs/n5-zarr-1.3.5.jar

Binary files differ

 pom.xml

@@ -245,7 +245,35 @@
            <artifactId>jna</artifactId>
            <version>4.2.2</version>
        </dependency>


        <!-- zarr -->
        <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-zarr -->
        <dependency>
            <groupId>org.janelia.saalfeldlab</groupId>
            <artifactId>n5-zarr</artifactId>
            <version>1.3.5</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/libs/n5-zarr-1.3.5.jar</systemPath>
        </dependency>

        <!-- https://mvnrepository.com/artifact/dev.zarr/jzarr -->
        <dependency>
            <groupId>dev.zarr</groupId>
            <artifactId>jzarr</artifactId>
            <version>0.4.2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/libs/jzarr-0.4.2.jar</systemPath>
        </dependency>


    </dependencies>
    <repositories>
        <repository>
            <id>jcenter</id>
            <url>https://jcenter.bintray.com/</url>
        </repository>
    </repositories>
    <build>
        <finalName>SimuServer</finalName>
        <plugins>