Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2017-01-30 14:39:39 +0000
committerMarkus Knauer2017-02-01 10:35:26 +0000
commite362ebcd157b488fc44fc4c5940936b904d2369c (patch)
tree0a7f6ec4b5186f19ac1b9aeabf63d1e777a1b04f
parent2e46d3d16f129d0e8e787e8ca350385f7c947f8d (diff)
downloadorg.eclipse.rap-e362ebcd157b488fc44fc4c5940936b904d2369c.tar.gz
org.eclipse.rap-e362ebcd157b488fc44fc4c5940936b904d2369c.tar.xz
org.eclipse.rap-e362ebcd157b488fc44fc4c5940936b904d2369c.zip
Update build configuration for RAP Runtime 3.2.0 M5 (Oxygen M5)
- Adjust feature copyright date to 2017 - Use Eclipse Platform build S-4.7M5-201701261030 - Use Orbit build S20170120205402 - Provide Jetty version 9.3.9.v20160517 for cluster tests because 9.4.0.v20161208 requires additional updates for incompatible changes which will be part of a future commit. See bug 511450 for further details. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511450 Change-Id: I4dcebf3138d08e41d2c8e85a531d502b0a661436 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate2
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/feature.properties4
-rw-r--r--features/org.eclipse.rap.examples.feature/feature.properties4
-rw-r--r--features/org.eclipse.rap.feature/feature.properties4
-rw-r--r--features/org.eclipse.rap.sdk.feature/feature.properties4
-rw-r--r--releng/org.eclipse.rap.build/pom.xml11
-rw-r--r--tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF22
7 files changed, 28 insertions, 23 deletions
diff --git a/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate b/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
index ad4121af35..e1c8a4200d 100644
--- a/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
@@ -1 +1 @@
-20161213-0600
+20170130-1200
diff --git a/features/org.eclipse.rap.equinox.target.feature/feature.properties b/features/org.eclipse.rap.equinox.target.feature/feature.properties
index 95ca3acf33..aef2d3fb48 100644
--- a/features/org.eclipse.rap.equinox.target.feature/feature.properties
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ Include this in your target platform unless you collect the required bundles fro
*** DO NOT INSTALL IN YOUR IDE ***
copyright = \
-Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.\n\
+Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.rap.examples.feature/feature.properties b/features/org.eclipse.rap.examples.feature/feature.properties
index 1de0085ec6..448fec09d6 100644
--- a/features/org.eclipse.rap.examples.feature/feature.properties
+++ b/features/org.eclipse.rap.examples.feature/feature.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ Include it in your target platform to develop RAP applications.\n\
*** DO NOT INSTALL IN YOUR IDE ***
copyright = \
-Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.\n\
+Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.rap.feature/feature.properties b/features/org.eclipse.rap.feature/feature.properties
index e300b0f7c4..8a19781414 100644
--- a/features/org.eclipse.rap.feature/feature.properties
+++ b/features/org.eclipse.rap.feature/feature.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ Include it in your target platform to develop RAP applications.\n\
*** DO NOT INSTALL IN YOUR IDE ***
copyright = \
-Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.\n\
+Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.rap.sdk.feature/feature.properties b/features/org.eclipse.rap.sdk.feature/feature.properties
index d219541f6e..96defddf83 100644
--- a/features/org.eclipse.rap.sdk.feature/feature.properties
+++ b/features/org.eclipse.rap.sdk.feature/feature.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ Include it in your target platform to develop RAP applications.\n\
*** DO NOT INSTALL IN YOUR IDE ***
copyright = \
-Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.\n\
+Copyright (c) 2007, 2017 Innoopract Informationssysteme GmbH and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/releng/org.eclipse.rap.build/pom.xml b/releng/org.eclipse.rap.build/pom.xml
index 110740b927..ef2ca47c66 100644
--- a/releng/org.eclipse.rap.build/pom.xml
+++ b/releng/org.eclipse.rap.build/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2011, 2016 EclipseSource and others.
+ Copyright (C) 2011, 2017 EclipseSource and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -30,8 +30,8 @@
-->
<cbi-plugins.version>1.1.2</cbi-plugins.version>
<jetty-repo.url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/</jetty-repo.url>
- <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20161205183421/repository/</orbit-repo.url>
- <platform-repo.url>http://download.eclipse.org/eclipse/updates/4.7milestones/S-4.7M4-201612080830/</platform-repo.url>
+ <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20170120205402/repository/</orbit-repo.url>
+ <platform-repo.url>http://download.eclipse.org/eclipse/updates/4.7milestones/S-4.7M5-201701261030/</platform-repo.url>
<rap-extra-repo.url>http://build.eclipse.org/rt/rap/base-platforms/3.2/extra-dependencies/</rap-extra-repo.url>
<license-repo.url>http://download.eclipse.org/cbi/updates/license/</license-repo.url>
<!-- The build type, N for nighty builds, S for stable builds. S-builds will be signed. -->
@@ -50,6 +50,11 @@
<url>${platform-repo.url}</url>
</repository>
<repository>
+ <id>jetty-repo</id>
+ <layout>p2</layout>
+ <url>${jetty-repo.url}</url>
+ </repository>
+ <repository>
<id>rap-extra-repo</id>
<layout>p2</layout>
<url>${rap-extra-repo.url}</url>
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
index 7da7c810c6..0e24561a3d 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
@@ -23,17 +23,17 @@ Import-Package: javax.servlet;version="[3.1.0,3.2.0)",
org.apache.catalina.tribes.membership;version="[7.0.0,8.0.0)",
org.apache.catalina.tribes.transport;version="[7.0.0,8.0.0)",
org.apache.catalina.tribes.transport.nio;version="[7.0.0,8.0.0)",
- org.eclipse.jetty.continuation;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.security;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.server.session;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.2.0,10.0.0)",
- org.eclipse.jetty.util.resource;version="[9.2.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.http;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.io;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.security;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.server;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.server.handler;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.server.session;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.servlet;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.util.component;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.util.log;version="[9.2.0,9.4.0)",
+ org.eclipse.jetty.util.resource;version="[9.2.0,9.4.0)",
org.eclipse.rap.rwt.application;version="[3.2.0,4.0.0)",
org.eclipse.rap.rwt.engine;version="[3.2.0,4.0.0)",
org.eclipse.rap.rwt.internal.application;version="[3.2.0,4.0.0)",

Back to the top