Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2016-10-04 03:02:02 -0400
committerHenrik Rentz-Reichert2016-10-17 08:28:00 -0400
commit1c2b5f9d2204ce3c033e4f2a4be08713bfebff66 (patch)
treee5d7a014c9feb606736f8c6df7b26b3c7881045f /releng
parent0723a9ccc971b0be4c108447ecb02f9842b49ac5 (diff)
parent43cd5f4a5f5babb1d48b8c65cd161171f18c1cdd (diff)
downloadorg.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.gz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.xz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.zip
transition to Neon
* resource map uses Neon update site * removed KIELER and layout features from Buckminster cspec (cannot be installed into Neon) * removed kieler and layout feature projects * upgraded BREE to Java 1.8 where necessary * eTrice-rt launch config with Java 1.8 * updated JUnit launch configs to Java 1.8 Change-Id: I35f8ac2819480dec7f5fe739ed2445af137a445f
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml2
-rw-r--r--releng/org.eclipse.etrice.releng/buckminster.cspec2
-rw-r--r--releng/org.eclipse.etrice.releng/build.rmap10
-rw-r--r--releng/org.eclipse.etrice.site/build.properties1
-rw-r--r--releng/org.eclipse.etrice.site/feature.xml8
5 files changed, 1 insertions, 22 deletions
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index d30b4e8c5..7cfedc6d0 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -280,7 +280,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.1.0</version>
+ <version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec
index ab26340bf..518ef7222 100644
--- a/releng/org.eclipse.etrice.releng/buckminster.cspec
+++ b/releng/org.eclipse.etrice.releng/buckminster.cspec
@@ -7,8 +7,6 @@
<cs:dependency name="org.eclipse.etrice.generator.common.tests" componentType="buckminster"/>
<cs:dependency name="org.eclipse.etrice.generator.cpp.tests" componentType="buckminster"/>
<cs:dependency name="org.eclipse.etrice.generator.java.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.kieler.feature" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.layout.feature" componentType="eclipse.feature"/>
<cs:dependency name="org.eclipse.etrice.modellib.c" componentType="buckminster"/>
<cs:dependency name="org.eclipse.etrice.modellib.cpp" componentType="buckminster"/>
<cs:dependency name="org.eclipse.etrice.modellib.java" componentType="buckminster"/>
diff --git a/releng/org.eclipse.etrice.releng/build.rmap b/releng/org.eclipse.etrice.releng/build.rmap
index b55979158..5ed724853 100644
--- a/releng/org.eclipse.etrice.releng/build.rmap
+++ b/releng/org.eclipse.etrice.releng/build.rmap
@@ -4,7 +4,6 @@
<rm:locator pattern="^org\.eclipse\.etrice\.releng.*" searchPathRef="releng"/>
<rm:locator pattern="^org\.eclipse\.etrice\.site" searchPathRef="releng"/>
<rm:locator pattern="^org\.eclipse\.etrice\.*" searchPathRef="sources"/>
- <rm:locator pattern="^de\.cau\.cs\.kieler\.*" searchPathRef="kieler"/>
<rm:locator pattern="^org\.eclipse\.license.*" searchPathRef="eclipse.license"/>
<rm:locator searchPathRef="platform.binaries" failOnError="false"/>
<rm:locator searchPathRef="orbit"/>
@@ -63,15 +62,6 @@
</rm:uri>
</rm:provider>
</rm:searchPath>
- <rm:searchPath name="kieler">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/etrice/KIELER/kieler-0.7.1">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
<rm:searchPath name="platform.binaries">
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
diff --git a/releng/org.eclipse.etrice.site/build.properties b/releng/org.eclipse.etrice.site/build.properties
index 23e542904..5b5e97089 100644
--- a/releng/org.eclipse.etrice.site/build.properties
+++ b/releng/org.eclipse.etrice.site/build.properties
@@ -35,5 +35,4 @@ category.id.optional=eTrice Plugins (optional)
category.default=optional
category.members.core=org.eclipse.etrice.feature,org.eclipse.etrice.cdt-integration.feature
-category.members.optional=org.eclipse.etrice.layout.feature,org.eclipse.etrice.kieler.feature
\ No newline at end of file
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index 3133d2a45..740354118 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -39,14 +39,6 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"/>
<includes
- id="org.eclipse.etrice.layout.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.etrice.kieler.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.etrice.cdt-integration.feature"
version="0.0.0"/>

Back to the top