Google Git
Sign in
eclipse/gerrit/papyrus/org.eclipse.papyrus-collaborativemodeling/4ce0d5afb36fa2cefe2a6e3b3e75bec048f3df42^!/.
commit
4ce0d5afb36fa2cefe2a6e3b3e75bec048f3df42
[log]
author
Vincent Lorenzo <vincent.lorenzo@cea.fr>
Thu May 06 14:47:29 2021 +0200
committer
Vincent Lorenzo <vincent.lorenzo@cea.fr>
Thu May 06 14:48:27 2021 +0200
tree
8b02c2559ca0a2319625a1fe1bdd8c65ca2722c9
parent
d06f32414cb784c62e15f29b49198c7b8739b340 [diff]
[Releng] Update CDO Server dependencies to Eclipse latest (2021-03)

Change-Id: I74b15101051f0722d8d825a3e5044753b0df8518
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath
index 075009d..bc3587d 100644
--- a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..7adc0fb 100644
--- a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF
index b39821d..1ba4d11 100644
--- a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF

@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.server.h2;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",

diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml
index 80f4a3c..786672b 100644
--- a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml

@@ -1,13 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
 		<groupId>org.eclipse.papyrus.cdo.server.bundles</groupId>
 		<artifactId>org.eclipse.papyrus.cdo.server.bundles</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-  <groupId>org.eclipse.papyrus.cdo.server.h2</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.server.h2</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <version>1.0.0-SNAPSHOT</version>
+	<groupId>org.eclipse.papyrus.cdo.server.h2</groupId>
+	<artifactId>org.eclipse.papyrus.cdo.server.h2</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>1.1.0-SNAPSHOT</version>
 
 </project>
\ No newline at end of file

diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
index 5867050..43894ca 100644
--- a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Server" sequenceNumber="1571148184">
+<target name="Papyrus CDO Server" sequenceNumber="1620304894">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
-      <unit id="javax.xml" version="1.3.4.v201005080400"/>
-      <repository id="eclipse-2019-09" location="http://download.eclipse.org/releases/2019-09/"/>
+      <unit id="javax.xml" version="0.0.0"/>
+      <repository id="eclipse-latest" location="http://download.eclipse.org/releases/latest/"/>
     </location>
   </locations>
 </target>

diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
index 87355fc..498c606 100644
--- a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd

@@ -1,9 +1,9 @@
 target "Papyrus CDO Server" with source requirements
 
-location "http://download.eclipse.org/releases/2019-09/" eclipse-2019-09 {
+location "http://download.eclipse.org/releases/latest/" eclipse-latest {
 	org.eclipse.rcp.feature.group lazy
 	org.eclipse.equinox.executable.feature.group lazy
 	org.eclipse.equinox.p2.discovery.feature.feature.group lazy
 	org.eclipse.emf.cdo.sdk.feature.group lazy
-	javax.xml
+	javax.xml lazy
 }