From dc68d3bc0ed409dfdab91784bed3a2d420fc8a49 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 5 Jun 2024 09:56:44 -0400 Subject: [PATCH 1/3] [maven-release-plugin] prepare release n5-zarr-1.3.4 --- pom.xml | 4 ++-- release.properties | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 release.properties diff --git a/pom.xml b/pom.xml index d8b77cd..f541996 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.janelia.saalfeldlab n5-zarr - 1.3.4-SNAPSHOT + 1.3.4 N5 Zarr Zarr filesystem backend for N5 @@ -111,7 +111,7 @@ scm:git:git://github.com/saalfeldlab/n5-zarr scm:git:git@github.com:saalfeldlab/n5-zarr - HEAD + n5-zarr-1.3.4 https://github.com/saalfeldlab/n5-zarr diff --git a/release.properties b/release.properties new file mode 100644 index 0000000..bc174ef --- /dev/null +++ b/release.properties @@ -0,0 +1,28 @@ +#release configuration +#Wed Jun 05 09:56:44 EDT 2024 +scm.commentPrefix=[maven-release-plugin] +exec.pomFileName=pom.xml +pushChanges=false +releaseStrategyId=default +project.scm.org.janelia.saalfeldlab\:n5-zarr.developerConnection=scm\:git\:git@github.com\:saalfeldlab/n5-zarr +project.scm.org.janelia.saalfeldlab\:n5-zarr.tag=HEAD +project.dev.org.janelia.saalfeldlab\:n5-zarr=1.3.5-SNAPSHOT +projectVersionPolicyConfig=${projectVersionPolicyConfig}\n +scm.tag=n5-zarr-1.3.4 +remoteTagging=true +exec.additionalArguments=-Dgpg.skip\=true +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +projectVersionPolicyId=default +project.scm.org.janelia.saalfeldlab\:n5-zarr.url=https\://github.com/saalfeldlab/n5-zarr +scm.url=scm\:git\:https\://github.com/saalfeldlab/n5-zarr +scm.tagNameFormat=@{project.artifactId}-@{project.version} +pinExternals=false +preparationGoals=clean verify +project.scm.org.janelia.saalfeldlab\:n5-zarr.connection=scm\:git\:git\://github.com/saalfeldlab/n5-zarr +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} +exec.snapshotReleasePluginAllowed=false +exec.activateProfiles=deploy-to-scijava +project.rel.org.janelia.saalfeldlab\:n5-zarr=1.3.4 +scm.developmentCommitComment=@{prefix} prepare for next development iteration +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +completedPhase=end-release From 69b8a27839812dbcc5c2e182e091cb8537b1b1c0 Mon Sep 17 00:00:00 2001 From: Caleb Hulbert Date: Wed, 10 Jul 2024 13:36:07 -0400 Subject: [PATCH 2/3] perf: throw N5NoSuchKeyException if no key when reading --- pom.xml | 2 +- .../org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f541996..0c0ae4a 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ 1.1.1 - 3.2.0 + 3.2.1-SNAPSHOT 1.0.2 diff --git a/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java b/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java index c43104e..519af31 100644 --- a/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java +++ b/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java @@ -651,11 +651,10 @@ public DataBlock readBlock( zarrDatasetAttributes.getDimensionSeparator(), zarrDatasetAttributes.isRowMajor())); - if (!keyValueAccess.isFile(absolutePath)) - return null; - try (final LockedChannel lockedChannel = keyValueAccess.lockForReading(absolutePath)) { return readBlock(lockedChannel.newInputStream(), zarrDatasetAttributes, gridPosition); + } catch (final N5Exception.N5NoSuchKeyException e) { + return null; } catch (final Throwable e) { throw new N5IOException( "Failed to read block " + Arrays.toString(gridPosition) + " from dataset " + pathName, From 720d5f6e24bc92786925fc55c746ec1d95b4fced Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Tue, 16 Jul 2024 13:49:34 -0400 Subject: [PATCH 3/3] chore: bumpy pom-scijava and n5 versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 88ef281..b33c694 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 37.0.0 + 38.0.1 @@ -138,7 +138,7 @@ 1.1.1 - 3.2.1-SNAPSHOT + 3.3.0 1.0.2