Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-369: As a smith I need to bump to Eclipse Oxygen #586

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
8d033c5
GH-369: Update to oxygen
Feb 5, 2018
4667534
GH-369: Force guava version 15
Feb 5, 2018
5817efa
GH-369: Force guava version 15
Feb 5, 2018
153de19
GH-369: Force guava version 15
Feb 5, 2018
116fa9f
GH-369: Remove guava version
Feb 5, 2018
b41186a
GH-369: Minor
Feb 5, 2018
18ad850
Update code to Guava 18
Feb 7, 2018
f4605ce
Merge remote-tracking branch 'origin/master' into GH-369
Feb 7, 2018
1023c9f
GH-369 fix depricated errors and warnings due to newer Guava and jfac…
Feb 7, 2018
705407b
GH-369: Remove further warnings
Feb 7, 2018
8dfbeec
Fix warnings
Feb 7, 2018
e9f3f08
Update target platform and generated code
Feb 8, 2018
71eb586
Fix version in pom
Feb 8, 2018
aa9ee13
Fix version
Feb 8, 2018
8f0ec17
Reverse version
Feb 8, 2018
6c20d34
GH-369: Minor
Feb 8, 2018
54c153d
Decrease EMF version back to 2.12
Feb 8, 2018
69c8883
Update generated code
Feb 8, 2018
22ca987
Updatate code generated from EMF Ecore 2.13
Feb 9, 2018
fb6b580
do not launch MWE2 workflow nor xcore generation during Maven build
Feb 9, 2018
23438df
Remove emf version in pom and update emf to 2.13 in oomph setup
Feb 12, 2018
eb964c7
Update emf xcore
Feb 12, 2018
92e1098
Reverse emf xcore version
Feb 12, 2018
c08e018
Update target platform
Feb 12, 2018
b121e53
Merge remote-tracking branch 'origin/master' into GH-369
Feb 12, 2018
6a95f25
Merge remote-tracking branch 'origin/master' into GH-369
Feb 12, 2018
31f8ea6
Use java 9 in docker file
Feb 12, 2018
214f52f
Use java 8
Feb 12, 2018
bbe070b
Remove warnings
Feb 13, 2018
bf0f321
Review feedback 1
Feb 13, 2018
3aef247
Feedback 2
Feb 13, 2018
4fab0d6
Use Oxygen .2
Feb 13, 2018
c38c9a2
Merge remote-tracking branch 'origin/master' into GH-369
Feb 13, 2018
b0eeeff
Update doc to Oxygen
Feb 13, 2018
837742f
Configure memory for docker
Feb 13, 2018
bcf0300
Fix
Feb 13, 2018
3576018
Merge remote-tracking branch 'origin/master' into GH-369
Feb 14, 2018
e19fac0
Fix memory flag
Feb 14, 2018
2d63b01
Set maven flags
Feb 14, 2018
2494be8
Fix syntax
Feb 14, 2018
d33ad2d
Increase docker mem to 10G
Feb 14, 2018
b887559
Fraction to 3
Feb 14, 2018
90ce1d0
Remove kaputt keyserver
Feb 14, 2018
a5316a5
Update target platform
Feb 14, 2018
554330a
Set fraction to 2
Feb 14, 2018
3826f8f
Reverse build node label
Feb 15, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Jenkinsfile.new
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ pipeline {
dockerfile {
dir 'docker-build/'
// Reuse repository.volume container if one exists, to speed up subsequent builds.
args '-v n4js-m2-repository:/usr/share/maven/ref/repository/'
args '-v n4js-m2-repository:/usr/share/maven/ref/repository/ -m 7500M'
additionalBuildArgs '--build-arg MAVEN_CENTRAL_URL=' + env.MAVEN_CENTRAL_URL
}
}
environment {
MAVEN_OPTS = "-XX:+UnlockExperimentalVMOptions " +
"-XX:+UseCGroupMemoryLimitForHeap " +
"-XX:MaxRAMFraction=2 " +
"-XshowSettings:vm "
}
options {
ansiColor('xterm')
buildDiscarder(
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ This installer is to be downloaded from https://wiki.eclipse.org/Eclipse_Install
Run the installer and apply the following steps:

1. change to "Advance Mode" via the menu (upper-right corner) (no need to move the installer)
2. select a product, e.g. "Eclipse IDE for Eclipse Committers" with product version "Latest(Neon)"
2. select a product, e.g. "Eclipse IDE for Eclipse Committers" with product version "Oxygen"
3. double-click the entry **Eclipse Projects/N4JS** so that it is shown in the catalog view below
4. on the next page, configure paths accordingly. You only have to configure the installation and workspace folder.
5. start installation
Expand All @@ -48,7 +48,7 @@ The installer will then guide you through the rest of the installation. All plug

For a manual install, clone the code and import all top-level projects from the docs, features, plugins, releng, testhelpers, and tests folders. Activate the targetplatform contained in the `releng/org.eclipse.n4js.targetplatform/` project.

The N4JS IDE is developed with Eclipse Neon 4.6 or better since the system is based on Eclipse anyway.
The N4JS IDE is developed with Eclipse Oxygen 4.7 or better since the system is based on Eclipse anyway.
It is almost impossible to use another IDE to develop Eclipse plugins. The list of required plugins includes:

- Xtext/Xtend 2.10.0
Expand Down
1 change: 0 additions & 1 deletion docker-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ RUN set -ex && \
56730D5401028683275BD23C23EFEFE93C4CFFFE \
77984A986EBC2AA786BC0F66B01FBB92821C587A ; \
do \
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \
gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \
gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \
done
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLConnection;
Expand All @@ -31,6 +32,9 @@
import org.eclipse.n4js.utils.io.FileDeleter;

import com.google.common.base.StandardSystemProperty;
import com.google.common.io.ByteSink;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;

/**
* Provides access to the shipped code for setups that don't work with proper workspace, e.g. unit tests for the
Expand Down Expand Up @@ -114,8 +118,11 @@ protected static String recursivelyCopyContent(JarURLConnection connection, Stri
}
} else {
checkState(newResource.createNewFile(), "Error while creating new file at: " + newResource);
try (final InputStream is = jarFile.getInputStream(entry)) {
com.google.common.io.Files.copy(() -> is, newResource);
ByteSink byteSink = Files.asByteSink(newResource);
try (
final InputStream is = jarFile.getInputStream(entry);
OutputStream outputStream = byteSink.openStream();) {
ByteStreams.copy(is, outputStream);
}
}
newResource.deleteOnExit();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static private boolean isZeroLiteral(Expression expr) {
if (expr instanceof NumericLiteral) {
NumericLiteral numLit = (NumericLiteral) expr;
BigDecimal litValue = numLit.getValue();
return litValue.equals(0);
return litValue.equals(new BigDecimal(0));
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
package org.eclipse.n4js.flowgraphs.dataflow.symbols;

import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -102,7 +103,7 @@ static private Symbol createFromSuperLiteral(ControlFlowElement cfe) {
}

static private Symbol createFromNumericLiteral(ControlFlowElement cfe) {
if (new Integer(0).equals(((NumericLiteral) cfe).getValue())) {
if (new BigDecimal(0).equals(((NumericLiteral) cfe).getValue())) {
return new SymbolOfZeroLiteral((NumericLiteral) cfe);
}
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
*/
package org.eclipse.n4js.flowgraphs.dataflow.symbols;

import java.math.BigDecimal;

import org.eclipse.n4js.n4JS.NumericLiteral;

/**
Expand All @@ -34,7 +36,7 @@ public String getName() {

@Override
public boolean isZeroLiteral() {
return nl.getValue().equals(0);
return nl.getValue().equals(new BigDecimal(0));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public interface Doclet extends Composite {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false" titleUnique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final <%org.eclipse.xtext.xbase.lib.Functions.Function1%><<%org.eclipse.n4js.jsdoc.dom.LineTag%>, <%java.lang.Boolean%>> _function = new <%org.eclipse.xtext.xbase.lib.Functions.Function1%><<%org.eclipse.n4js.jsdoc.dom.LineTag%>, <%java.lang.Boolean%>>()\n{\n\tpublic <%java.lang.Boolean%> apply(final <%org.eclipse.n4js.jsdoc.dom.LineTag%> it)\n\t{\n\t\t<%java.lang.String%> _title = it.getTitle().getTitle();\n\t\treturn <%java.lang.Boolean%>.valueOf(<%com.google.common.base.Objects%>.equal(_title, title));\n\t}\n};\n<%org.eclipse.n4js.jsdoc.dom.LineTag%> _findFirst = <%org.eclipse.xtext.xbase.lib.IterableExtensions%>.<<%org.eclipse.n4js.jsdoc.dom.LineTag%>>findFirst(this.getLineTags(), _function);\nreturn (_findFirst != null);'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final &lt;%org.eclipse.xtext.xbase.lib.Functions.Function1%&gt;&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;, &lt;%java.lang.Boolean%&gt;&gt; _function = new &lt;%org.eclipse.xtext.xbase.lib.Functions.Function1%&gt;&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;, &lt;%java.lang.Boolean%&gt;&gt;()\n{\n\tpublic &lt;%java.lang.Boolean%&gt; apply(final &lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt; it)\n\t{\n\t\t&lt;%java.lang.String%&gt; _title = it.getTitle().getTitle();\n\t\treturn &lt;%java.lang.Boolean%&gt;.valueOf(&lt;%com.google.common.base.Objects%&gt;.equal(_title, title));\n\t}\n};\n&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt; _findFirst = &lt;%org.eclipse.xtext.xbase.lib.IterableExtensions%&gt;.&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;&gt;findFirst(this.getLineTags(), _function);\nreturn (_findFirst != null);'"
* @generated
*/
boolean hasLineTag(String title);
Expand All @@ -60,7 +60,7 @@ public interface Doclet extends Composite {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false" titleUnique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final <%org.eclipse.xtext.xbase.lib.Functions.Function1%><<%org.eclipse.n4js.jsdoc.dom.LineTag%>, <%java.lang.Boolean%>> _function = new <%org.eclipse.xtext.xbase.lib.Functions.Function1%><<%org.eclipse.n4js.jsdoc.dom.LineTag%>, <%java.lang.Boolean%>>()\n{\n\tpublic <%java.lang.Boolean%> apply(final <%org.eclipse.n4js.jsdoc.dom.LineTag%> it)\n\t{\n\t\t<%java.lang.String%> _title = it.getTitle().getTitle();\n\t\treturn <%java.lang.Boolean%>.valueOf(<%com.google.common.base.Objects%>.equal(_title, title));\n\t}\n};\nreturn <%org.eclipse.emf.common.util.ECollections%>.<<%org.eclipse.n4js.jsdoc.dom.LineTag%>>toEList(<%org.eclipse.xtext.xbase.lib.IterableExtensions%>.<<%org.eclipse.n4js.jsdoc.dom.LineTag%>>filter(this.getLineTags(), _function));'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final &lt;%org.eclipse.xtext.xbase.lib.Functions.Function1%&gt;&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;, &lt;%java.lang.Boolean%&gt;&gt; _function = new &lt;%org.eclipse.xtext.xbase.lib.Functions.Function1%&gt;&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;, &lt;%java.lang.Boolean%&gt;&gt;()\n{\n\tpublic &lt;%java.lang.Boolean%&gt; apply(final &lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt; it)\n\t{\n\t\t&lt;%java.lang.String%&gt; _title = it.getTitle().getTitle();\n\t\treturn &lt;%java.lang.Boolean%&gt;.valueOf(&lt;%com.google.common.base.Objects%&gt;.equal(_title, title));\n\t}\n};\nreturn &lt;%org.eclipse.emf.common.util.ECollections%&gt;.&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;&gt;toEList(&lt;%org.eclipse.xtext.xbase.lib.IterableExtensions%&gt;.&lt;&lt;%org.eclipse.n4js.jsdoc.dom.LineTag%&gt;&gt;filter(this.getLineTags(), _function));'"
* @generated
*/
EList<LineTag> lineTags(String title);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public interface DocletElement extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false" offsetUnique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getBegin() <= offset) && (this.getEnd() > offset));'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getBegin() &lt;= offset) &amp;&amp; (this.getEnd() &gt; offset));'"
* @generated
*/
boolean covers(int offset);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public interface FullMemberReference extends FullTypeReference {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getMemberName() != null) && (!this.getMemberName().isEmpty()));'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getMemberName() != null) &amp;&amp; (!this.getMemberName().isEmpty()));'"
* @generated
*/
boolean memberNameSet();
Expand All @@ -99,7 +99,7 @@ public interface FullMemberReference extends FullTypeReference {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='<%java.lang.String%> _string = super.toString();\n<%java.lang.StringBuilder%> strb = new <%java.lang.StringBuilder%>(_string);\nboolean _memberNameSet = this.memberNameSet();\nif (_memberNameSet)\n{\n\tint _length = strb.length();\n\tboolean _greaterThan = (_length > 0);\n\tif (_greaterThan)\n\t{\n\t\tboolean _isStaticMember = this.isStaticMember();\n\t\tif (_isStaticMember)\n\t\t{\n\t\t\tstrb.append(\"#\");\n\t\t}\n\t\telse\n\t\t{\n\t\t\tstrb.append(\".\");\n\t\t}\n\t}\n\tstrb.append(this.getMemberName());\n}\nreturn strb.toString();'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='&lt;%java.lang.String%&gt; _string = super.toString();\n&lt;%java.lang.StringBuilder%&gt; strb = new &lt;%java.lang.StringBuilder%&gt;(_string);\nboolean _memberNameSet = this.memberNameSet();\nif (_memberNameSet)\n{\n\tint _length = strb.length();\n\tboolean _greaterThan = (_length &gt; 0);\n\tif (_greaterThan)\n\t{\n\t\tboolean _isStaticMember = this.isStaticMember();\n\t\tif (_isStaticMember)\n\t\t{\n\t\t\tstrb.append(\"#\");\n\t\t}\n\t\telse\n\t\t{\n\t\t\tstrb.append(\".\");\n\t\t}\n\t}\n\tstrb.append(this.getMemberName());\n}\nreturn strb.toString();'"
* @generated
*/
String toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public interface FullTypeReference extends SimpleTypeReference {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getModuleName() != null) && (!this.getModuleName().isEmpty()));'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='return ((this.getModuleName() != null) &amp;&amp; (!this.getModuleName().isEmpty()));'"
* @generated
*/
boolean moduleNameSet();
Expand All @@ -67,7 +67,7 @@ public interface FullTypeReference extends SimpleTypeReference {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='<%java.lang.StringBuilder%> strb = new <%java.lang.StringBuilder%>();\nboolean _moduleNameSet = this.moduleNameSet();\nif (_moduleNameSet)\n{\n\tstrb.append(this.getModuleName());\n}\nboolean _typeNameSet = this.typeNameSet();\nif (_typeNameSet)\n{\n\tint _length = strb.length();\n\tboolean _greaterThan = (_length > 0);\n\tif (_greaterThan)\n\t{\n\t\tstrb.append(\".\");\n\t}\n\tstrb.append(this.getTypeName());\n}\nreturn strb.toString();'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='&lt;%java.lang.StringBuilder%&gt; strb = new &lt;%java.lang.StringBuilder%&gt;();\nboolean _moduleNameSet = this.moduleNameSet();\nif (_moduleNameSet)\n{\n\tstrb.append(this.getModuleName());\n}\nboolean _typeNameSet = this.typeNameSet();\nif (_typeNameSet)\n{\n\tint _length = strb.length();\n\tboolean _greaterThan = (_length &gt; 0);\n\tif (_greaterThan)\n\t{\n\t\tstrb.append(\".\");\n\t}\n\tstrb.append(this.getTypeName());\n}\nreturn strb.toString();'"
* @generated
*/
String toString();
Expand All @@ -76,7 +76,7 @@ public interface FullTypeReference extends SimpleTypeReference {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model unique="false"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='<%java.lang.StringBuilder%> strb = new <%java.lang.StringBuilder%>();\nboolean _moduleNameSet = this.moduleNameSet();\nif (_moduleNameSet)\n{\n\tstrb.append(this.getModuleName());\n}\nboolean _typeNameSet = this.typeNameSet();\nif (_typeNameSet)\n{\n\tstrb.append(\".\");\n\tstrb.append(this.getTypeName());\n}\nreturn strb.toString();'"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='&lt;%java.lang.StringBuilder%&gt; strb = new &lt;%java.lang.StringBuilder%&gt;();\nboolean _moduleNameSet = this.moduleNameSet();\nif (_moduleNameSet)\n{\n\tstrb.append(this.getModuleName());\n}\nboolean _typeNameSet = this.typeNameSet();\nif (_typeNameSet)\n{\n\tstrb.append(\".\");\n\tstrb.append(this.getTypeName());\n}\nreturn strb.toString();'"
* @generated
*/
String fullTypeName();
Expand Down
Loading