Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2016-11-06 12:39:15 +0000
committerMartin Taal2016-11-06 12:39:15 +0000
commitc402126d9d1d3fbc6a6e0253ef5d065836c63f96 (patch)
tree1873d924b4de5c2e88d0af7dc32890aadff65bff
parent9da4c18467e8a9b8b2625e628f691bd68f7109e8 (diff)
downloadorg.eclipse.emf.texo-c402126d9d1d3fbc6a6e0253ef5d065836c63f96.tar.gz
org.eclipse.emf.texo-c402126d9d1d3fbc6a6e0253ef5d065836c63f96.tar.xz
org.eclipse.emf.texo-c402126d9d1d3fbc6a6e0253ef5d065836c63f96.zip
Solve jetty dependency to ensure Neon compatibility
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap2
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap2
-rw-r--r--tests/org.eclipse.emf.texo.server.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF16
5 files changed, 14 insertions, 14 deletions
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
index 0acdcdb4..d4e7328d 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
@@ -80,7 +80,7 @@
<searchPath name="target.platform">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Neon)">
- <uri format="{0}/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730">
+ <uri format="{0}/jetty/updates/jetty-bundles-9.x/9.3.12.v20160915">
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
index fa1d772a..9a37816f 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
@@ -88,7 +88,7 @@
<searchPath name="target.platform">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Neon)">
- <uri format="{0}/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730">
+ <uri format="{0}/jetty/updates/jetty-bundles-9.x/9.3.12.v20160915/">
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
diff --git a/tests/org.eclipse.emf.texo.server.test/.classpath b/tests/org.eclipse.emf.texo.server.test/.classpath
index 098194ca..eca7bdba 100644
--- a/tests/org.eclipse.emf.texo.server.test/.classpath
+++ b/tests/org.eclipse.emf.texo.server.test/.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.7"/>
+ <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.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
index 19212765..e21d30a5 100644
--- a/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
index 913b49ed..b47f44fb 100644
--- a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.server.test;singleton:=true
Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.9.0,1.1.0)",
@@ -20,14 +20,14 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.9.0,1.1.0)",
org.eclipse.persistence.antlr;bundle-version="[3.0.0,4.0.0)",
org.hsqldb;bundle-version="[2.0.0,3.0.0)",
javax.persistence;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jetty.server;bundle-version="[9.0.10,9.3.0)",
- org.eclipse.jetty.util;bundle-version="[9.0.10,9.3.0)",
- org.eclipse.jetty.servlet;bundle-version="[9.0.10,9.3.0)",
+ org.eclipse.jetty.server;bundle-version="[9.3.10,9.4.0)",
+ org.eclipse.jetty.util;bundle-version="[9.3.10,9.4.0)",
+ org.eclipse.jetty.servlet;bundle-version="[9.3.10,9.4.0)",
javax.servlet;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.jetty.client;bundle-version="[9.0.10,9.3.0)",
- org.eclipse.jetty.http;bundle-version="[9.0.10,9.3.0)",
- org.eclipse.jetty.io;bundle-version="[9.0.10,9.3.0)",
- org.eclipse.jetty.security;bundle-version="[9.0.10,9.3.0)",
+ org.eclipse.jetty.client;bundle-version="[9.3.10,9.4.0)",
+ org.eclipse.jetty.http;bundle-version="[9.3.10,9.4.0)",
+ org.eclipse.jetty.io;bundle-version="[9.3.10,9.4.0)",
+ org.eclipse.jetty.security;bundle-version="[9.3.10,9.4.0)",
org.json;bundle-version="[1.0.0,2.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.9.0,1.1.0)",
org.eclipse.emf.texo.test.emfmodel;bundle-version="[0.9.0,1.1.0)",

Back to the top