Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2017-08-31 10:47:34 -0400
committerJan Belle2017-08-31 10:47:34 -0400
commit2b3ac6e99310df76f704e7231748bcc236e708a6 (patch)
treeb0b917dc95d45b5f628fba7ed1dba3e293539bf8
parentf3b5f39f725e0993bd713ff863c75ddd50bda41c (diff)
downloadorg.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.tar.gz
org.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.tar.xz
org.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.zip
Bug 521698 - Tycho build
maven tycho build for plugins, plugin tests, features, update site Change-Id: Ic16d1fee6913a4b31c69c2d865b62931a421abfe
-rw-r--r--.gitignore1
-rw-r--r--.mvn/extensions.xml8
-rw-r--r--features/org.eclipse.etrice.cdt-integration.feature/build.properties1
-rw-r--r--features/org.eclipse.etrice.feature/build.properties1
-rw-r--r--features/org.eclipse.etrice.tests.feature/build.properties7
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml27
-rw-r--r--features/pom.xml16
-rw-r--r--plugins/org.eclipse.etrice.core.common/pom.xml16
-rw-r--r--plugins/org.eclipse.etrice.core.config/pom.xml16
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/build.properties1
-rw-r--r--plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.etrice.core.room/plugin.xml4
-rw-r--r--plugins/org.eclipse.etrice.core.room/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/build.properties1
-rw-r--r--plugins/org.eclipse.etrice.generator.config/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/build.properties1
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.generator.java/build.properties1
-rw-r--r--plugins/org.eclipse.etrice.generator.java/pom.xml15
-rw-r--r--plugins/org.eclipse.etrice.generator/pom.xml15
-rw-r--r--plugins/pom.xml16
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml425
-rw-r--r--releng/org.eclipse.etrice.site/category.xml7
-rw-r--r--releng/org.eclipse.etrice.site/pom.xml15
-rw-r--r--tests/org.eclipse.etrice.core.room.tests/build.properties3
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/.classpath (renamed from tests/org.eclipse.etrice.ui.tests.base/.classpath)0
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/.gitignore (renamed from tests/org.eclipse.etrice.ui.tests.base/.gitignore)0
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/.project (renamed from tests/org.eclipse.etrice.ui.tests.base/.project)2
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF (renamed from tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF)2
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/about.html (renamed from tests/org.eclipse.etrice.ui.tests.base/about.html)0
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/build.properties (renamed from tests/org.eclipse.etrice.ui.tests.base/build.properties)0
-rw-r--r--tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java (renamed from tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java)0
-rw-r--r--tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/pom.xml29
42 files changed, 222 insertions, 552 deletions
diff --git a/.gitignore b/.gitignore
index 6dda95abc..cb6f85480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gerritKeys.pub
*._trace
*.xtendbin
language.settings.xml
+target/ \ No newline at end of file
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..f62dee9d1
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<extensions>
+ <extension>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pomless</artifactId>
+ <version>1.0.0</version>
+ </extension>
+</extensions>
+
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/build.properties b/features/org.eclipse.etrice.cdt-integration.feature/build.properties
index 724093182..6f1a9556b 100644
--- a/features/org.eclipse.etrice.cdt-integration.feature/build.properties
+++ b/features/org.eclipse.etrice.cdt-integration.feature/build.properties
@@ -5,5 +5,4 @@ bin.includes = feature.xml,\
about.properties,\
build.properties,\
feature.properties,\
- modeling32.png,\
eTrice32.png
diff --git a/features/org.eclipse.etrice.feature/build.properties b/features/org.eclipse.etrice.feature/build.properties
index bc3cc5571..a259f22bb 100644
--- a/features/org.eclipse.etrice.feature/build.properties
+++ b/features/org.eclipse.etrice.feature/build.properties
@@ -5,6 +5,5 @@ bin.includes = about.html,\
about.properties,\
feature.xml,\
feature.properties,\
- modeling32.png,\
eTrice32.png
sourcePlugin = true
diff --git a/features/org.eclipse.etrice.tests.feature/build.properties b/features/org.eclipse.etrice.tests.feature/build.properties
index bfd6aa0c4..818b4b15e 100644
--- a/features/org.eclipse.etrice.tests.feature/build.properties
+++ b/features/org.eclipse.etrice.tests.feature/build.properties
@@ -1,13 +1,8 @@
# NLS_MESSAGEFORMAT_VAR
-bin.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
+bin.includes = about.html,\
about.ini,\
about.mappings,\
about.properties,\
- modeling32.png,\
- src/,\
- META-INF/,\
feature.xml,\
epl-v10.html,\
license.html,\
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 729dbbd88..80e0a9f0c 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -27,18 +27,17 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.etrice.core.common" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.core.fsm" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xtext.junit4" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.xtend.core" version="2.7.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator.fsm" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.ui.behavior" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.ui.common" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.ui.common.base" version="1.1.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.etrice.ui.tests.base" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.ui.structure" version="1.1.1" match="greaterOrEqual"/>
@@ -48,7 +47,6 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.core.config" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.core.config.ui" version="1.1.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.junit4" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
<import plugin="org.hamcrest.core"/>
@@ -65,7 +63,14 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.pde.core" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.oomph.util" version="1.5.0" match="compatible"/>
+ <import plugin="org.eclipse.xtext.xbase.junit"/>
+ <import plugin="org.eclipse.etrice.ui.base.tests" version="1.1.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xtext.xbase.lib"/>
+ <import plugin="org.eclipse.etrice.core.common.ui"/>
+ <import plugin="org.eclipse.oomph.util" version="1.7.0" match="compatible"/>
+ <import plugin="com.google.guava"/>
+ <import plugin="org.eclipse.xtend.lib"/>
+ <import plugin="org.eclipse.xtend.lib.macro"/>
</requires>
<plugin
@@ -97,13 +102,6 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
- id="org.eclipse.etrice.ui.tests.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.etrice.etunit.converter.tests"
download-size="0"
install-size="0"
@@ -159,4 +157,11 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.ui.base.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 000000000..70f4af747
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,16 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../releng/org.eclipse.etrice.parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/pom.xml b/plugins/org.eclipse.etrice.core.common/pom.xml
deleted file mode 100644
index f029dc758..000000000
--- a/plugins/org.eclipse.etrice.core.common/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.common</artifactId>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/plugins/org.eclipse.etrice.core.config/pom.xml b/plugins/org.eclipse.etrice.core.config/pom.xml
deleted file mode 100644
index 9d9923952..000000000
--- a/plugins/org.eclipse.etrice.core.config/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.config</artifactId>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/plugins/org.eclipse.etrice.core.etmap/pom.xml b/plugins/org.eclipse.etrice.core.etmap/pom.xml
deleted file mode 100644
index af56e61d7..000000000
--- a/plugins/org.eclipse.etrice.core.etmap/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.etmap</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.core.etphys/pom.xml b/plugins/org.eclipse.etrice.core.etphys/pom.xml
deleted file mode 100644
index 82d2536df..000000000
--- a/plugins/org.eclipse.etrice.core.etphys/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.etphys</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.core.fsm/pom.xml b/plugins/org.eclipse.etrice.core.fsm/pom.xml
deleted file mode 100644
index 712b74627..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.fsm</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml b/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
deleted file mode 100644
index 0895761d6..000000000
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.genmodel.fsm</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.core.genmodel/pom.xml b/plugins/org.eclipse.etrice.core.genmodel/pom.xml
deleted file mode 100644
index 572e2f0d0..000000000
--- a/plugins/org.eclipse.etrice.core.genmodel/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.genmodel</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.core.room.ui/build.properties b/plugins/org.eclipse.etrice.core.room.ui/build.properties
index 437fbd8b2..2d720f777 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/build.properties
+++ b/plugins/org.eclipse.etrice.core.room.ui/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
plugin.xml,\
icons/,\
templates/,\
- eTriceKeywordHoverStyle.css,\
css/
diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
index d5c06ad3f..d8f6d3100 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
org.eclipse.xtext;bundle-version="2.6.0",
org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.xtext.xbase.lib,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
org.eclipse.emf.codegen.ecore;bundle-version="[2.6.0,3.0.0)";resolution:=optional,
org.eclipse.emf.mwe.utils;bundle-version="1.0.1";resolution:=optional,
diff --git a/plugins/org.eclipse.etrice.core.room/plugin.xml b/plugins/org.eclipse.etrice.core.room/plugin.xml
index 7d8870dd5..ddb11311d 100644
--- a/plugins/org.eclipse.etrice.core.room/plugin.xml
+++ b/plugins/org.eclipse.etrice.core.room/plugin.xml
@@ -12,8 +12,4 @@
</extension>
-
-
-
-
</plugin>
diff --git a/plugins/org.eclipse.etrice.core.room/pom.xml b/plugins/org.eclipse.etrice.core.room/pom.xml
deleted file mode 100644
index 9d047ead4..000000000
--- a/plugins/org.eclipse.etrice.core.room/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.core.room</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index e6340905d..d075329b9 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
org.eclipse.etrice.generator;bundle-version="1.1.1",
org.eclipse.etrice.generator.config;bundle-version="1.1.1",
org.eclipse.etrice.generator.doc;bundle-version="1.1.1",
- org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1",
org.eclipse.xtend.lib;bundle-version="2.6.0",
org.eclipse.xtext.generator;bundle-version="2.6.0",
- org.eclipse.xtext.util;bundle-version="2.6.0"
+ org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.etrice.generator.c,
diff --git a/plugins/org.eclipse.etrice.generator.c/build.properties b/plugins/org.eclipse.etrice.generator.c/build.properties
index 56a059e42..7738abf49 100644
--- a/plugins/org.eclipse.etrice.generator.c/build.properties
+++ b/plugins/org.eclipse.etrice.generator.c/build.properties
@@ -3,4 +3,3 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
icons/
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.config/pom.xml b/plugins/org.eclipse.etrice.generator.config/pom.xml
deleted file mode 100644
index a03704eae..000000000
--- a/plugins/org.eclipse.etrice.generator.config/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.generator.config</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.generator.doc/build.properties b/plugins/org.eclipse.etrice.generator.doc/build.properties
index 56a059e42..7738abf49 100644
--- a/plugins/org.eclipse.etrice.generator.doc/build.properties
+++ b/plugins/org.eclipse.etrice.generator.doc/build.properties
@@ -3,4 +3,3 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
icons/
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.doc/pom.xml b/plugins/org.eclipse.etrice.generator.doc/pom.xml
deleted file mode 100644
index 263ba6cec..000000000
--- a/plugins/org.eclipse.etrice.generator.doc/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.generator.doc</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.generator.fsm/pom.xml b/plugins/org.eclipse.etrice.generator.fsm/pom.xml
deleted file mode 100644
index 94e44bdd0..000000000
--- a/plugins/org.eclipse.etrice.generator.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.generator.fsm</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.generator.java/build.properties b/plugins/org.eclipse.etrice.generator.java/build.properties
index 8519769ca..ea832598c 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.properties
+++ b/plugins/org.eclipse.etrice.generator.java/build.properties
@@ -2,4 +2,3 @@ source.. = src/,\
xtend-gen/
bin.includes = META-INF/,\
.
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.java/pom.xml b/plugins/org.eclipse.etrice.generator.java/pom.xml
deleted file mode 100644
index a0500296e..000000000
--- a/plugins/org.eclipse.etrice.generator.java/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.generator.java</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.etrice.generator/pom.xml b/plugins/org.eclipse.etrice.generator/pom.xml
deleted file mode 100644
index a18e1880b..000000000
--- a/plugins/org.eclipse.etrice.generator/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.etrice.generator</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
new file mode 100644
index 000000000..cd18cfb23
--- /dev/null
+++ b/plugins/pom.xml
@@ -0,0 +1,16 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../releng/org.eclipse.etrice.parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.plugins</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 8b1646af9..da916c785 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -3,196 +3,111 @@
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">
<modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>eTrice Java generator</name>
-
- <description>code generator from ROOM (Real-Time Object Oriented Modeling)
- models to the Java target language</description>
- <url>http://eclipse.org/etrice</url>
- <inceptionYear>2010</inceptionYear>
-
+ <modules>
+ <!-- Plugins -->
+ <module>../../plugins/org.eclipse.etrice.abstractexec.behavior</module>
+ <module>../../plugins/org.eclipse.etrice.core.common</module>
+ <module>../../plugins/org.eclipse.etrice.core.common.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.config</module>
+ <module>../../plugins/org.eclipse.etrice.core.config.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.etmap</module>
+ <module>../../plugins/org.eclipse.etrice.core.etmap.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.etphys</module>
+ <module>../../plugins/org.eclipse.etrice.core.etphys.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.core.fsm.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.genmodel</module>
+ <module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.core.room</module>
+ <module>../../plugins/org.eclipse.etrice.core.room.ui</module>
+ <module>../../plugins/org.eclipse.etrice.doc</module>
+ <module>../../plugins/org.eclipse.etrice.etunit.converter</module>
+ <module>../../plugins/org.eclipse.etrice.expressions.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator</module>
+ <module>../../plugins/org.eclipse.etrice.generator.c</module>
+ <module>../../plugins/org.eclipse.etrice.generator.config</module>
+ <module>../../plugins/org.eclipse.etrice.generator.cpp</module>
+ <module>../../plugins/org.eclipse.etrice.generator.doc</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsmtest</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsmtest.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator.gnuplot</module>
+ <module>../../plugins/org.eclipse.etrice.generator.java</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.c</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.cpp</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.java</module>
+ <module>../../plugins/org.eclipse.etrice.generator.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator.ui.cdt</module>
+ <module>../../plugins/org.eclipse.etrice.logging</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior.actioneditor</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.ui.commands</module>
+ <module>../../plugins/org.eclipse.etrice.ui.common</module>
+ <module>../../plugins/org.eclipse.etrice.ui.common.base</module>
+ <module>../../plugins/org.eclipse.etrice.ui.runtime</module>
+ <module>../../plugins/org.eclipse.etrice.ui.structure</module>
+
+ <!-- Tests -->
+ <module>../../tests/org.eclipse.etrice.abstractexec.behavior.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.common.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.config.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.etmap.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.etphys.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.fsm.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.genmodel.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.room.tests</module>
+ <module>../../tests/org.eclipse.etrice.etunit.converter.tests</module>
+ <module>../../tests/org.eclipse.etrice.generator.fsmtest.tests</module>
+ <module>../../tests/org.eclipse.etrice.generator.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.base.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.behavior.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.structure.tests</module>
+
+ <!-- Features -->
+ <module>../../features/org.eclipse.etrice.cdt-integration.feature</module>
+ <module>../../features/org.eclipse.etrice.feature</module>
+ <module>../../features/org.eclipse.etrice.fsm.feature</module>
+ <module>../../features/org.eclipse.etrice.tests.feature</module>
+
+ <!-- Repositories -->
+ <module>../../releng/org.eclipse.etrice.site</module>
+
+ </modules>
+
<properties>
- <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
-
- <etrice.version>${project.version}</etrice.version>
-
- <tycho.version>0.19.0</tycho.version>
- <tycho-extras.version>${tycho.version}</tycho-extras.version>
-
- <!-- eclipse version etrice is built against -->
- <eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
-
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-site>
+ <xtext.version>2.10.0</xtext.version>
+ <tycho.version>1.0.0</tycho.version>
+
+ <eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.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>
</properties>
-
- <organization>
- <name>Protos Software GmbH</name>
- <url>http://www.protos.de</url>
- </organization>
-
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
-
- <issueManagement>
- <system>Bugzilla</system>
- <url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://hudson.eclipse.org/etrice/job/etrice-maven3/</url>
- </ciManagement>
-
- <scm>
- <url>http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/</url>
- <connection>http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</connection>
- <developerConnection>ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</developerConnection>
- </scm>
-
- <developers>
- <developer>
- <name>Thomas Schuetz</name>
- </developer>
- <developer>
- <name>Henrik Rentz-Reichert</name>
- </developer>
- <developer>
- <name>Thomas Jung</name>
- </developer>
- <developer>
- <name>Juergen Haug</name>
- </developer>
- <developer>
- <name>Eyrak Paen</name>
- </developer>
- <developer>
- <name>Peter Karlitschek</name>
- </developer>
- </developers>
-
<repositories>
<repository>
<id>eclipse</id>
+ <url>${eclipse.url}</url>
<layout>p2</layout>
- <url>${eclipse-repo.url}</url>
</repository>
<repository>
- <id>orbit</id>
+ <id>license</id>
+ <url>${license.url}</url>
<layout>p2</layout>
- <url>${orbit-site}</url>
</repository>
<repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <id>orbit</id>
+ <url>${orbit.url}</url>
+ <layout>p2</layout>
</repository>
</repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repo.eclipse.org.cbi-releases</id>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <modules>
- <module>../../plugins/org.eclipse.etrice.core.common</module>
- <module>../../plugins/org.eclipse.etrice.core.fsm</module>
- <module>../../plugins/org.eclipse.etrice.core.room</module>
- <module>../../plugins/org.eclipse.etrice.core.config</module>
- <module>../../plugins/org.eclipse.etrice.core.etphys</module>
- <module>../../plugins/org.eclipse.etrice.core.etmap</module>
- <module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
- <module>../../plugins/org.eclipse.etrice.core.genmodel</module>
- <module>../../plugins/org.eclipse.etrice.generator.fsm</module>
- <module>../../plugins/org.eclipse.etrice.generator</module>
- <module>../../plugins/org.eclipse.etrice.generator.config</module>
- <module>../../plugins/org.eclipse.etrice.generator.doc</module>
- <module>../../plugins/org.eclipse.etrice.generator.java</module>
- <module>../../plugins/org.eclipse.etrice.generator.java.mvn</module>
- <module>../../runtime/org.eclipse.etrice.modellib.java</module>
- <module>../../runtime/org.eclipse.etrice.runtime.java</module>
- </modules>
-
- <profiles>
- <profile>
- <id>fast</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>full</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <tags>
- <tag>
- <name>generated</name>
- <placement>a</placement>
- <head>Generated:</head>
- </tag>
- <tag>
- <name>ordered</name>
- <placement>X</placement>
- <head>Ordered:</head>
- </tag>
- <tag>
- <name>model</name>
- <placement>X</placement>
- <head>Model:</head>
- </tag>
- <tag>
- <name>parameter</name>
- <placement>X</placement>
- <head>Parameter:</head>
- </tag>
- </tags>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+
<build>
<plugins>
<plugin>
@@ -201,148 +116,26 @@
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
+ <!-- plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>${xtext.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>xtend-install-debug-info</goal>
+ </goals>
+ <configuration>
+ <xtendAsPrimaryDebugSource>true</xtendAsPrimaryDebugSource>
+ <writeTraceFiles>true</writeTraceFiles>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>xtend-gen</outputDirectory>
+ </configuration>
+ </plugin -->
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <excludeResources>
- <!-- avoid error markers in the target folder by excluding ecore models -->
- <excludeResource>**/*.ecore</excludeResource>
- </excludeResources>
- <compilerArguments>
- <enableJavadoc />
- <encoding>ISO-8859-1</encoding>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- <format>'v'yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider>
- <jgit.ignore>
- </jgit.ignore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <baselineMode>warn</baselineMode>
- <baselineReplace>none</baselineReplace>
- <baselineRepositories>
- <repository>
- <url>http://download.eclipse.org/eclipse/updates/4.2</url>
- </repository>
- </baselineRepositories>
- </configuration>
- </plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.eclipse.tycho
- </groupId>
- <artifactId>
- tycho-packaging-plugin
- </artifactId>
- <versionRange>
- [0.19.0,)
- </versionRange>
- <goals>
- <goal>validate-id</goal>
- <goal>validate-version</goal>
- <goal>build-qualifier</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.eclipse.tycho
- </groupId>
- <artifactId>
- tycho-compiler-plugin
- </artifactId>
- <versionRange>
- [0.19.0,)
- </versionRange>
- <goals>
- <goal>compile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <distributionManagement>
- <repository>
- <id>repo.eclipse.org</id>
- <name>eTrice Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/etrice-releases/</url>
- </repository>
- <snapshotRepository>
- <id>repo.eclipse.org</id>
- <name>eTrice Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/etrice-snapshots/</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
+ </build>
</project>
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 54ec264e2..b09fe076d 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.eclipse.etrice.core" version="0.0.0">
+ <feature url="features/org.eclipse.etrice.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.feature" version="1.1.1.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
- <feature id="org.eclipse.etrice.examples" version="0.0.0">
- <category name="org.eclipse.etrice"/>
- </feature>
- <feature id="org.eclipse.etrice.tests" version="0.0.0">
+ <feature url="features/org.eclipse.etrice.cdt-integration.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
<category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
new file mode 100644
index 000000000..77bcbfd22
--- /dev/null
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -0,0 +1,15 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+ </parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.site</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/tests/org.eclipse.etrice.core.room.tests/build.properties b/tests/org.eclipse.etrice.core.room.tests/build.properties
index 774ee5239..bd036ffc6 100644
--- a/tests/org.eclipse.etrice.core.room.tests/build.properties
+++ b/tests/org.eclipse.etrice.core.room.tests/build.properties
@@ -1,5 +1,6 @@
source.. = src/,\
- xtend-gen/
+ xtend-gen/,\
+ src-gen/
output.. = bin/
bin.includes = META-INF/,\
.,\
diff --git a/tests/org.eclipse.etrice.ui.tests.base/.classpath b/tests/org.eclipse.etrice.ui.base.tests/.classpath
index 1fa3e6803..1fa3e6803 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/.classpath
+++ b/tests/org.eclipse.etrice.ui.base.tests/.classpath
diff --git a/tests/org.eclipse.etrice.ui.tests.base/.gitignore b/tests/org.eclipse.etrice.ui.base.tests/.gitignore
index ba077a403..ba077a403 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/.gitignore
+++ b/tests/org.eclipse.etrice.ui.base.tests/.gitignore
diff --git a/tests/org.eclipse.etrice.ui.tests.base/.project b/tests/org.eclipse.etrice.ui.base.tests/.project
index a9cfde5ad..0d2614b47 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/.project
+++ b/tests/org.eclipse.etrice.ui.base.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.etrice.ui.tests.base</name>
+ <name>org.eclipse.etrice.ui.base.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
index 20e03aaaa..edc780d96 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Diagram Test Base Classes
-Bundle-SymbolicName: org.eclipse.etrice.ui.tests.base
+Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests
Bundle-Version: 1.1.1.qualifier
Require-Bundle: org.junit;bundle-version="4.8.1",
org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.etrice.ui.tests.base/about.html b/tests/org.eclipse.etrice.ui.base.tests/about.html
index c258ef55d..c258ef55d 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/about.html
+++ b/tests/org.eclipse.etrice.ui.base.tests/about.html
diff --git a/tests/org.eclipse.etrice.ui.tests.base/build.properties b/tests/org.eclipse.etrice.ui.base.tests/build.properties
index 34d2e4d2d..34d2e4d2d 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/build.properties
+++ b/tests/org.eclipse.etrice.ui.base.tests/build.properties
diff --git a/tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java b/tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java
index 73a95af74..73a95af74 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java
+++ b/tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java
diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
index b82c1517a..1ac3fd4e5 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1",
org.eclipse.etrice.ui.common;bundle-version="1.1.1",
org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
- org.eclipse.etrice.ui.tests.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1",
org.eclipse.ui,
org.eclipse.core.runtime,
org.junit;bundle-version="4.8.1",
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index 64de37617..6ab01c2a4 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
org.eclipse.etrice.ui.structure;bundle-version="1.1.1",
org.eclipse.etrice.ui.common;bundle-version="1.1.1",
org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
- org.eclipse.etrice.ui.tests.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1",
org.eclipse.ui,
org.eclipse.core.runtime,
org.junit;bundle-version="4.8.1",
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 000000000..2614046e0
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,29 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../releng/org.eclipse.etrice.parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file

Back to the top