Skip to content

Commit 51833ba

Browse files
NicoKiaruNicoKiaru
committed
Updates to pom scijava 38.0.1
1 parent aa5969a commit 51833ba

File tree

2 files changed

+51
-80
lines changed

2 files changed

+51
-80
lines changed

‎pom.xml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>38.0.1</version>
99
<relativePath />
1010
</parent>
1111

@@ -125,24 +125,6 @@
125125
<reflections.version>0.10.2</reflections.version> <!-- for test only -->
126126

127127
<!-- package version below are determined by the parent pom but need to be upgraded or temporarily fixed for bugs -->
128-
<imglib2-realtransform.version>4.0.2</imglib2-realtransform.version>
129-
130-
<n5.version>3.1.1</n5.version>
131-
<n5-hdf5.version>2.1.0</n5-hdf5.version>
132-
<n5-zarr.version>1.2.0</n5-zarr.version>
133-
<n5-ij.version>4.0.1</n5-ij.version>
134-
<n5-universe.version>1.3.1</n5-universe.version>
135-
<n5-zstandard.version>1.0.2</n5-zstandard.version>
136-
<org.janelia.n5-zstandard.version>${n5-zstandard.version}</org.janelia.n5-zstandard.version>
137-
138-
<bigwarp.version>9.1.2</bigwarp.version>
139-
<bigdataviewer-core.version>10.4.13</bigdataviewer-core.version>
140-
<bigdataviewer-vistools.version>1.0.0-beta-34</bigdataviewer-vistools.version>
141-
142-
<ejml-core.version>0.41</ejml-core.version>
143-
<ejml-ddense.version>0.41</ejml-ddense.version>
144-
145-
<jitk-tps.version>3.0.4</jitk-tps.version>
146128

147129
</properties>
148130

@@ -151,6 +133,7 @@
151133
<dependency>
152134
<groupId>sc.fiji</groupId>
153135
<artifactId>bigdataviewer-core</artifactId>
136+
<version>${bigdataviewer-core.version}</version>
154137
</dependency>
155138

156139
<dependency>
@@ -197,18 +180,6 @@
197180
<version>${bigwarp_fiji.version}</version>
198181
</dependency>
199182

200-
<dependency>
201-
<groupId>org.ejml</groupId>
202-
<artifactId>ejml-core</artifactId>
203-
<version>${ejml-core.version}</version>
204-
</dependency>
205-
206-
<dependency>
207-
<groupId>org.ejml</groupId>
208-
<artifactId>ejml-ddense</artifactId>
209-
<version>${ejml-ddense.version}</version>
210-
</dependency>
211-
212183
<!-- Test dependencies -->
213184
<dependency>
214185
<groupId>junit</groupId>

‎src/test/resources/bdvplaygroundstate.json

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@
516516
]
517517
}
518518
},
519-
"wrapped_source_id": 26
519+
"wrapped_source_id": 23
520520
},
521521
"string_metadata": {}
522522
},
@@ -532,12 +532,12 @@
532532
"affinetransform_fixed": {
533533
"type": "AffineTransform3D",
534534
"affinetransform3d": [
535-
0.6572454814574047,
536-
-0.08891326296113902,
535+
0.4934699038397149,
536+
-0.43627346109731185,
537537
0.0,
538538
0.0,
539-
0.09087326321914962,
540-
0.671733773421179,
539+
0.37597435400734647,
540+
0.4252654467029816,
541541
0.0,
542542
0.0,
543543
0.0,
@@ -546,7 +546,7 @@
546546
0.0
547547
]
548548
},
549-
"wrapped_source_id": 38
549+
"wrapped_source_id": 37
550550
},
551551
"string_metadata": {}
552552
},
@@ -562,12 +562,12 @@
562562
"affinetransform_fixed": {
563563
"type": "AffineTransform3D",
564564
"affinetransform3d": [
565-
0.4628521345566832,
566-
-0.2966675521328264,
565+
0.6410018149239727,
566+
-0.18009554914567996,
567567
0.0,
568568
0.0,
569-
0.2923677958182328,
570-
0.45614377911310516,
569+
0.1394369922415217,
570+
0.49628858413405874,
571571
0.0,
572572
200.0,
573573
0.0,
@@ -576,7 +576,7 @@
576576
0.0
577577
]
578578
},
579-
"wrapped_source_id": 38
579+
"wrapped_source_id": 37
580580
},
581581
"string_metadata": {}
582582
},
@@ -592,12 +592,12 @@
592592
"affinetransform_fixed": {
593593
"type": "AffineTransform3D",
594594
"affinetransform3d": [
595-
0.5524777405081435,
596-
-0.322463046706307,
595+
0.6720813807105771,
596+
-0.0238936497070828,
597597
0.0,
598598
200.0,
599-
0.3540082949864662,
600-
0.6065243907262191,
599+
0.021902326930651743,
600+
0.6160693868364272,
601601
0.0,
602602
0.0,
603603
0.0,
@@ -606,7 +606,7 @@
606606
0.0
607607
]
608608
},
609-
"wrapped_source_id": 38
609+
"wrapped_source_id": 37
610610
},
611611
"string_metadata": {}
612612
},
@@ -622,12 +622,12 @@
622622
"affinetransform_fixed": {
623623
"type": "AffineTransform3D",
624624
"affinetransform3d": [
625-
0.49868524403796227,
626-
-0.1105528659431934,
625+
0.6451428480942317,
626+
-0.18561671816260913,
627627
0.0,
628628
200.0,
629-
0.14369057046244033,
630-
0.6481638136259267,
629+
0.19538296205509573,
630+
0.6790871094859349,
631631
0.0,
632632
200.0,
633633
0.0,
@@ -636,7 +636,7 @@
636636
0.0
637637
]
638638
},
639-
"wrapped_source_id": 38
639+
"wrapped_source_id": 37
640640
},
641641
"string_metadata": {}
642642
},
@@ -730,7 +730,7 @@
730730
}
731731
}
732732
},
733-
"wrapped_source_id": 24
733+
"wrapped_source_id": 25
734734
},
735735
"string_metadata": {}
736736
},
@@ -914,8 +914,8 @@
914914
"source_name": "mri-stack",
915915
"source_class": "bdv.SpimSource",
916916
"converter_class": "class net.imglib2.display.Instances$Imp",
917-
"source_id": 22,
918-
"color": -1,
917+
"source_id": 23,
918+
"color": 65535,
919919
"converter_setup_min": 0.033052792654934965,
920920
"converter_setup_max": 147.05187452180567,
921921
"sac": {
@@ -927,16 +927,16 @@
927927
"string_metadata": {}
928928
},
929929
{
930-
"source_name": "demoSlice.tif channel 1",
930+
"source_name": "mri-stack",
931931
"source_class": "bdv.SpimSource",
932932
"converter_class": "class net.imglib2.display.Instances$Imp",
933-
"source_id": 24,
933+
"source_id": 23,
934934
"color": 65535,
935-
"converter_setup_min": 0.03902065799540933,
936-
"converter_setup_max": 131.07039020657996,
935+
"converter_setup_min": 0.033052792654934965,
936+
"converter_setup_max": 147.05187452180567,
937937
"sac": {
938938
"spimdata": {
939-
"datalocation": "src/test/resources/demoSlice.xml"
939+
"datalocation": "src/test/resources/mri-stack.xml"
940940
},
941941
"viewsetup": 0
942942
},
@@ -946,7 +946,7 @@
946946
"source_name": "demoSlice.tif channel 1",
947947
"source_class": "bdv.SpimSource",
948948
"converter_class": "class net.imglib2.display.Instances$Imp",
949-
"source_id": 24,
949+
"source_id": 25,
950950
"color": 65535,
951951
"converter_setup_min": 0.03902065799540933,
952952
"converter_setup_max": 131.07039020657996,
@@ -959,32 +959,32 @@
959959
"string_metadata": {}
960960
},
961961
{
962-
"source_name": "mri-stack",
962+
"source_name": "demoSlice.tif channel 1",
963963
"source_class": "bdv.SpimSource",
964964
"converter_class": "class net.imglib2.display.Instances$Imp",
965-
"source_id": 26,
965+
"source_id": 25,
966966
"color": 65535,
967-
"converter_setup_min": 0.033052792654934965,
968-
"converter_setup_max": 147.05187452180567,
967+
"converter_setup_min": 0.03902065799540933,
968+
"converter_setup_max": 131.07039020657996,
969969
"sac": {
970970
"spimdata": {
971-
"datalocation": "src/test/resources/mri-stack.xml"
971+
"datalocation": "src/test/resources/demoSlice.xml"
972972
},
973973
"viewsetup": 0
974974
},
975975
"string_metadata": {}
976976
},
977977
{
978-
"source_name": "mri-stack",
978+
"source_name": "demoSlice.tif channel 1",
979979
"source_class": "bdv.SpimSource",
980980
"converter_class": "class net.imglib2.display.Instances$Imp",
981981
"source_id": 26,
982-
"color": 65535,
983-
"converter_setup_min": 0.033052792654934965,
984-
"converter_setup_max": 147.05187452180567,
982+
"color": -1,
983+
"converter_setup_min": 0.03902065799540933,
984+
"converter_setup_max": 131.07039020657996,
985985
"sac": {
986986
"spimdata": {
987-
"datalocation": "src/test/resources/mri-stack.xml"
987+
"datalocation": "src/test/resources/demoSlice.xml"
988988
},
989989
"viewsetup": 0
990990
},
@@ -1087,16 +1087,16 @@
10871087
"string_metadata": {}
10881088
},
10891089
{
1090-
"source_name": "demoSlice.tif channel 1",
1090+
"source_name": "mri-stack",
10911091
"source_class": "bdv.SpimSource",
10921092
"converter_class": "class net.imglib2.display.Instances$Imp",
1093-
"source_id": 33,
1093+
"source_id": 37,
10941094
"color": -1,
1095-
"converter_setup_min": 0.03902065799540933,
1096-
"converter_setup_max": 131.07039020657996,
1095+
"converter_setup_min": 0.033052792654934965,
1096+
"converter_setup_max": 147.05187452180567,
10971097
"sac": {
10981098
"spimdata": {
1099-
"datalocation": "src/test/resources/demoSlice.xml"
1099+
"datalocation": "src/test/resources/mri-stack.xml"
11001100
},
11011101
"viewsetup": 0
11021102
},
@@ -1106,7 +1106,7 @@
11061106
"source_name": "mri-stack",
11071107
"source_class": "bdv.SpimSource",
11081108
"converter_class": "class net.imglib2.display.Instances$Imp",
1109-
"source_id": 38,
1109+
"source_id": 37,
11101110
"color": -1,
11111111
"converter_setup_min": 0.033052792654934965,
11121112
"converter_setup_max": 147.05187452180567,
@@ -1122,7 +1122,7 @@
11221122
"source_name": "mri-stack",
11231123
"source_class": "bdv.SpimSource",
11241124
"converter_class": "class net.imglib2.display.Instances$Imp",
1125-
"source_id": 38,
1125+
"source_id": 37,
11261126
"color": -1,
11271127
"converter_setup_min": 0.033052792654934965,
11281128
"converter_setup_max": 147.05187452180567,
@@ -1138,7 +1138,7 @@
11381138
"source_name": "mri-stack",
11391139
"source_class": "bdv.SpimSource",
11401140
"converter_class": "class net.imglib2.display.Instances$Imp",
1141-
"source_id": 38,
1141+
"source_id": 37,
11421142
"color": -1,
11431143
"converter_setup_min": 0.033052792654934965,
11441144
"converter_setup_max": 147.05187452180567,
@@ -1154,7 +1154,7 @@
11541154
"source_name": "mri-stack",
11551155
"source_class": "bdv.SpimSource",
11561156
"converter_class": "class net.imglib2.display.Instances$Imp",
1157-
"source_id": 38,
1157+
"source_id": 37,
11581158
"color": -1,
11591159
"converter_setup_min": 0.033052792654934965,
11601160
"converter_setup_max": 147.05187452180567,

0 commit comments

Comments
 (0)