Skip to content

Commit

Permalink
Updates to pom scijava 38.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@NicoKiaru
NicoKiaru committed Jul 22, 2024
1 parent aa5969a commit 51833ba
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 80 deletions.
33 changes: 2 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>37.0.0</version>
<version>38.0.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -125,24 +125,6 @@
<reflections.version>0.10.2</reflections.version> <!-- for test only -->

<!-- package version below are determined by the parent pom but need to be upgraded or temporarily fixed for bugs -->
<imglib2-realtransform.version>4.0.2</imglib2-realtransform.version>

<n5.version>3.1.1</n5.version>
<n5-hdf5.version>2.1.0</n5-hdf5.version>
<n5-zarr.version>1.2.0</n5-zarr.version>
<n5-ij.version>4.0.1</n5-ij.version>
<n5-universe.version>1.3.1</n5-universe.version>
<n5-zstandard.version>1.0.2</n5-zstandard.version>
<org.janelia.n5-zstandard.version>${n5-zstandard.version}</org.janelia.n5-zstandard.version>

<bigwarp.version>9.1.2</bigwarp.version>
<bigdataviewer-core.version>10.4.13</bigdataviewer-core.version>
<bigdataviewer-vistools.version>1.0.0-beta-34</bigdataviewer-vistools.version>

<ejml-core.version>0.41</ejml-core.version>
<ejml-ddense.version>0.41</ejml-ddense.version>

<jitk-tps.version>3.0.4</jitk-tps.version>

</properties>

Expand All @@ -151,6 +133,7 @@
<dependency>
<groupId>sc.fiji</groupId>
<artifactId>bigdataviewer-core</artifactId>
<version>${bigdataviewer-core.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -197,18 +180,6 @@
<version>${bigwarp_fiji.version}</version>
</dependency>

<dependency>
<groupId>org.ejml</groupId>
<artifactId>ejml-core</artifactId>
<version>${ejml-core.version}</version>
</dependency>

<dependency>
<groupId>org.ejml</groupId>
<artifactId>ejml-ddense</artifactId>
<version>${ejml-ddense.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
Expand Down
98 changes: 49 additions & 49 deletions src/test/resources/bdvplaygroundstate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@
]
}
},
"wrapped_source_id": 26
"wrapped_source_id": 23
},
"string_metadata": {}
},
Expand All @@ -532,12 +532,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
0.6572454814574047,
-0.08891326296113902,
0.4934699038397149,
-0.43627346109731185,
0.0,
0.0,
0.09087326321914962,
0.671733773421179,
0.37597435400734647,
0.4252654467029816,
0.0,
0.0,
0.0,
Expand All @@ -546,7 +546,7 @@
0.0
]
},
"wrapped_source_id": 38
"wrapped_source_id": 37
},
"string_metadata": {}
},
Expand All @@ -562,12 +562,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
0.4628521345566832,
-0.2966675521328264,
0.6410018149239727,
-0.18009554914567996,
0.0,
0.0,
0.2923677958182328,
0.45614377911310516,
0.1394369922415217,
0.49628858413405874,
0.0,
200.0,
0.0,
Expand All @@ -576,7 +576,7 @@
0.0
]
},
"wrapped_source_id": 38
"wrapped_source_id": 37
},
"string_metadata": {}
},
Expand All @@ -592,12 +592,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
0.5524777405081435,
-0.322463046706307,
0.6720813807105771,
-0.0238936497070828,
0.0,
200.0,
0.3540082949864662,
0.6065243907262191,
0.021902326930651743,
0.6160693868364272,
0.0,
0.0,
0.0,
Expand All @@ -606,7 +606,7 @@
0.0
]
},
"wrapped_source_id": 38
"wrapped_source_id": 37
},
"string_metadata": {}
},
Expand All @@ -622,12 +622,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
0.49868524403796227,
-0.1105528659431934,
0.6451428480942317,
-0.18561671816260913,
0.0,
200.0,
0.14369057046244033,
0.6481638136259267,
0.19538296205509573,
0.6790871094859349,
0.0,
200.0,
0.0,
Expand All @@ -636,7 +636,7 @@
0.0
]
},
"wrapped_source_id": 38
"wrapped_source_id": 37
},
"string_metadata": {}
},
Expand Down Expand Up @@ -730,7 +730,7 @@
}
}
},
"wrapped_source_id": 24
"wrapped_source_id": 25
},
"string_metadata": {}
},
Expand Down Expand Up @@ -914,8 +914,8 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 22,
"color": -1,
"source_id": 23,
"color": 65535,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"sac": {
Expand All @@ -927,16 +927,16 @@
"string_metadata": {}
},
{
"source_name": "demoSlice.tif channel 1",
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 24,
"source_id": 23,
"color": 65535,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"sac": {
"spimdata": {
"datalocation": "src/test/resources/demoSlice.xml"
"datalocation": "src/test/resources/mri-stack.xml"
},
"viewsetup": 0
},
Expand All @@ -946,7 +946,7 @@
"source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 24,
"source_id": 25,
"color": 65535,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
Expand All @@ -959,32 +959,32 @@
"string_metadata": {}
},
{
"source_name": "mri-stack",
"source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 26,
"source_id": 25,
"color": 65535,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
"sac": {
"spimdata": {
"datalocation": "src/test/resources/mri-stack.xml"
"datalocation": "src/test/resources/demoSlice.xml"
},
"viewsetup": 0
},
"string_metadata": {}
},
{
"source_name": "mri-stack",
"source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 26,
"color": 65535,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"color": -1,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
"sac": {
"spimdata": {
"datalocation": "src/test/resources/mri-stack.xml"
"datalocation": "src/test/resources/demoSlice.xml"
},
"viewsetup": 0
},
Expand Down Expand Up @@ -1087,16 +1087,16 @@
"string_metadata": {}
},
{
"source_name": "demoSlice.tif channel 1",
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 33,
"source_id": 37,
"color": -1,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"sac": {
"spimdata": {
"datalocation": "src/test/resources/demoSlice.xml"
"datalocation": "src/test/resources/mri-stack.xml"
},
"viewsetup": 0
},
Expand All @@ -1106,7 +1106,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 38,
"source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
Expand All @@ -1122,7 +1122,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 38,
"source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
Expand All @@ -1138,7 +1138,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 38,
"source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
Expand All @@ -1154,7 +1154,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 38,
"source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
Expand Down

0 comments on commit 51833ba

Please sign in to comment.