From 2a419817a98ea82dbdb47962d89f3c5991a245f6 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Fri, 17 Jan 2020 14:23:15 +0200 Subject: [PATCH] Moving to Eclipse 4.14 based target platform gitlab #405 Change-Id: I4049beafdaa118b94928fdcbaeccb60a9f5c672c --- .../graphfile/hack/SystemProject.java | 8 - .../org.simantics.rcp.feature/feature.xml | 6 +- .../org.simantics.sdk.build.p2.site/pom.xml | 4 + ...ics.sdk.build.targetdefinition-4.14.target | 400 ----------------- ...antics.sdk.build.targetdefinition-4.14.tpd | 409 ------------------ ...imantics.sdk.build.targetdefinition.target | 144 +++--- ...g.simantics.sdk.build.targetdefinition.tpd | 52 +-- .../simantics-4.14.target | 405 ----------------- .../simantics-4.14.tpd | 11 - .../simantics.target | 144 +++--- 10 files changed, 162 insertions(+), 1421 deletions(-) delete mode 100644 releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.target delete mode 100644 releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.tpd delete mode 100644 releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.target delete mode 100644 releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.tpd diff --git a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java index 704209961..f270dd213 100644 --- a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java +++ b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java @@ -22,7 +22,6 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IPathVariableManager; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IProjectNature; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceFilterDescription; @@ -40,7 +39,6 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.content.IContentTypeMatcher; import org.eclipse.core.runtime.jobs.ISchedulingRule; -@SuppressWarnings("deprecation") public class SystemProject implements IProject{ private SystemProject(){}; @@ -700,12 +698,6 @@ public class SystemProject implements IProject{ return null; } - @Override - public IPath getPluginWorkingLocation(IPluginDescriptor plugin) { - // TODO Auto-generated method stub - return null; - } - @Override public IPath getWorkingLocation(String id) { // TODO Auto-generated method stub diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml index 96a854dc0..ce56f5982 100644 --- a/features/org.simantics.rcp.feature/feature.xml +++ b/features/org.simantics.rcp.feature/feature.xml @@ -131,11 +131,7 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0"/> - - org.eclipse.jetty:jetty-servlets:9.4.5.v20170502 true + + org.eclipse.jetty:jetty-server:9.4.5.v20170502 + true + org.zeroturnaround:zt-exec:${zeroturnaround.version} true diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.target deleted file mode 100644 index 20c81978b..000000000 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.target +++ /dev/null @@ -1,400 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.tpd deleted file mode 100644 index c94b92d41..000000000 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.14.tpd +++ /dev/null @@ -1,409 +0,0 @@ -target "Eclipse 2019-12 (4.14)" - -with source allEnvironments - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" { - com.google.guava - com.google.guava.source - org.objectweb.asm - org.objectweb.asm.analysis - org.objectweb.asm.analysis.source - org.objectweb.asm.commons - org.objectweb.asm.commons.source - org.objectweb.asm.source - org.objectweb.asm.tree - org.objectweb.asm.tree.source - org.objectweb.asm.util - org.objectweb.asm.util.source - org.objectweb.asm.xml - org.objectweb.asm.xml.source -} - -location "http://download.eclipse.org/releases/2019-12/" { - javax.xml - org.apache.commons.httpclient - org.apache.xerces - org.apache.xml.resolver - org.apache.xml.serializer - org.eclipse.draw2d.feature.group - org.eclipse.ecf.filetransfer.feature.feature.group - org.eclipse.ecf.filetransfer.feature.source.feature.group - org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group - org.eclipse.ecf.filetransfer.httpclient45.feature.source.feature.group - org.eclipse.ecf.filetransfer.ssl.feature.feature.group - org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group - org.eclipse.emf.sdk.feature.group - org.eclipse.epp.mpc.feature.group - org.eclipse.epp.mpc.source.feature.group - org.eclipse.mylyn.commons.feature.group - org.eclipse.mylyn.commons.identity.feature.group - org.eclipse.mylyn.commons.net - org.eclipse.mylyn.commons.net.source - org.eclipse.mylyn.commons.notifications.feature.group - org.eclipse.mylyn.commons.repositories.core - org.eclipse.mylyn.commons.repositories.core.source - org.eclipse.mylyn.commons.repositories.ui - org.eclipse.mylyn.commons.repositories.ui.source - org.eclipse.mylyn.context_feature.feature.group - org.eclipse.mylyn.monitor.feature.group - org.eclipse.mylyn.tasks.core - org.eclipse.mylyn.tasks.core.source - org.eclipse.mylyn.tasks.ui - org.eclipse.mylyn.tasks.ui.source - org.eclipse.mylyn.wikitext_feature.feature.group - org.eclipse.mylyn.wikitext.ant.source - org.eclipse.mylyn.wikitext.mediawiki.source - org.eclipse.mylyn.wikitext.osgi.source - org.eclipse.mylyn.wikitext.source - org.eclipse.userstorage.feature.group - org.eclipse.userstorage.oauth - org.eclipse.userstorage.oauth.source - org.eclipse.userstorage.source - org.eclipse.userstorage.ui.source -} - -location "http://download.eclipse.org/eclipse/updates/4.14/" { - org.apache.httpcomponents.httpclient - org.apache.httpcomponents.httpclient.source - org.apache.httpcomponents.httpcore - org.apache.httpcomponents.httpcore.source - org.eclipse.core.runtime.feature.feature.group - org.eclipse.e4.core.tools.feature.feature.group - org.eclipse.e4.core.tools.feature.source.feature.group - org.eclipse.ecf.core.feature.feature.group - org.eclipse.ecf.core.feature.source.feature.group - org.eclipse.ecf.core.ssl.feature.feature.group - org.eclipse.ecf.core.ssl.feature.source.feature.group - org.eclipse.equinox.p2.discovery.feature.feature.group - org.eclipse.equinox.sdk.feature.group - org.eclipse.help.feature.group - org.eclipse.help.source.feature.group - org.eclipse.platform.feature.group - org.eclipse.platform.source.feature.group - org.eclipse.rcp.feature.group - org.eclipse.rcp.source.feature.group - org.eclipse.releng.tools.feature.group - org.eclipse.sdk.ide - org.eclipse.swt.tools.feature.feature.group -} - -/* -location "http://download.eclipse.org/rt/ecf/3.14.6/site.p2" { - org.eclipse.ecf.filetransfer.feature.feature.group - org.eclipse.ecf.filetransfer.feature.source.feature.group - org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group - org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group - org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group - org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group - org.eclipse.ecf.filetransfer.ssl.feature.feature.group - org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group -} -*/ - -location "http://www.simantics.org/update/nebula/releases/2.2.0/release/" { - org.eclipse.nebula.cwt.feature.feature.group - org.eclipse.nebula.effects.stw.feature.feature.group - org.eclipse.nebula.examples.feature.feature.group - org.eclipse.nebula.examples.release.feature.feature.group - org.eclipse.nebula.feature.feature.group - org.eclipse.nebula.visualization.feature.feature.group - org.eclipse.nebula.widgets.cdatetime.feature.feature.group - org.eclipse.nebula.widgets.compositetable.feature.feature.group - org.eclipse.nebula.widgets.ctreecombo.feature.feature.group - org.eclipse.nebula.widgets.floatingtext.feature.feature.group - org.eclipse.nebula.widgets.gallery.feature.feature.group - org.eclipse.nebula.widgets.ganttchart.feature.feature.group - org.eclipse.nebula.widgets.geomap.feature.feature.group - org.eclipse.nebula.widgets.grid.feature.feature.group - org.eclipse.nebula.widgets.nebulaslider.feature.feature.group - org.eclipse.nebula.widgets.opal.breadcrumb.feature.feature.group - org.eclipse.nebula.widgets.opal.calculator.feature.feature.group - org.eclipse.nebula.widgets.opal.checkboxgroup.feature.feature.group - org.eclipse.nebula.widgets.opal.columnbrowser.feature.feature.group - org.eclipse.nebula.widgets.opal.commons.feature.feature.group - org.eclipse.nebula.widgets.opal.dialog.feature.feature.group - org.eclipse.nebula.widgets.opal.duallist.feature.feature.group - org.eclipse.nebula.widgets.opal.header.feature.feature.group - org.eclipse.nebula.widgets.opal.heapmanager.feature.feature.group - org.eclipse.nebula.widgets.opal.horizontalspinner.feature.feature.group - org.eclipse.nebula.widgets.opal.launcher.feature.feature.group - org.eclipse.nebula.widgets.opal.logindialog.feature.feature.group - org.eclipse.nebula.widgets.opal.multichoice.feature.feature.group - org.eclipse.nebula.widgets.opal.notifier.feature.feature.group - org.eclipse.nebula.widgets.opal.panels.feature.feature.group - org.eclipse.nebula.widgets.opal.preferencewindow.feature.feature.group - org.eclipse.nebula.widgets.opal.promptsupport.feature.feature.group - org.eclipse.nebula.widgets.opal.propertytable.feature.feature.group - org.eclipse.nebula.widgets.opal.rangeslider.feature.feature.group - org.eclipse.nebula.widgets.opal.roundedtoolbar.feature.feature.group - org.eclipse.nebula.widgets.opal.starrating.feature.feature.group - org.eclipse.nebula.widgets.opal.switchbutton.feature.feature.group - org.eclipse.nebula.widgets.opal.textassist.feature.feature.group - org.eclipse.nebula.widgets.opal.titledseparator.feature.feature.group - org.eclipse.nebula.widgets.opal.tipoftheday.feature.feature.group - org.eclipse.nebula.widgets.oscilloscope.feature.feature.group - org.eclipse.nebula.widgets.paperclips.feature.feature.group - org.eclipse.nebula.widgets.passwordrevealer.feature.feature.group - org.eclipse.nebula.widgets.pgroup.feature.feature.group - org.eclipse.nebula.widgets.progresscircle.feature.feature.group - org.eclipse.nebula.widgets.pshelf.css.feature.feature.group - org.eclipse.nebula.widgets.pshelf.feature.feature.group - org.eclipse.nebula.widgets.richtext.feature.feature.group - org.eclipse.nebula.widgets.splitbutton.feature.feature.group - org.eclipse.nebula.widgets.tablecombo.feature.feature.group - org.eclipse.nebula.widgets.xviewer.feature.feature.group -} - -location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/" { - org.eclipse.nebula.widgets.nattable.core.feature.feature.group - org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group -} - -location "https://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/" { - org.eclipse.e4.tools.spies.feature.feature.group -} - -location "http://www.simantics.org/update/nebula/releases/2.2.0/incubation/" { - org.eclipse.nebula.incubation.feature.feature.group - org.eclipse.nebula.examples.incubation.feature.feature.group -} - -location "http://www.simantics.org/download/master/external-components/maven" { - bouncycastle.bcmail-jdk14 - bouncycastle.bcprov-jdk14 - ch.qos.logback.classic - ch.qos.logback.classic.source - ch.qos.logback.core - ch.qos.logback.core.source - com.google.android.annotations - com.google.android.annotations.source - com.google.api.grpc.proto-google-common-protos - com.google.api.grpc.proto-google-common-protos.source - com.google.errorprone.error_prone_annotations - com.google.errorprone.error_prone_annotations.source - com.google.gson - com.google.gson.source - com.google.protobuf - com.google.protobuf.source - com.esotericsoftware.kryo - com.esotericsoftware.kryo.source - com.esotericsoftware.minlog - com.esotericsoftware.minlog.source - com.esotericsoftware.reflectasm - com.esotericsoftware.reflectasm.source - com.fasterxml.jackson.core.jackson-annotations - com.fasterxml.jackson.core.jackson-annotations.source - com.fasterxml.jackson.core.jackson-core - com.fasterxml.jackson.core.jackson-core.source - com.fasterxml.jackson.core.jackson-databind - com.fasterxml.jackson.core.jackson-databind.source - com.fasterxml.jackson.dataformat.jackson-dataformat-csv - com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source - com.fasterxml.jackson.dataformat.jackson-dataformat-xml - com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source - com.fasterxml.jackson.datatype.jackson-datatype-jsr310 - com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source - com.fasterxml.jackson.jaxrs.jackson-jaxrs-base - com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source - com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider - com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source - com.fasterxml.jackson.module.jackson-module-jaxb-annotations - com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source - com.fasterxml.woodstox.woodstox-core - com.fasterxml.woodstox.woodstox-core.source - com.healthmarketscience.jackcess - com.healthmarketscience.jackcess.source - com.koloboke.api-jdk8 - com.koloboke.api-jdk8.source - com.koloboke.compile - com.koloboke.compile.source - com.koloboke.impl-common-jdk8 - com.koloboke.impl-common-jdk8.source - com.lowagie.text - com.lowagie.text.source - com.sun.jna - com.sun.jna.platform - com.sun.jna.platform.source - com.sun.jna.source - freemarker - freemarker.source - gnu.trove3 - gnu.trove3.source - io.netty.buffer - io.netty.buffer.source - io.netty.codec - io.netty.codec.source - io.netty.codec-http - io.netty.codec-http.source - io.netty.codec-http2 - io.netty.codec-http2.source - io.netty.codec-socks - io.netty.codec-socks.source - io.netty.common - io.netty.common.source - io.netty.handler - io.netty.handler.source - io.netty.handler-proxy - io.netty.handler-proxy.source - io.netty.resolver - io.netty.resolver.source - io.netty.transport - io.netty.transport.source - io.opencensus.api - io.opencensus.api.source - io.opencensus.contrib-grpc-metrics - io.opencensus.contrib-grpc-metrics.source - it.unimi.dsi.fastutil - it.unimi.dsi.fastutil.source - jakarta-regexp - javassist - javassist.source - javax.servlet-api - javax.servlet-api.source - javax.validation.api - javax.validation.api.source - javax.ws.rs-api - javax.ws.rs-api.source - net.jcip.annotations - net.jcip.annotations.source - net.ucanaccess - net.ucanaccess.source - org.antlr.runtime - org.antlr.runtime.source - org.apache.aries.spifly.core-internal - org.apache.aries.spifly.dynamic.bundle - org.apache.aries.spifly.weaver-internal - org.apache.aries.util - org.apache.commons.codec - org.apache.commons.codec.source - org.apache.commons.collections - org.apache.commons.collections.source - org.apache.commons.collections4 - org.apache.commons.collections4.source - org.apache.commons.compress - org.apache.commons.compress.source - org.apache.commons.io - org.apache.commons.io.source - org.apache.commons.lang - org.apache.commons.lang.source - org.apache.commons.logging - org.apache.commons.logging.source - org.apache.commons.math3 - org.apache.commons.math3.source - org.apache.log4j - org.apache.log4j.source - org.apache.lucene4.analyzers-common - org.apache.lucene4.analyzers-common.source - org.apache.lucene4.core - org.apache.lucene4.core.source - org.apache.lucene4.queries - org.apache.lucene4.queries.source - org.apache.lucene4.queryparser - org.apache.lucene4.queryparser.source - org.apache.lucene4.sandbox - org.apache.lucene4.sandbox.source - org.apache.pdfbox - org.apache.pdfbox.fontbox - org.apache.pdfbox.fontbox.source - org.apache.pdfbox.source - org.apache.pdfbox.xmpbox - org.apache.pdfbox.xmpbox.source - org.bouncycastle.bcmail-jdk14 - org.bouncycastle.bcmail-jdk14.source - org.bouncycastle.bcprov-jdk14 - org.bouncycastle.bcprov-jdk14.source - org.bouncycastle.bctsp-jdk14 - org.bouncycastle.bctsp-jdk14.source - org.eclipse.collections.eclipse-collections-api - org.eclipse.collections.eclipse-collections-api.source - org.eclipse.collections.eclipse-collections - org.eclipse.collections.eclipse-collections.source - org.eclipse.jetty.servlets - org.eclipse.jetty.servlets.source - com.github.benmanes.caffeine - com.github.benmanes.caffeine.source - org.glassfish.hk2.api - org.glassfish.hk2.api.source - org.glassfish.hk2.locator - org.glassfish.hk2.locator.source - org.glassfish.hk2.osgi-resource-locator - org.glassfish.hk2.osgi-resource-locator.source - org.glassfish.hk2.utils - org.glassfish.hk2.utils.source - org.glassfish.jersey.bundles.repackaged.jersey-guava - org.glassfish.jersey.bundles.repackaged.jersey-guava.source - org.glassfish.hk2.external.aopalliance-repackaged - org.glassfish.hk2.external.aopalliance-repackaged.source - org.glassfish.jersey.core.jersey-client - org.glassfish.jersey.core.jersey-client.source - org.glassfish.jersey.core.jersey-common - org.glassfish.jersey.core.jersey-common.source - org.glassfish.jersey.core.jersey-server - org.glassfish.jersey.core.jersey-server.source - org.glassfish.jersey.ext.jersey-entity-filtering - org.glassfish.jersey.ext.jersey-entity-filtering.source - org.glassfish.jersey.media.jersey-media-json-jackson - org.glassfish.jersey.media.jersey-media-json-jackson.source - org.glassfish.jersey.media.jersey-media-multipart - org.glassfish.jersey.media.jersey-media-multipart.source - org.glassfish.jersey.containers.jersey-container-servlet-core - org.glassfish.jersey.containers.jersey-container-servlet-core.source - org.hsqldb.hsqldb - org.hsqldb.hsqldb.source - org.ini4j - org.ini4j.source - org.jboss.windup.decompiler.api.forge-addon - org.jboss.windup.decompiler.api.forge-addon.source - org.jboss.windup.decompiler.procyon - org.jboss.windup.decompiler.procyon.source - org.jboss.windup.decompiler.procyon.windup-procyon-compilertools - org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source - org.jboss.windup.decompiler.procyon.windup-procyon-core - org.jboss.windup.decompiler.procyon.windup-procyon-core.source - org.jboss.windup.decompiler.procyon.windup-procyon-reflection - org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source - org.jboss.windup.utils.windup-utils.forge-addon - org.jboss.windup.utils.windup-utils.forge-addon.source - jaxen - jaxen.source - org.jdom2 - org.jdom2.source - org.jfree.jchart - org.jfree.jchart.source - org.jfree.jcommon - org.jfree.jcommon.source - org.jsoup - org.jsoup.source - org.jvnet.mimepull - org.jvnet.mimepull.source - org.mozilla.rhino - org.mozilla.rhino.source - org.objenesis - org.objenesis.source - org.slf4j.api - org.slf4j.api.source - org.supercsv - org.supercsv.source - org.yaml.snakeyaml - org.yaml.snakeyaml.source - org.zeroturnaround.zt-exec - org.zeroturnaround.zt-exec.source - pgjdbc-ng - pgjdbc-ng.source - stax2-api - stax2-api.source -} - -location "http://www.simantics.org/download/master/external-components/manual" { - org.apache.batik - org.apache.poi.feature.feature.group - io.grpc.feature.feature.group -} diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 529902e27..5a576579e 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,95 +1,77 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,8 +141,8 @@ - - + + @@ -317,8 +299,16 @@ + + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index 2dd168a4a..db04a696a 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -1,10 +1,15 @@ -target "Eclipse Oxygen" +target "Eclipse 2019-12 (4.14)" with source allEnvironments +// Need to get Guava [21,22) from here because mylyn.wikitext relies on it. +// The latest orbit repository contains Guava 27 which doesn't work for wikitext. location "http://www.simantics.org/update/tools/orbit/downloads/drops/R20170516192513" { - com.google.guava - com.google.guava.source + com.google.guava [21.0.0,22.0.0) + com.google.guava.source [21.0.0,22.0.0) +} + +location "http://www.simantics.org/update/tools/orbit/downloads/drops/R20191126223242/repository" { org.objectweb.asm org.objectweb.asm.analysis org.objectweb.asm.analysis.source @@ -15,14 +20,10 @@ location "http://www.simantics.org/update/tools/orbit/downloads/drops/R201705161 org.objectweb.asm.tree.source org.objectweb.asm.util org.objectweb.asm.util.source - org.objectweb.asm.xml - org.objectweb.asm.xml.source } -location "http://www.simantics.org/update/oxygen/" { +location "http://www.simantics.org/update/2019-12/" { javax.xml - org.apache.commons.httpclient - org.apache.commons.httpclient.source org.apache.xerces org.apache.xml.resolver org.apache.xml.serializer @@ -30,21 +31,6 @@ location "http://www.simantics.org/update/oxygen/" { org.eclipse.emf.sdk.feature.group org.eclipse.epp.mpc.feature.group org.eclipse.epp.mpc.source.feature.group - org.eclipse.mylyn.commons.feature.group - org.eclipse.mylyn.commons.identity.feature.group - org.eclipse.mylyn.commons.net - org.eclipse.mylyn.commons.net.source - org.eclipse.mylyn.commons.notifications.feature.group - org.eclipse.mylyn.commons.repositories.core - org.eclipse.mylyn.commons.repositories.core.source - org.eclipse.mylyn.commons.repositories.ui - org.eclipse.mylyn.commons.repositories.ui.source - org.eclipse.mylyn.context_feature.feature.group - org.eclipse.mylyn.monitor.feature.group - org.eclipse.mylyn.tasks.core - org.eclipse.mylyn.tasks.core.source - org.eclipse.mylyn.tasks.ui - org.eclipse.mylyn.tasks.ui.source org.eclipse.mylyn.wikitext_feature.feature.group org.eclipse.mylyn.wikitext.ant.source org.eclipse.mylyn.wikitext.mediawiki.source @@ -57,7 +43,7 @@ location "http://www.simantics.org/update/oxygen/" { org.eclipse.userstorage.ui.source } -location "http://www.simantics.org/update/eclipse/updates/4.7/" { +location "http://www.simantics.org/update/eclipse/updates/4.14/" { org.apache.httpcomponents.httpclient org.apache.httpcomponents.httpclient.source org.apache.httpcomponents.httpcore @@ -71,10 +57,8 @@ location "http://www.simantics.org/update/eclipse/updates/4.7/" { org.eclipse.ecf.core.ssl.feature.source.feature.group org.eclipse.ecf.filetransfer.feature.feature.group org.eclipse.ecf.filetransfer.feature.source.feature.group - org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group - org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group - org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group - org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group + org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group + org.eclipse.ecf.filetransfer.httpclient45.feature.source.feature.group org.eclipse.ecf.filetransfer.ssl.feature.feature.group org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group org.eclipse.equinox.p2.discovery.feature.feature.group @@ -157,7 +141,7 @@ location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/reposit org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group } -location "http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-oxygen/" { +location "http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-2019-12/" { org.eclipse.e4.tools.spies.feature.feature.group } @@ -316,8 +300,18 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.eclipse.collections.eclipse-collections-api.source org.eclipse.collections.eclipse-collections org.eclipse.collections.eclipse-collections.source + org.eclipse.jetty.continuation + org.eclipse.jetty.continuation.source + org.eclipse.jetty.http + org.eclipse.jetty.http.source + org.eclipse.jetty.io + org.eclipse.jetty.io.source + org.eclipse.jetty.server + org.eclipse.jetty.server.source org.eclipse.jetty.servlets org.eclipse.jetty.servlets.source + org.eclipse.jetty.util + org.eclipse.jetty.util.source com.github.benmanes.caffeine com.github.benmanes.caffeine.source org.glassfish.hk2.api diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.target b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.target deleted file mode 100644 index 9db9ec548..000000000 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.target +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.tpd deleted file mode 100644 index 7c616efe9..000000000 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.14.tpd +++ /dev/null @@ -1,11 +0,0 @@ -target "Simantics 1.42.0" - -with source allEnvironments - -include "http://www.simantics.org/download/master/org.simantics.sdk.build.targetdefinition-4.14.tpd" -//include "org.simantics.sdk.build.targetdefinition-4.14.tpd" - -location "http://www.simantics.org/download/master/sdk" { - org.simantics.sdk.feature.group lazy - org.simantics.sdk.source.feature.group lazy -} diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index 974ebb718..f49271eef 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,95 +1,77 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,8 +141,8 @@ - - + + @@ -317,8 +299,16 @@ + + + + + + + + -- 2.47.1