summaryrefslogtreecommitdiff
path: root/org.genivi.commonapi.core.feature
diff options
context:
space:
mode:
Diffstat (limited to 'org.genivi.commonapi.core.feature')
-rw-r--r--org.genivi.commonapi.core.feature/.gitignore1
-rw-r--r--org.genivi.commonapi.core.feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--org.genivi.commonapi.core.feature/.settings/org.eclipse.core.runtime.prefs2
-rw-r--r--org.genivi.commonapi.core.feature/build.properties1
-rw-r--r--org.genivi.commonapi.core.feature/feature.xml21
-rw-r--r--org.genivi.commonapi.core.feature/pom.xml8
6 files changed, 12 insertions, 23 deletions
diff --git a/org.genivi.commonapi.core.feature/.gitignore b/org.genivi.commonapi.core.feature/.gitignore
index ea8c4bf..873d37a 100644
--- a/org.genivi.commonapi.core.feature/.gitignore
+++ b/org.genivi.commonapi.core.feature/.gitignore
@@ -1 +1,2 @@
+*~
/target
diff --git a/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/org.genivi.commonapi.core.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/org.genivi.commonapi.core.feature/build.properties b/org.genivi.commonapi.core.feature/build.properties
index 52c3cfc..3efcc19 100644
--- a/org.genivi.commonapi.core.feature/build.properties
+++ b/org.genivi.commonapi.core.feature/build.properties
@@ -1,3 +1,4 @@
+javacDefaultEncoding.. = UTF-8
bin.includes = feature.xml,\
license.html,\
feature.properties
diff --git a/org.genivi.commonapi.core.feature/feature.xml b/org.genivi.commonapi.core.feature/feature.xml
index a59d249..64a6a81 100644
--- a/org.genivi.commonapi.core.feature/feature.xml
+++ b/org.genivi.commonapi.core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.genivi.commonapi.core.feature"
label="%featureName"
- version="2.1.6.qualifier"
+ version="3.1.1.qualifier"
provider-name="%providerName">
<copyright>
@@ -13,24 +13,7 @@
%license
</license>
- <requires>
- <import plugin="org.eclipse.core.resources" version="3.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtend2.lib" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.generator" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.util" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="org.franca.core.dsl" version="0.8.9" match="equivalent"/>
- <import plugin="javax.inject"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.builder" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.ui" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.ui.ecore" version="2.4.0" match="greaterOrEqual"/>
- <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
- <import plugin="org.genivi.commonapi.core" version="2.1.5" match="greaterOrEqual"/>
- </requires>
-
- <plugin
+ <plugin
id="org.genivi.commonapi.core"
download-size="0"
install-size="0"
diff --git a/org.genivi.commonapi.core.feature/pom.xml b/org.genivi.commonapi.core.feature/pom.xml
index 282fcd3..8649cae 100644
--- a/org.genivi.commonapi.core.feature/pom.xml
+++ b/org.genivi.commonapi.core.feature/pom.xml
@@ -6,8 +6,8 @@
<packaging>eclipse-feature</packaging>
<parent>
<groupId>commonapi</groupId>
- <artifactId>org.genivi.commonapi.releng</artifactId>
- <version>2.1.6-SNAPSHOT</version>
- <relativePath>../org.genivi.commonapi.releng</relativePath>
+ <artifactId>org.genivi.commonapi.core.releng</artifactId>
+ <version>3.1.1-SNAPSHOT</version>
+ <relativePath>../org.genivi.commonapi.core.releng</relativePath>
</parent>
-</project> \ No newline at end of file
+</project>