diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle index 68c806628b..5a0282fb7d 100644 --- a/gradle/any/shared-mvn-coords.gradle +++ b/gradle/any/shared-mvn-coords.gradle @@ -18,7 +18,7 @@ ext { // best we can do is define the version here, which can then be applied in all of the places we need the full maven // coords. depVersion = [:] - depVersion.slf4j = '1.7.28' + depVersion.slf4j = '2.0.17' depVersion.protobuf = '3.25.5' depVersion.grpc = '1.60.0' } diff --git a/netcdf-java-platform/build.gradle b/netcdf-java-platform/build.gradle index cc61749ee3..6ec42da83a 100644 --- a/netcdf-java-platform/build.gradle +++ b/netcdf-java-platform/build.gradle @@ -76,7 +76,7 @@ dependencies { // netcdf-java logging api "org.slf4j:slf4j-api:${depVersion.slf4j}" - runtime 'ch.qos.logback:logback-classic:1.5.14' + runtime 'ch.qos.logback:logback-classic:1.3.15' // legacy gradle module // todo: remove with legacy in 6 diff --git a/uicdm/build.gradle b/uicdm/build.gradle index 3b4dacbc0a..a089553640 100644 --- a/uicdm/build.gradle +++ b/uicdm/build.gradle @@ -40,6 +40,7 @@ dependencies { testImplementation 'junit:junit' runtimeOnly project(':cdm:cdm-s3') + runtimeOnly project(':cdm:cdm-zarr') // constrained by netcdf-java-platform runtimeOnly 'ch.qos.logback:logback-classic' diff --git a/uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java b/uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java index 3eb8f6d5cf..5d748826c0 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java +++ b/uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java @@ -12,8 +12,7 @@ import ucar.nc2.ft2.coverage.*; import ucar.ui.widget.*; import ucar.ui.widget.PopupMenu; -import ucar.nc2.util.Misc; -import ucar.nc2.util.NamedObject; +import ucar.util.NamedObject; import ucar.util.prefs.PreferencesExt; import ucar.ui.prefs.BeanTable; import javax.swing.*; diff --git a/uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java b/uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java index 29cc59e9ab..ca30e2dbf3 100644 --- a/uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java +++ b/uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java @@ -1,10 +1,13 @@ /* + * Copyright (c) 1998-2025 John Caron and University Corporation for Atmospheric Research/Unidata + * See LICENSE for license information. + * * Created by JFormDesigner on Thu Nov 15 14:02:02 MST 2012 */ package ucar.nc2.ui.dialog; -import ucar.nc2.NetcdfFileWriter; +import java.util.Arrays; import ucar.nc2.util.ListenerManager; import ucar.nc2.write.Nc4Chunking; import javax.swing.*; @@ -44,8 +47,8 @@ public void setOutputFilename(String filename) { location = location.substring(0, pos); // change suffix - NetcdfFileWriter.Version version = (NetcdfFileWriter.Version) netcdfVersion.getSelectedItem(); - String suffix = (version == null) ? ".nc" : version.getSuffix(); + NetcdfFileFormat version = (NetcdfFileFormat) netcdfVersion.getSelectedItem(); + String suffix = (version != null && version.isNetcdf4Format()) ? ".nc4" : ".nc"; if (filename.endsWith(".nc") && suffix.equals(".nc")) suffix = ".sub.nc"; location += suffix; @@ -105,10 +108,11 @@ private void initComponents() { label1 = new JLabel(); outputFilename = new JTextField(); label2 = new JLabel(); - netcdfVersion = new JComboBox(NetcdfFileWriter.Version.values()); + netcdfVersion = new JComboBox<>( + Arrays.stream(NetcdfFileFormat.values()).filter(format -> format != NetcdfFileFormat.INVALID).toArray()); panel1 = new JPanel(); label3 = new JLabel(); - chunking = new JComboBox(Nc4Chunking.Strategy.values()); + chunking = new JComboBox<>(Nc4Chunking.Strategy.values()); deflate = new JCheckBox(); shuffle = new JCheckBox(); buttonBar = new JPanel();