diff --git a/cross-annotations/pom.xml b/cross-annotations/pom.xml index d2783de..a3eabab 100644 --- a/cross-annotations/pom.xml +++ b/cross-annotations/pom.xml @@ -4,7 +4,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-annotations jar diff --git a/cross-cache/pom.xml b/cross-cache/pom.xml index 7bdda8e..2309f7f 100644 --- a/cross-cache/pom.xml +++ b/cross-cache/pom.xml @@ -3,7 +3,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-cache jar diff --git a/cross-event/pom.xml b/cross-event/pom.xml index e0835c9..90e4952 100644 --- a/cross-event/pom.xml +++ b/cross-event/pom.xml @@ -3,7 +3,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-event jar diff --git a/cross-exception/pom.xml b/cross-exception/pom.xml index 4f145bc..4322ec6 100644 --- a/cross-exception/pom.xml +++ b/cross-exception/pom.xml @@ -3,7 +3,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-exception jar diff --git a/cross-main/pom.xml b/cross-main/pom.xml index b2c67ee..07478f3 100644 --- a/cross-main/pom.xml +++ b/cross-main/pom.xml @@ -4,7 +4,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-main jar @@ -84,7 +84,7 @@ edu.ucar - netcdfAll + cdm-core org.jdom diff --git a/cross-main/src/main/java/cross/Factory.java b/cross-main/src/main/java/cross/Factory.java index a950832..57b8121 100644 --- a/cross-main/src/main/java/cross/Factory.java +++ b/cross-main/src/main/java/cross/Factory.java @@ -152,8 +152,8 @@ public void dumpConfig(final String filename, final Date d) { File configLocationNew = new File(location.getParentFile(), configLocation.getName()); FileUtils.copyFile(configLocation, configLocationNew); } - LoggerFactory.getLogger(Factory.class).error("Saving configuration to: "); - LoggerFactory.getLogger(Factory.class).error("{}", location.getAbsolutePath()); + LoggerFactory.getLogger(Factory.class).info("Saving configuration to: "); + LoggerFactory.getLogger(Factory.class).info("{}", location.getAbsolutePath()); saveConfiguration(cfg, location); } catch (IOException | ConfigurationException ex) { LoggerFactory.getLogger(Factory.class).error("{}", ex); diff --git a/cross-main/src/main/java/cross/datastructures/cache/SerializableArray.java b/cross-main/src/main/java/cross/datastructures/cache/SerializableArray.java index 627a9a8..50fdb7b 100644 --- a/cross-main/src/main/java/cross/datastructures/cache/SerializableArray.java +++ b/cross-main/src/main/java/cross/datastructures/cache/SerializableArray.java @@ -76,7 +76,7 @@ public SerializableArray(Array array) { @Override public void writeExternal(ObjectOutput oo) throws IOException { if (array != null) { - oo.writeObject(DataType.getType(array.getElementType())); + oo.writeObject(DataType.getType(array)); oo.writeObject(array.getShape()); oo.writeObject(array.getStorage()); } diff --git a/cross-main/src/main/java/cross/datastructures/fragments/VariableFragment.java b/cross-main/src/main/java/cross/datastructures/fragments/VariableFragment.java index ffec092..6b5e37a 100644 --- a/cross-main/src/main/java/cross/datastructures/fragments/VariableFragment.java +++ b/cross-main/src/main/java/cross/datastructures/fragments/VariableFragment.java @@ -376,7 +376,7 @@ public void setArray(final Array a1) { ArrayList list = new ArrayList<>(1); list.add(a1); parent.getCache().put(this, list); - setDataType(DataType.getType(a1.getElementType())); + setDataType(DataType.getType(a1)); if (getDimensions() == null) { setDimensions(cross.datastructures.tools.ArrayTools.getDefaultDimensions(a1)); } @@ -437,7 +437,7 @@ protected void setIndexedArrayInternal(final List al1) { if (al1 != null && !al1.isEmpty()) { this.isModified = true; parent.getCache().put(this, al1); - setDataType(DataType.getType(al1.get(0).getElementType())); + setDataType(DataType.getType(al1.get(0))); } else { clear(); } diff --git a/cross-main/src/main/java/cross/datastructures/tools/FragmentTools.java b/cross-main/src/main/java/cross/datastructures/tools/FragmentTools.java index 142077c..1bb7bdb 100644 --- a/cross-main/src/main/java/cross/datastructures/tools/FragmentTools.java +++ b/cross-main/src/main/java/cross/datastructures/tools/FragmentTools.java @@ -158,7 +158,7 @@ public static IVariableFragment createIntArrayD1( } else { vf = new VariableFragment(parent, varname); } - final ArrayInt.D1 a = new ArrayInt.D1(size); + final ArrayInt.D1 a = new ArrayInt.D1(size, false); vf.setArray(a); return vf; } diff --git a/cross-main/src/main/java/cross/io/xml/FragmentXMLSerializer.java b/cross-main/src/main/java/cross/io/xml/FragmentXMLSerializer.java index e3417c1..53eebc8 100644 --- a/cross-main/src/main/java/cross/io/xml/FragmentXMLSerializer.java +++ b/cross-main/src/main/java/cross/io/xml/FragmentXMLSerializer.java @@ -506,7 +506,7 @@ public ArrayList readIndexed(final IVariableFragment f) // read in the full index_array log.debug("Reading index array {}", index); Array index_array = readSingle(index); - switch (DataType.getType(index_array.getElementType())) { + switch (DataType.getType(index_array)) { case LONG: log.warn("Index array contains long values, this is currently only supported up to Integer.MAX_VALUE"); break; @@ -588,7 +588,7 @@ public ArrayList readIndexed(final IVariableFragment f) data_end = Math.min(data_dim.getLength() - 1, data_end); if (data_start > data_end) { log.warn("scan_index contains an invalid last scan offset. Inserting terminating array with length 0!"); - al.add(Array.factory(DataType.getType(data_array.getElementType()), new int[0])); + al.add(Array.factory(DataType.getType(data_array), new int[0])); } else { try { log.debug("Reading array {}, from {} to {}", new Object[]{ diff --git a/cross-main/src/test/java/cross/datastructures/ehcache/CacheDelegateTest.java b/cross-main/src/test/java/cross/datastructures/ehcache/CacheDelegateTest.java index 1ffdb52..ad59ab5 100644 --- a/cross-main/src/test/java/cross/datastructures/ehcache/CacheDelegateTest.java +++ b/cross-main/src/test/java/cross/datastructures/ehcache/CacheDelegateTest.java @@ -121,7 +121,7 @@ public void cachedVariableFragment() throws IOException { VariableFragment vf1 = new VariableFragment(ff, "a" + j); vf1.setArray(new ArrayDouble.D2(10, 39)); VariableFragment vfIndex = new VariableFragment(ff, "index" + j); - vfIndex.setArray(new ArrayInt.D1(20)); + vfIndex.setArray(new ArrayInt.D1(20, false)); VariableFragment vf2 = new VariableFragment(ff, "b" + j, vfIndex); List l = new ArrayList<>(); Array indexArray = vfIndex.getArray(); @@ -175,7 +175,7 @@ public void customCachedVariableFragment() throws IOException { VariableFragment vf1 = new VariableFragment(ff, "a" + j); vf1.setArray(new ArrayDouble.D2(10, 39)); VariableFragment vfIndex = new VariableFragment(ff, "index" + j); - vfIndex.setArray(new ArrayInt.D1(20)); + vfIndex.setArray(new ArrayInt.D1(20, false)); VariableFragment vf2 = new VariableFragment(ff, "b" + j, vfIndex); List l = new ArrayList<>(); Array indexArray = vfIndex.getArray(); diff --git a/cross-main/src/test/java/cross/datastructures/fragments/FileFragmentTest.java b/cross-main/src/test/java/cross/datastructures/fragments/FileFragmentTest.java index 05741ed..504b706 100644 --- a/cross-main/src/test/java/cross/datastructures/fragments/FileFragmentTest.java +++ b/cross-main/src/test/java/cross/datastructures/fragments/FileFragmentTest.java @@ -259,11 +259,11 @@ public void testBreadthFirstSearch() { //create two Filefragments at the same level with equally named variables File pathLocal1 = new File(outBaseDir, "local1.cdf"); FileFragment local1 = new FileFragment(pathLocal1); - local1.addChild("testVar1").setArray(Array.factory(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); + local1.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); File pathLocal2 = new File(outBaseDir, "local2.cdf"); FileFragment local2 = new FileFragment(pathLocal2); - local2.addChild("testVar1").setArray(Array.factory(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); + local2.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); File pathLocal3 = new File(new File(outBaseDir, "subdir"), "local3.cdf"); FileFragment local3 = new FileFragment(pathLocal3); @@ -290,7 +290,7 @@ public void testBreadthFirstDifferentDepthSearch() { File pathLocal0 = new File(outBaseDir, "local0.cdf"); FileFragment local0 = new FileFragment(pathLocal0); - local0.addChild("testVar1").setArray(Array.factory(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); + local0.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); //create two Filefragments at the same level with equally named variables File pathLocal1 = new File(outBaseDir, "local1.cdf"); @@ -299,7 +299,7 @@ public void testBreadthFirstDifferentDepthSearch() { File pathLocal2 = new File(outBaseDir, "local2.cdf"); FileFragment local2 = new FileFragment(pathLocal2); - local2.addChild("testVar1").setArray(Array.factory(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); + local2.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); File pathLocal3 = new File(new File(outBaseDir, "subdir"), "local3.cdf"); FileFragment local3 = new FileFragment(pathLocal3); @@ -326,7 +326,7 @@ public void testBreadthFirstSameDepthSearch() { File pathLocal0 = new File(outBaseDir, "local0.cdf"); FileFragment local0 = new FileFragment(pathLocal0); - local0.addChild("testVar1").setArray(Array.factory(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); + local0.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{876, 986123.8, 21986.856, 79006.8613, 897123.123})); //create two Filefragments at the same level with equally named variables File pathLocal1 = new File(outBaseDir, "local1.cdf"); @@ -336,7 +336,7 @@ public void testBreadthFirstSameDepthSearch() { File pathLocal2 = new File(outBaseDir, "local2.cdf"); FileFragment local2 = new FileFragment(pathLocal2); local2.addSourceFile(local1); - local2.addChild("testVar1").setArray(Array.factory(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); + local2.addChild("testVar1").setArray(Array.makeFromJavaArray(new double[]{7889, 986123.8, 21986.856, 79006.8613, 897123.123})); File pathLocal3 = new File(new File(outBaseDir, "subdir"), "local3.cdf"); FileFragment local3 = new FileFragment(pathLocal3); @@ -403,18 +403,18 @@ public IFileFragment createTestFragment(File folder) { IFileFragment f = new FileFragment(folder, "testFragment.cdf"); f.addChild("variable1").setIndex(f.addChild("indexVar1")); List l1 = new ArrayList<>(); - l1.add(Array.factory(new double[]{1.2, 1.5})); - l1.add(Array.factory(new double[]{2.2, 2.6, 2.87})); - l1.add(Array.factory(new double[]{3.67})); + l1.add(Array.makeFromJavaArray(new double[]{1.2, 1.5})); + l1.add(Array.makeFromJavaArray(new double[]{2.2, 2.6, 2.87})); + l1.add(Array.makeFromJavaArray(new double[]{3.67})); f.getChild("variable1").setIndexedArray(l1); f.addChild("variable2").setIndex(f.getChild("indexVar1")); List l2 = new ArrayList<>(); - l2.add(Array.factory(new int[]{1, 1})); - l2.add(Array.factory(new int[]{2, 2, 2})); - l2.add(Array.factory(new int[]{3})); + l2.add(Array.makeFromJavaArray(new int[]{1, 1})); + l2.add(Array.makeFromJavaArray(new int[]{2, 2, 2})); + l2.add(Array.makeFromJavaArray(new int[]{3})); f.getChild("variable2").setIndexedArray(l2); - f.addChild("variable3").setArray(Array.factory(new double[]{2, 3.3, 235.32, 352.3})); - f.getChild("indexVar1").setArray(Array.factory(new int[]{2, 3, 1})); + f.addChild("variable3").setArray(Array.makeFromJavaArray(new double[]{2, 3.3, 235.32, 352.3})); + f.getChild("indexVar1").setArray(Array.makeFromJavaArray(new int[]{2, 3, 1})); return f; } diff --git a/cross-main/src/test/java/cross/io/misc/ArrayChunkIteratorTest.java b/cross-main/src/test/java/cross/io/misc/ArrayChunkIteratorTest.java index 887a979..78ca3d3 100644 --- a/cross-main/src/test/java/cross/io/misc/ArrayChunkIteratorTest.java +++ b/cross-main/src/test/java/cross/io/misc/ArrayChunkIteratorTest.java @@ -120,7 +120,7 @@ private void testChunkIterator(int length, int chunksize) { testVar.setArray(ref); ArrayChunkIterator aci = new ArrayChunkIterator(Factory.getInstance(), testVar, chunksize);//21 chunks, 20 of size 10 and one of size 5 int idx = 0; - Array reconstructedRef = Array.factory(DataType.getType(ref.getElementType()), ref.getShape()); + Array reconstructedRef = Array.factory(ref.getDataType(), ref.getShape()); List arrayChunks = new ArrayList<>(); while (aci.hasNext()) { Array chunk = aci.next(); diff --git a/cross-main/src/test/java/cross/io/xml/FragmentXMLSerializerTest.java b/cross-main/src/test/java/cross/io/xml/FragmentXMLSerializerTest.java index dff5f8b..c87176f 100644 --- a/cross-main/src/test/java/cross/io/xml/FragmentXMLSerializerTest.java +++ b/cross-main/src/test/java/cross/io/xml/FragmentXMLSerializerTest.java @@ -128,18 +128,18 @@ public File[] getFiles() { IFileFragment f = new FileFragment(tf.newFolder(), "testFragment.maltcms.xml"); f.addChild("variable1").setIndex(f.addChild("indexVar1")); List l1 = new ArrayList<>(); - l1.add(Array.factory(new double[]{1.2, 1.5})); - l1.add(Array.factory(new double[]{2.2, 2.6, 2.87})); - l1.add(Array.factory(new double[]{3.67})); + l1.add(Array.makeFromJavaArray(new double[]{1.2, 1.5})); + l1.add(Array.makeFromJavaArray(new double[]{2.2, 2.6, 2.87})); + l1.add(Array.makeFromJavaArray(new double[]{3.67})); f.getChild("variable1").setIndexedArray(l1); f.addChild("variable2").setIndex(f.getChild("indexVar1")); List l2 = new ArrayList<>(); - l2.add(Array.factory(new int[]{1, 1})); - l2.add(Array.factory(new int[]{2, 2, 2})); - l2.add(Array.factory(new int[]{3})); + l2.add(Array.makeFromJavaArray(new int[]{1, 1})); + l2.add(Array.makeFromJavaArray(new int[]{2, 2, 2})); + l2.add(Array.makeFromJavaArray(new int[]{3})); f.getChild("variable2").setIndexedArray(l2); - f.addChild("variable3").setArray(Array.factory(new double[]{2, 3.3, 235.32, 352.3})); - f.getChild("indexVar1").setArray(Array.factory(new int[]{2, 3, 1})); + f.addChild("variable3").setArray(Array.makeFromJavaArray(new double[]{2, 3.3, 235.32, 352.3})); + f.getChild("indexVar1").setArray(Array.makeFromJavaArray(new int[]{2, 3, 1})); final Element maltcms = new Element("maltcms"); final Document doc = new Document(maltcms); @@ -360,7 +360,7 @@ public IFileFragment createTestFragment(URI uri, List variableNames, Map //variable2 VariableFragment ivf2 = new VariableFragment(ff, "variable2"); ivf2.setDimensions(new Dimension[]{dim3}); - ArrayInt.D1 arr2 = new ArrayInt.D1(dim3.getLength()); + ArrayInt.D1 arr2 = new ArrayInt.D1(dim3.getLength(), false); ivf2.setArray(arr2); usedDimensions.put("variable2", copyDims(dim3)); variableNames.add("variable2"); @@ -372,7 +372,7 @@ public IFileFragment createTestFragment(URI uri, List variableNames, Map //variable3 - no explicit dimension VariableFragment ivf3 = new VariableFragment(ff, "variable3"); - ArrayInt.D2 arr3 = new ArrayInt.D2(25, 17); + ArrayInt.D2 arr3 = new ArrayInt.D2(25, 17, false); ivf3.setArray(arr3); variableNames.add("variable3"); @@ -380,7 +380,7 @@ public IFileFragment createTestFragment(URI uri, List variableNames, Map VariableFragment ivf4 = new VariableFragment(ff, "variable4"); ivf4.setDimensions(new Dimension[]{dim5}); List arrays = new ArrayList<>(); - ArrayInt.D1 index = new ArrayInt.D1(24); + ArrayInt.D1 index = new ArrayInt.D1(24, false); int offset = 0; for (int i = 0; i < 24; i++) { index.set(i, offset); @@ -701,11 +701,11 @@ public void testMultiChainedReadWrite() { //create a shadowing variable IVariableFragment shadow = new VariableFragment(work, "shadow-" + i); - shadow.setArray(Array.factory(new int[]{j})); + shadow.setArray(Array.makeFromJavaArray(new int[]{j})); //create unique variable IVariableFragment unique = new VariableFragment(work, "unique-" + j); - unique.setArray(Array.factory(new int[]{i, j})); + unique.setArray(Array.makeFromJavaArray(new int[]{i, j})); System.out.println(work.toString()); getDataSource().write(work); work.clearArrays(); @@ -837,19 +837,19 @@ public IFileFragment createInvalidIndexTestFragment() { IFileFragment f = new FileFragment(new File(folder, "invalidIndexTestFrag.maltcms.xml")); f.addChild("variable1").setIndex(f.addChild("indexVar1")); List l1 = new ArrayList<>(); - l1.add(Array.factory(new double[]{1.2, 1.5})); - l1.add(Array.factory(new double[]{2.2, 2.6, 2.87})); - l1.add(Array.factory(new double[]{3.67})); + l1.add(Array.makeFromJavaArray(new double[]{1.2, 1.5})); + l1.add(Array.makeFromJavaArray(new double[]{2.2, 2.6, 2.87})); + l1.add(Array.makeFromJavaArray(new double[]{3.67})); f.getChild("variable1").setIndexedArray(l1); f.addChild("variable2").setIndex(f.addChild("indexVar2")); List l2 = new ArrayList<>(); - l2.add(Array.factory(new int[]{1, 1})); - l2.add(Array.factory(new int[]{2, 2, 2})); - l2.add(Array.factory(new int[]{3})); + l2.add(Array.makeFromJavaArray(new int[]{1, 1})); + l2.add(Array.makeFromJavaArray(new int[]{2, 2, 2})); + l2.add(Array.makeFromJavaArray(new int[]{3})); f.getChild("variable2").setIndexedArray(l2); - f.addChild("variable3").setArray(Array.factory(new double[]{2, 3.3, 235.32, 352.3})); - f.getChild("indexVar1").setArray(Array.factory(new int[]{2, 3, 1, 4})); - f.getChild("indexVar2").setArray(Array.factory(new int[]{2, 3})); + f.addChild("variable3").setArray(Array.makeFromJavaArray(new double[]{2, 3.3, 235.32, 352.3})); + f.getChild("indexVar1").setArray(Array.makeFromJavaArray(new int[]{2, 3, 1, 4})); + f.getChild("indexVar2").setArray(Array.makeFromJavaArray(new int[]{2, 3})); return f; } catch (IOException ioex) { throw new RuntimeException(ioex); @@ -884,18 +884,18 @@ public IFileFragment createTestFragment() { IFileFragment f = new FileFragment(new File(folder, "testFrag.maltcms.xml")); f.addChild("variable1").setIndex(f.addChild("indexVar1")); List l1 = new ArrayList<>(); - l1.add(Array.factory(new double[]{1.2, 1.5})); - l1.add(Array.factory(new double[]{2.2, 2.6, 2.87})); - l1.add(Array.factory(new double[]{3.67})); + l1.add(Array.makeFromJavaArray(new double[]{1.2, 1.5})); + l1.add(Array.makeFromJavaArray(new double[]{2.2, 2.6, 2.87})); + l1.add(Array.makeFromJavaArray(new double[]{3.67})); f.getChild("variable1").setIndexedArray(l1); f.addChild("variable2").setIndex(f.getChild("indexVar1")); List l2 = new ArrayList<>(); - l2.add(Array.factory(new int[]{1, 1})); - l2.add(Array.factory(new int[]{2, 2, 2})); - l2.add(Array.factory(new int[]{3})); + l2.add(Array.makeFromJavaArray(new int[]{1, 1})); + l2.add(Array.makeFromJavaArray(new int[]{2, 2, 2})); + l2.add(Array.makeFromJavaArray(new int[]{3})); f.getChild("variable2").setIndexedArray(l2); - f.addChild("variable3").setArray(Array.factory(new double[]{2, 3.3, 235.32, 352.3})); - f.getChild("indexVar1").setArray(Array.factory(new int[]{2, 3, 1})); + f.addChild("variable3").setArray(Array.makeFromJavaArray(new double[]{2, 3.3, 235.32, 352.3})); + f.getChild("indexVar1").setArray(Array.makeFromJavaArray(new int[]{2, 3, 1})); return f; } catch (IOException ioex) { throw new RuntimeException(ioex); diff --git a/cross-math/pom.xml b/cross-math/pom.xml index fdd0976..8904423 100644 --- a/cross-math/pom.xml +++ b/cross-math/pom.xml @@ -4,7 +4,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-math Cross Math diff --git a/cross-nbm-cluster/apache-commons-nbm/pom.xml b/cross-nbm-cluster/apache-commons-nbm/pom.xml index 7b51625..be74a78 100644 --- a/cross-nbm-cluster/apache-commons-nbm/pom.xml +++ b/cross-nbm-cluster/apache-commons-nbm/pom.xml @@ -4,11 +4,11 @@ cross-nbm-cluster io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT apache-commons-nbm - 2.0.1 + 2.0.2-SNAPSHOT nbm Lib Apache Commons @@ -65,6 +65,21 @@ commons-math ${version.apache.commons.math} + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.apache.httpcomponents + httpcore + 4.4.13 + + + org.apache.httpcomponents + httpmime + 4.4.1 + @@ -79,6 +94,7 @@ maltcms org.apache.commons.* + org.apache.http.* maltcms diff --git a/cross-nbm-cluster/cross-nbm/pom.xml b/cross-nbm-cluster/cross-nbm/pom.xml index b1a7769..9654920 100644 --- a/cross-nbm-cluster/cross-nbm/pom.xml +++ b/cross-nbm-cluster/cross-nbm/pom.xml @@ -4,11 +4,11 @@ cross-nbm-cluster io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-nbm - 2.0.1 + 2.0.2-SNAPSHOT nbm Lib Cross diff --git a/cross-nbm-cluster/mpaxs-nbm/pom.xml b/cross-nbm-cluster/mpaxs-nbm/pom.xml index f80e87d..c2f91a8 100644 --- a/cross-nbm-cluster/mpaxs-nbm/pom.xml +++ b/cross-nbm-cluster/mpaxs-nbm/pom.xml @@ -4,10 +4,10 @@ cross-nbm-cluster io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-nbm - 2.0.1 + 2.0.2-SNAPSHOT nbm Lib Mpaxs diff --git a/cross-nbm-cluster/netcdf-nbm/pom.xml b/cross-nbm-cluster/netcdf-nbm/pom.xml index 6cf981e..b06f404 100644 --- a/cross-nbm-cluster/netcdf-nbm/pom.xml +++ b/cross-nbm-cluster/netcdf-nbm/pom.xml @@ -4,11 +4,11 @@ cross-nbm-cluster io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT netcdf-nbm - 2.0.1 + 2.0.2-SNAPSHOT nbm Lib Netcdf @@ -18,7 +18,11 @@ edu.ucar - netcdfAll + cdm-core + + + edu.ucar + netcdf4 io.github.nilshoffmann diff --git a/cross-nbm-cluster/pom.xml b/cross-nbm-cluster/pom.xml index 73df6f5..ac4e2b9 100644 --- a/cross-nbm-cluster/pom.xml +++ b/cross-nbm-cluster/pom.xml @@ -4,7 +4,7 @@ io.github.nilshoffmann cross - 2.0.1 + 2.0.2-SNAPSHOT cross-nbm-cluster diff --git a/cross-nbm-cluster/slf4j-nbm/pom.xml b/cross-nbm-cluster/slf4j-nbm/pom.xml index ee0b324..0afb660 100644 --- a/cross-nbm-cluster/slf4j-nbm/pom.xml +++ b/cross-nbm-cluster/slf4j-nbm/pom.xml @@ -5,11 +5,11 @@ cross-nbm-cluster io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT slf4j-nbm - 2.0.1 + 2.0.2-SNAPSHOT nbm Lib Slf4j diff --git a/cross-test/pom.xml b/cross-test/pom.xml index 30ee07b..bdc43b6 100644 --- a/cross-test/pom.xml +++ b/cross-test/pom.xml @@ -3,7 +3,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-test jar diff --git a/cross-tools/pom.xml b/cross-tools/pom.xml index 773a72d..474a505 100644 --- a/cross-tools/pom.xml +++ b/cross-tools/pom.xml @@ -3,7 +3,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT cross-tools jar diff --git a/mpaxs/mpaxs-api/pom.xml b/mpaxs/mpaxs-api/pom.xml index c5c4d0b..3d3d96b 100644 --- a/mpaxs/mpaxs-api/pom.xml +++ b/mpaxs/mpaxs-api/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-api mpaxs-api diff --git a/mpaxs/mpaxs-computeHost/pom.xml b/mpaxs/mpaxs-computeHost/pom.xml index 879edcb..0e86d1e 100644 --- a/mpaxs/mpaxs-computeHost/pom.xml +++ b/mpaxs/mpaxs-computeHost/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-computeHost mpaxs-computeHost diff --git a/mpaxs/mpaxs-distribution/pom.xml b/mpaxs/mpaxs-distribution/pom.xml index be1bb7f..0e9ba92 100644 --- a/mpaxs/mpaxs-distribution/pom.xml +++ b/mpaxs/mpaxs-distribution/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-distribution mpaxs-distribution diff --git a/mpaxs/mpaxs-server/pom.xml b/mpaxs/mpaxs-server/pom.xml index ec25ad0..52630c9 100644 --- a/mpaxs/mpaxs-server/pom.xml +++ b/mpaxs/mpaxs-server/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-server mpaxs-server diff --git a/mpaxs/mpaxs-spi/pom.xml b/mpaxs/mpaxs-spi/pom.xml index e82b174..036148c 100644 --- a/mpaxs/mpaxs-spi/pom.xml +++ b/mpaxs/mpaxs-spi/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-spi mpaxs-spi diff --git a/mpaxs/mpaxs-test/pom.xml b/mpaxs/mpaxs-test/pom.xml index 3f1b54e..4836c1e 100644 --- a/mpaxs/mpaxs-test/pom.xml +++ b/mpaxs/mpaxs-test/pom.xml @@ -4,7 +4,7 @@ mpaxs io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs-test mpaxs-test diff --git a/mpaxs/pom.xml b/mpaxs/pom.xml index dc59df9..bec4aeb 100644 --- a/mpaxs/pom.xml +++ b/mpaxs/pom.xml @@ -5,7 +5,7 @@ cross io.github.nilshoffmann - 2.0.1 + 2.0.2-SNAPSHOT mpaxs diff --git a/pom.xml b/pom.xml index 598b6b3..1c34891 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.nilshoffmann cross pom - 2.0.1 + 2.0.2-SNAPSHOT Cross This is the Cross maven3 project. Cross provides Spring framework integration and infrastructure for worfklow-based processing of data. @@ -867,10 +867,22 @@ cdm-core 5.3.3 --> - + + + edu.ucar + cdm-core + ${version.netcdf} + compile + + + edu.ucar + netcdf4 + ${version.netcdf} + runtime org.springframework @@ -996,11 +1008,12 @@ 17 cross 6.0.10 + 5.5.3 ${project.version} 2.0.7 4.13.1 RELEASE180 - 1.18.28 + 1.18.32 1.3.1 2.2