Eliminate warnings with latest Eclipse

eclipse-emf · Feb 3, 2024 · 602096e · 602096e
1 parent c2aa1b6
commit 602096e
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 46 deletions.
diff --git a/features/org.eclipse.emf.converter-feature/feature.xml b/features/org.eclipse.emf.converter-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.converter"
       label="%featureName"
-      version="2.19.0.qualifier"
+      version="2.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">

diff --git a/features/org.eclipse.emf.converter-feature/pom.xml b/features/org.eclipse.emf.converter-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.converter</artifactId>
-  <version>2.19.0-SNAPSHOT</version>
+  <version>2.20.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.converter; singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.converter.ConverterPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.converter;version="2.12.0",
- org.eclipse.emf.converter.ui;version="2.12.0",
- org.eclipse.emf.converter.ui.contribution;version="2.12.0",
- org.eclipse.emf.converter.ui.contribution.base;version="2.12.0",
- org.eclipse.emf.converter.util;version="2.12.0"
+Export-Package: org.eclipse.emf.converter;version="2.13.0",
+ org.eclipse.emf.converter.ui;version="2.13.0",
+ org.eclipse.emf.converter.ui.contribution;version="2.13.0",
+ org.eclipse.emf.converter.ui.contribution.base;version="2.13.0",
+ org.eclipse.emf.converter.util;version="2.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.codegen.ecore;bundle-version="[2.33.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.37.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.33.0,3.0.0)";resolution:=optional
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.37.0,3.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.converter
diff --git a/plugins/org.eclipse.emf.converter/pom.xml b/plugins/org.eclipse.emf.converter/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.converter</artifactId>
-  <version>2.12.0-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/...emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java b/...emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java
@@ -14,6 +14,15 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
+import org.eclipse.emf.converter.ConverterPlugin;
+import org.eclipse.emf.converter.ui.contribution.ModelConverterDescriptor;
+import org.eclipse.emf.converter.ui.contribution.ModelConverterManager;
+import org.eclipse.emf.converter.ui.contribution.ModelConverterManager.ModelConverterDescriptorWizardNode;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -40,15 +49,6 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWizard;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
-import org.eclipse.emf.converter.ConverterPlugin;
-import org.eclipse.emf.converter.ui.contribution.ModelConverterDescriptor;
-import org.eclipse.emf.converter.ui.contribution.ModelConverterManager;
-import org.eclipse.emf.converter.ui.contribution.ModelConverterManager.ModelConverterDescriptorWizardNode;
 import org.osgi.service.prefs.BackingStoreException;
 
 /**
@@ -129,7 +129,7 @@ public String getLastModelConverterDescriptorId()
   }
 
   @SuppressWarnings("deprecation")
-  private static final InstanceScope INSTANCE_SCOPE = new InstanceScope();
+  private static final IScopeContext INSTANCE_SCOPE = new InstanceScope();
 
   public void performFinish()
   {

diff --git a/...ins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/ContentHandlerImpl.java b/...ins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/ContentHandlerImpl.java
@@ -192,7 +192,6 @@ protected String getLineDelimiter(URI uri, InputStream inputStream, Map<?, ?> op
    */
   public static String getLineDelimiter(InputStream inputStream, String charset) throws IOException
   {
-    @SuppressWarnings("resource")
     Reader reader = charset == null ? new InputStreamReader(inputStream) : new InputStreamReader(inputStream, charset);
     char [] text = new char [4048];
     char target = 0;

diff --git a/plugins/org.eclipse.emf.exporter/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.exporter/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.exporter; singleton:=true
-Bundle-Version: 2.11.0.qualifier
+Bundle-Version: 2.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.exporter.ExporterPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.exporter;version="2.11.0",
- org.eclipse.emf.exporter.ui;version="2.11.0",
- org.eclipse.emf.exporter.ui.contribution;version="2.11.0",
- org.eclipse.emf.exporter.ui.contribution.base;version="2.11.0",
- org.eclipse.emf.exporter.util;version="2.11.0"
+Export-Package: org.eclipse.emf.exporter;version="2.12.0",
+ org.eclipse.emf.exporter.ui;version="2.12.0",
+ org.eclipse.emf.exporter.ui.contribution;version="2.12.0",
+ org.eclipse.emf.exporter.ui.contribution.base;version="2.12.0",
+ org.eclipse.emf.exporter.util;version="2.12.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.converter;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.converter;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.33.0,3.0.0)";resolution:=optional
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.37.0,3.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.exporter
diff --git a/plugins/org.eclipse.emf.exporter/pom.xml b/plugins/org.eclipse.emf.exporter/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.exporter</artifactId>
-  <version>2.11.0-SNAPSHOT</version>
+  <version>2.12.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/...e.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java b/...e.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java
@@ -14,10 +14,8 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IPreferencesService;
+import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
 import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
@@ -28,6 +26,8 @@
 import org.eclipse.emf.converter.ui.contribution.base.ModelConverterWizard;
 import org.eclipse.emf.exporter.ExporterPlugin;
 import org.eclipse.emf.exporter.ModelExporter;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IWorkbench;
 import org.osgi.service.prefs.BackingStoreException;
 
 
@@ -98,7 +98,7 @@ protected void readPreferencesSettings()
   }
 
   @SuppressWarnings("deprecation")
-  private static final InstanceScope INSTANCE_SCOPE = new InstanceScope();
+  private static final IScopeContext INSTANCE_SCOPE = new InstanceScope();
 
   protected void writePreferencesSettings()
   {

diff --git a/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.importer.rose; singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.importer.rose.RoseImporterPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.importer.rose;version="2.12.0",
- org.eclipse.emf.importer.rose.builder;version="2.12.0",
- org.eclipse.emf.importer.rose.parser;version="2.12.0",
- org.eclipse.emf.importer.rose.taskdefs;version="2.12.0",
- org.eclipse.emf.importer.rose.ui;version="2.12.0"
+Export-Package: org.eclipse.emf.importer.rose;version="2.13.0",
+ org.eclipse.emf.importer.rose.builder;version="2.13.0",
+ org.eclipse.emf.importer.rose.parser;version="2.13.0",
+ org.eclipse.emf.importer.rose.taskdefs;version="2.13.0",
+ org.eclipse.emf.importer.rose.ui;version="2.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.importer;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.33.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.37.0,3.0.0)";resolution:=optional,
  org.apache.ant;bundle-version="[1.7.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.ant;bundle-version="[2.12.0,3.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.emf.importer.rose/pom.xml b/plugins/org.eclipse.emf.importer.rose/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.importer.rose</artifactId>
-  <version>2.12.0-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/...ns/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseLoader.java b/...ns/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseLoader.java
@@ -84,7 +84,8 @@ public RoseLoader(String fileName, URIConverter uriConverter) throws Exception
         }
         if (inputStream != null)
         {
-          bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+          InputStreamReader in = new InputStreamReader(inputStream);
+          bufferedReader = new BufferedReader(in);
           valid = true;
           length = inputStream.available();
           currentLength = 0;

diff --git a/releng/org.eclipse.emf.site/Runtime Workspace.launch b/releng/org.eclipse.emf.site/Runtime Workspace.launch
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
     <setAttribute key="additional_plugins">
-        <setEntry value="com.ibm.icu:73.2.0:default:true:default:default"/>
+        <setEntry value="com.ibm.icu:74.2.0:default:true:default:default"/>
         <setEntry value="jakarta.inject.jakarta.inject-api:2.0.1:default:true:default:default"/>
         <setEntry value="org.aopalliance:1.0.0.v20230720-0728:default:true:default:default"/>
-        <setEntry value="org.objectweb.asm:9.5.0:default:true:default:default"/>
+        <setEntry value="org.objectweb.asm:9.6.0:default:true:default:default"/>
     </setAttribute>
     <booleanAttribute key="append.args" value="true"/>
     <booleanAttribute key="askclear" value="true"/>