aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2018-07-13 07:31:11 -0400
committerJuergen Haug2018-07-18 03:42:30 -0400
commit4e869c85c5c03b09566b1211605e28b43c3dade7 (patch)
tree452864c49931f32c2d62ecb3399f97281ee85e36
parentb5c007221654a5367ad8f92f8fd14b786b46ab3b (diff)
downloadorg.eclipse.etrice-4e869c85c5c03b09566b1211605e28b43c3dade7.tar.gz
org.eclipse.etrice-4e869c85c5c03b09566b1211605e28b43c3dade7.tar.xz
org.eclipse.etrice-4e869c85c5c03b09566b1211605e28b43c3dade7.zip
Bug 536975 [releng] fixed build to be compatible xtext 2.12
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml2
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF1
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml36
3 files changed, 21 insertions, 18 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 2461e20a1..3f60bd41e 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -47,7 +47,7 @@ http://www.eclipse.org/legal/epl-v10.html
<requires>
<import plugin="org.apache.commons.io" version="2.0.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.xtext.sdk" version="2.12.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.xtext.redist" version="2.12.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
index c632b8706..2665d4769 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Export-Package: org.eclipse.etrice.generator.fsm.base,
org.eclipse.etrice.generator.fsm.generic
Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0",
org.eclipse.etrice.core.genmodel.fsm;bundle-version="2.0.0",
- org.eclipse.emf;bundle-version="2.6.0",
org.apache.commons.io;bundle-version="2.0.1",
org.eclipse.core.resources,
org.eclipse.core.runtime,
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index a9561596a..2e3e912d6 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -1,30 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<properties>
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
<xtext.version>2.12.0</xtext.version>
<tycho.version>1.1.0</tycho.version>
<cbi.version>1.1.4</cbi.version>
-
+
<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
- <xtext.url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</xtext.url>
+ <xtext.url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtext.version}</xtext.url>
<license.url>http://download.eclipse.org/cbi/updates/license</license.url>
<orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
<cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url>
<etrice.url>http://download.eclipse.org/etrice/updates/nightly</etrice.url>
-
+
<build.alias></build.alias>
<build.type>N</build.type>
</properties>
-
+
<repositories>
<repository>
<id>eclipse</id>
@@ -47,14 +48,14 @@
<layout>p2</layout>
</repository>
</repositories>
-
+
<pluginRepositories>
<pluginRepository>
<id>cbi</id>
<url>${cbi.url}</url>
</pluginRepository>
</pluginRepositories>
-
+
<profiles>
<profile>
<id>sign</id>
@@ -78,7 +79,7 @@
</build>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
@@ -108,13 +109,16 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
- <configuration>
- <baselineRepositories>
- <repository>
- <url>${etrice.url}</url>
- </repository>
+ <!-- This line causes tycho to package artifacts from ${etrice.url} to the built jars!
+ The current built artifacts are just ignored !!!!1
+ <configuration>
+ <baselineRepositories>
+ <repository>
+ <url>${etrice.url}</url>
+ </repository>
</baselineRepositories>
- </configuration>
+ </configuration>
+ -->
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
@@ -171,5 +175,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>