Xtext bump (2.14.0) (#6211)

* bump Xtext (2.14.0)

Signed-off-by: Markus Rathgeb <[email protected]>

bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF

@@ -1,59 +1,56 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Item Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.item;singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model,
- org.eclipse.smarthome.model.formatting,
- org.eclipse.smarthome.model.generator,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.items,
- org.eclipse.smarthome.model.items.impl,
- org.eclipse.smarthome.model.items.util,
- org.eclipse.smarthome.model.parser.antlr,
- org.eclipse.smarthome.model.parser.antlr.internal,
- org.eclipse.smarthome.model.scoping,
- org.eclipse.smarthome.model.serializer,
- org.eclipse.smarthome.model.services,
- org.eclipse.smarthome.model.validation
-Import-Package: 
- javax.measure,
- javax.measure.quantity,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.config.core,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.i18n,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.items.dto,
- org.eclipse.smarthome.core.library.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.thing.util,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.core.types.util,
- org.eclipse.smarthome.model.core,
- org.eclipse.smarthome.model.core.valueconverter,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.slf4j
-Require-Bundle: 
- com.ibm.icu;resolution:=optional,
- org.antlr.runtime,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.item
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Item Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.item;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model,
+ org.eclipse.smarthome.model.formatting,
+ org.eclipse.smarthome.model.generator,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.items,
+ org.eclipse.smarthome.model.items.impl,
+ org.eclipse.smarthome.model.items.util,
+ org.eclipse.smarthome.model.parser.antlr,
+ org.eclipse.smarthome.model.parser.antlr.internal,
+ org.eclipse.smarthome.model.scoping,
+ org.eclipse.smarthome.model.serializer,
+ org.eclipse.smarthome.model.services,
+ org.eclipse.smarthome.model.validation
+Import-Package: javax.measure,
+ javax.measure.quantity,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.config.core,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.i18n,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.items.dto,
+ org.eclipse.smarthome.core.library.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.thing.util,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.core.types.util,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.smarthome.model.core.valueconverter,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.slf4j
+Require-Bundle: com.ibm.icu;resolution:=optional,
+ org.antlr.runtime,
+ org.apache.commons.logging;resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.item

bundles/model/org.eclipse.smarthome.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java

@@ -99,7 +99,7 @@ public URI toUri(String pathWithScheme) {
         }
         logger.debug("Path mapping could not be done for '{}', leaving it untouched", pathWithScheme);
         java.net.URI javaNetUri = java.net.URI.create(pathWithScheme);
-        return URI.createURI(super.toPath(javaNetUri));
+        return URI.createURI(toPathAsInXtext212(javaNetUri));
     }
 
     protected final String removeTrailingSlash(String path) {
@@ -158,7 +158,7 @@ private int getLastPathSegmentIndex(String currentPath) {
     private URI map(String pathWithScheme) {
         java.net.URI javaNetUri = toURI(pathWithScheme, clientLocation);
         logger.trace("Going to map path {}", javaNetUri);
-        URI ret = URI.createURI(super.toPath(javaNetUri));
+        URI ret = URI.createURI(toPathAsInXtext212(javaNetUri));
         logger.trace("Mapped path {} to {}", pathWithScheme, ret);
         return ret;
     }
@@ -167,4 +167,26 @@ private java.net.URI toURI(String pathWithScheme, String currentPath) {
         return java.net.URI.create(pathWithScheme.replace(currentPath, serverLocation));
     }
 
+    private String toPathAsInXtext212(java.net.URI uri) {
+        // org.eclipse.xtext.ide.server.UriExtensions:
+        // In Xtext 2.14 the method "String toPath(java.netURI)" has been deprecated but still exist.
+        // It delegate the logic internally to the new method "String toUriString(java.net.URI uri)".
+        // That new method seems to return a different result for folder / directories with respect to
+        // the present / absent of a trailing slash.
+
+        // The old logic removes trailing slashes if it has been present in the input.
+        // The new logic keeps trailing slashes if it has been present in the input.
+
+        // input: file:///d/
+        // output old: file:///d
+        // output new: file:///d
+
+        // input: file:///d/
+        // output old: file:///d
+        // output new: file:///d/
+
+        // We use this method now to keep the old behavior.
+        return Paths.get(uri).toUri().toString();
+    }
+
 }

bundles/model/org.eclipse.smarthome.model.persistence/META-INF/MANIFEST.MF

@@ -1,70 +1,65 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: lib/joda-time-2.9.2.jar,.
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Persistence Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.persistence;singleton:=
- true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model.persistence,
- org.eclipse.smarthome.model.persistence.extensions,
- org.eclipse.smarthome.model.persistence.formatting,
- org.eclipse.smarthome.model.persistence.generator,
- org.eclipse.smarthome.model.persistence.parser.antlr,
- org.eclipse.smarthome.model.persistence.parser.antlr.internal,
- org.eclipse.smarthome.model.persistence.persistence,
- org.eclipse.smarthome.model.persistence.persistence.impl,
- org.eclipse.smarthome.model.persistence.persistence.util,
- org.eclipse.smarthome.model.persistence.scoping,
- org.eclipse.smarthome.model.persistence.serializer,
- org.eclipse.smarthome.model.persistence.services,
- org.eclipse.smarthome.model.persistence.validation,
- org.joda.time,
- org.joda.time.base,
- org.joda.time.chrono,
- org.joda.time.convert,
- org.joda.time.field,
- org.joda.time.format,
- org.joda.time.tz
-Import-Package: 
- com.google.common.base,
- com.google.common.collect,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.events,
- org.eclipse.smarthome.core.i18n,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.persistence,
- org.eclipse.smarthome.core.persistence.config,
- org.eclipse.smarthome.core.persistence.strategy,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.model.core,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.osgi.service.cm,
- org.osgi.service.event,
- org.slf4j
-Require-Bundle: 
- org.antlr.runtime,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;vis
- ibility:=reexport,
- org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.persistence
+Manifest-Version: 1.0
+Bundle-ClassPath: lib/joda-time-2.9.2.jar,.
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Persistence Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.persistence;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model.persistence,
+ org.eclipse.smarthome.model.persistence.extensions,
+ org.eclipse.smarthome.model.persistence.formatting,
+ org.eclipse.smarthome.model.persistence.generator,
+ org.eclipse.smarthome.model.persistence.parser.antlr,
+ org.eclipse.smarthome.model.persistence.parser.antlr.internal,
+ org.eclipse.smarthome.model.persistence.persistence,
+ org.eclipse.smarthome.model.persistence.persistence.impl,
+ org.eclipse.smarthome.model.persistence.persistence.util,
+ org.eclipse.smarthome.model.persistence.scoping,
+ org.eclipse.smarthome.model.persistence.serializer,
+ org.eclipse.smarthome.model.persistence.services,
+ org.eclipse.smarthome.model.persistence.validation,
+ org.joda.time,
+ org.joda.time.base,
+ org.joda.time.chrono,
+ org.joda.time.convert,
+ org.joda.time.field,
+ org.joda.time.format,
+ org.joda.time.tz
+Import-Package: com.google.common.base,
+ com.google.common.collect,
+ org.apache.commons.logging,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.events,
+ org.eclipse.smarthome.core.i18n,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.persistence,
+ org.eclipse.smarthome.core.persistence.config,
+ org.eclipse.smarthome.core.persistence.strategy,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.osgi.service.cm,
+ org.osgi.service.event,
+ org.slf4j
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.persistence