Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.cdo-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/.project (renamed from features/org.eclipse.emf.cdo.dawn.sdk-feature/.project)19
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.ltk.core.refactoring.prefs (renamed from features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs)2
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs (renamed from features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs)0
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.team.ui.prefs (renamed from features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs)0
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/build.properties (renamed from features/org.eclipse.emf.cdo.examples.hibernate-feature/build.properties)3
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/feature.properties (renamed from features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.properties)6
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/feature.xml (renamed from features/org.eclipse.emf.cdo.site-feature/feature.xml)44
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.dawn.sdk-feature/build.properties13
-rw-r--r--features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml60
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/feature.xml83
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.examples.hibernate-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.xml65
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/build.properties24
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/feature.properties143
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/feature.xml162
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/build.properties10
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/rootfiles/about.html (renamed from features/org.eclipse.emf.cdo.explorer-feature/about.html)0
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/rootfiles/epl-v10.html (renamed from features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html)0
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/rootfiles/notice.html (renamed from features/org.eclipse.emf.cdo.explorer-feature/license.html)0
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/build.properties13
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/feature.xml45
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/feature.xml24
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.db4o-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.db4o-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.db4o-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.hibernate-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.hibernate-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.hibernate-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.server.objectivity-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.objectivity-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.gitignore1
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.project31
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/build.properties14
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/category.xml70
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/local.properties.template14
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/.project13
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/feature.xml13
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/build.properties13
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml48
-rw-r--r--features/org.eclipse.net4j-feature/.project13
-rw-r--r--features/org.eclipse.net4j-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/.project13
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.doc-feature/.project13
-rw-r--r--features/org.eclipse.net4j.doc-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.doc-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.examples-feature/.project13
-rw-r--r--features/org.eclipse.net4j.examples-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.examples-feature/feature.xml6
-rw-r--r--features/org.eclipse.net4j.examples-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/.project13
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/feature.xml6
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.sdk-feature/.project13
-rw-r--r--features/org.eclipse.net4j.sdk-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.sdk-feature/feature.xml46
-rw-r--r--features/org.eclipse.net4j.sdk-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.tests-feature/.project13
-rw-r--r--features/org.eclipse.net4j.tests-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.tests-feature/feature.xml6
-rw-r--r--features/org.eclipse.net4j.tests-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.ui-feature/.project13
-rw-r--r--features/org.eclipse.net4j.ui-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.ui-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.util-feature/.project13
-rw-r--r--features/org.eclipse.net4j.util-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.util-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.util-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/.project13
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/pom.xml31
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/.project13
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/build.properties1
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/pom.xml31
-rw-r--r--features/org.gastro-feature/.project27
-rw-r--r--features/org.gastro-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.gastro-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.gastro-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.gastro-feature/build.properties13
-rw-r--r--features/org.gastro-feature/feature.properties8
-rw-r--r--features/org.gastro-feature/feature.xml127
199 files changed, 1821 insertions, 1282 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/.project b/features/org.eclipse.emf.cdo-feature/.project
index 10b479f10f..313086d8e8 100644
--- a/features/org.eclipse.emf.cdo-feature/.project
+++ b/features/org.eclipse.emf.cdo-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo-feature/build.properties b/features/org.eclipse.emf.cdo-feature/build.properties
index ac653f763c..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo-feature/build.properties
+++ b/features/org.eclipse.emf.cdo-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo-feature/pom.xml b/features/org.eclipse.emf.cdo-feature/pom.xml
new file mode 100644
index 0000000000..fd264eda45
--- /dev/null
+++ b/features/org.eclipse.emf.cdo-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.dawn.sdk-feature/.project b/features/org.eclipse.emf.cdo.all-feature/.project
index cc29efb3ca..6a8811e57c 100644
--- a/features/org.eclipse.emf.cdo.dawn.sdk-feature/.project
+++ b/features/org.eclipse.emf.cdo.all-feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.dawn.sdk-feature</name>
+ <name>org.eclipse.emf.cdo.all-feature</name>
<comment></comment>
<projects>
</projects>
@@ -14,12 +14,8 @@
<name>org.eclipse.oomph.version.VersionBuilder</name>
<arguments>
<dictionary>
- <key>ignore.feature.content.changes</key>
- <value>true</value>
- </dictionary>
- <dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -28,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
index 1c7024e9a0..9b58a30859 100644
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -1,3 +1,3 @@
-#Mon Jul 04 12:36:24 CEST 2011
+#Mon Jul 04 12:36:04 CEST 2011
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d573634502..d573634502 100644
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.team.ui.prefs
index 3556bac076..3556bac076 100644
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/build.properties b/features/org.eclipse.emf.cdo.all-feature/build.properties
index 08e412d41e..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.all-feature/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2007, 2008, 2010-2012 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.properties b/features/org.eclipse.emf.cdo.all-feature/feature.properties
index 4ce66c1554..9a5bc8032e 100644
--- a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.properties
@@ -1,8 +1,8 @@
-# Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2007-2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Dawn SDK
-description = Contains the Runtime, Codegen, Tools, Examples, Documentation and Source.
+featureName = CDO Model Repository All
+description = Contains all CDO and Net4j features and plugins.
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index fe6a282dbc..8f3f05db50 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2016 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2007-2016 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -8,13 +8,13 @@
Contributors:
Eike Stepper - initial API and implementation
+ Christian W. Damus (CEA LIST) - bug 399306
-->
<feature
- id="org.eclipse.emf.cdo.site"
- label="CDO Model Repository Site"
- version="4.2.400.qualifier"
+ id="org.eclipse.emf.cdo.all"
+ label="%featureName"
+ version="4.7.0.qualifier"
provider-name="%providerName"
- image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -30,8 +30,13 @@
%license
</license>
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
<includes
- id="org.eclipse.emf.cdo.dawn.sdk"
+ id="org.eclipse.emf.cdo.dawn"
version="0.0.0"/>
<includes
@@ -43,10 +48,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.examples.hibernate"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.sdk"
version="0.0.0"/>
@@ -67,10 +68,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.tests.hibernate"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.net4j.db.derby"
version="0.0.0"/>
@@ -102,18 +99,6 @@
id="org.eclipse.net4j.tests"
version="0.0.0"/>
- <includes
- id="org.gastro"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.help"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.explorer"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.cdo.tests.objectivity"
download-size="0"
@@ -128,4 +113,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo.releng.help"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.all-feature/pom.xml b/features/org.eclipse.emf.cdo.all-feature/pom.xml
new file mode 100644
index 0000000000..cc3a18ac20
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.all-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.all</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.compare-feature/.project b/features/org.eclipse.emf.cdo.compare-feature/.project
index 0a93eabb80..8e3e9640ef 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/.project
+++ b/features/org.eclipse.emf.cdo.compare-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.compare-feature/build.properties b/features/org.eclipse.emf.cdo.compare-feature/build.properties
index d71e9cdafe..67c78e407e 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.compare-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.compare-feature/feature.xml b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
index da7b999159..578d5b8544 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.compare"
label="%featureName"
- version="4.4.100.qualifier"
+ version="4.4.200.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.compare-feature/pom.xml b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
new file mode 100644
index 0000000000..f98cb7c204
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.compare</artifactId>
+ <version>4.4.200-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/.project b/features/org.eclipse.emf.cdo.dawn-feature/.project
index afbab17796..3f3c2128b3 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/.project
+++ b/features/org.eclipse.emf.cdo.dawn-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/build.properties b/features/org.eclipse.emf.cdo.dawn-feature/build.properties
index 4b83b6f896..4c1c5ae184 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.dawn-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.properties b/features/org.eclipse.emf.cdo.dawn-feature/feature.properties
index 6c66ed7a2e..b9c8c6b9be 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Dawn Runtime
-description = Contains the runtime aspects for graphical collaboration support over CDO.
+featureName = CDO Model Repository Dawn
+description = Contains the graphical collaboration support for CDO.
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index acadf04052..f332ebbe28 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn"
label="%featureName"
- version="2.1.400.qualifier"
+ version="2.1.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
new file mode 100644
index 0000000000..9dbc0ac497
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.dawn</artifactId>
+ <version>2.1.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.dawn.sdk-feature/build.properties b/features/org.eclipse.emf.cdo.dawn.sdk-feature/build.properties
deleted file mode 100644
index 4b83b6f896..0000000000
--- a/features/org.eclipse.emf.cdo.dawn.sdk-feature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties
diff --git a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml
deleted file mode 100644
index 6b6159540d..0000000000
--- a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010-2014 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Martin Fluegge - initial API and implementation
--->
-<feature
- id="org.eclipse.emf.cdo.dawn.sdk"
- label="%featureName"
- version="2.1.200.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.emf.cdo.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.emf.cdo.dawn.sdk.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.dawn"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.cdo.dawn.sdk"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.cdo.doc-feature/.project b/features/org.eclipse.emf.cdo.doc-feature/.project
index ce4a9a32c3..97c7781090 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/.project
+++ b/features/org.eclipse.emf.cdo.doc-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.doc-feature/build.properties b/features/org.eclipse.emf.cdo.doc-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.doc-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.xml b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
index d2a6a28257..87134467b3 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.doc"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.doc-feature/pom.xml b/features/org.eclipse.emf.cdo.doc-feature/pom.xml
new file mode 100644
index 0000000000..bb7c23fbb5
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.doc-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.doc</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/.project b/features/org.eclipse.emf.cdo.epp-feature/.project
index 20c8659195..fdbaf75130 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/.project
+++ b/features/org.eclipse.emf.cdo.epp-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/build.properties b/features/org.eclipse.emf.cdo.epp-feature/build.properties
index 4b83b6f896..4c1c5ae184 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.epp-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.epp-feature/pom.xml b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
new file mode 100644
index 0000000000..fcccee3c97
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.epp</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/.project b/features/org.eclipse.emf.cdo.examples-feature/.project
index ef854e3eba..22b84a30ba 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/.project
+++ b/features/org.eclipse.emf.cdo.examples-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/build.properties b/features/org.eclipse.emf.cdo.examples-feature/build.properties
index ac653f763c..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.examples-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 9891e33da1..beed07efb0 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples"
label="%featureName"
- version="4.2.500.qualifier"
+ version="4.3.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -35,10 +35,6 @@
</url>
<includes
- id="org.eclipse.emf.cdo.examples.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.examples.installer"
version="0.0.0"/>
@@ -62,5 +58,82 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.gastro.business"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.business.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.inventory"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.inventory.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.rcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.rcp.department"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.rcp.table"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.server.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.gastro.testclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/pom.xml b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
new file mode 100644
index 0000000000..29fc28cba0
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.examples</artifactId>
+ <version>4.3.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.project b/features/org.eclipse.emf.cdo.examples.hibernate-feature/.project
deleted file mode 100644
index 6eff7fef4a..0000000000
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.examples.hibernate-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties
deleted file mode 100644
index d108d405f3..0000000000
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2011-2013, 2015 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = CDO Model Repository Server Hibernate Examples
-description = Contains the CDO Hibernate example plugin and sources. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.1.0/update for a p2 repository that contains Hibernate.
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.xml
deleted file mode 100644
index bdb29868fc..0000000000
--- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Martin Fluegge - initial API and implementation
--->
-<feature
- id="org.eclipse.emf.cdo.examples.hibernate"
- label="%featureName"
- version="4.2.400.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.cdo.examples.hibernate.server"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.emf.cdo.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.emf.cdo.examples.hibernate.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.cdo.examples.hibernate.client"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.examples.hibernate.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.examples.hibernate.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/.project b/features/org.eclipse.emf.cdo.examples.installer-feature/.project
index 65b68c583f..ee2f10ab63 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/.project
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/build.properties b/features/org.eclipse.emf.cdo.examples.installer-feature/build.properties
index a2f05a3e6c..500254a9c7 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
index 714288315d..8e83e09d22 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
@@ -34,10 +34,6 @@
<update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.emf.cdo.examples.installer.source"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.cdo.examples.installer"
download-size="0"
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
new file mode 100644
index 0000000000..a3dc588caa
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.project b/features/org.eclipse.emf.cdo.explorer-feature/.project
deleted file mode 100644
index 4d2c745c00..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.explorer-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 34b0796d29..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jul 04 12:33:55 CEST 2011
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 0d23360c5f..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 10:16:21 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/build.properties b/features/org.eclipse.emf.cdo.explorer-feature/build.properties
deleted file mode 100644
index eae4f9f3fa..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2015 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties,\
- CDOExplorer.product,\
- rootfiles/,\
- icons/,\
- epl-v10.html,\
- about.html,\
- license.html
-src.includes = about.html,\
- epl-v10.html,\
- buckminster.cspex,\
- rootfiles/,\
- license.html
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/feature.properties b/features/org.eclipse.emf.cdo.explorer-feature/feature.properties
deleted file mode 100644
index da897ccf1a..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) 2015 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = CDO Model Repository Explorer Product
-description = Contains the product definition of an installable CDO explorer.
-
-providerName = Eclipse Modeling Project
-updateSiteName = Eclipse Modeling Project Updates
-
-copyrightURL = copyright.txt
-copyright = Copyright (c) 2015 Eike Stepper (Berlin, Germany) and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-
-licenseURL=license.html
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer-feature/feature.xml
deleted file mode 100644
index e3b3f93038..0000000000
--- a/features/org.eclipse.emf.cdo.explorer-feature/feature.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015, 2016 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eike Stepper - initial API and implementation
--->
-<feature
- id="org.eclipse.emf.cdo.explorer"
- label="%featureName"
- version="4.5.100.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.emf.cdo.explorer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.explorer.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.net4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.ui.shared"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.jvm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.tcp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.ui.shared"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.util.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer.repository"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.cdo.license-feature/.project b/features/org.eclipse.emf.cdo.license-feature/.project
index cc2bfa0e84..cbffada39c 100644
--- a/features/org.eclipse.emf.cdo.license-feature/.project
+++ b/features/org.eclipse.emf.cdo.license-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.license-feature/build.properties b/features/org.eclipse.emf.cdo.license-feature/build.properties
index 09ad196e8d..9fc11b740f 100644
--- a/features/org.eclipse.emf.cdo.license-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.license-feature/build.properties
@@ -13,7 +13,13 @@ bin.includes = feature.xml,\
feature.properties,\
epl-v10.html,\
about.html,\
- license.html
+ license.html,\
+ build.properties,\
+ rootfiles/
src.includes = epl-v10.html,\
about.html,\
- license.html
+ license.html,\
+ pom.xml
+
+root = rootfiles
+ \ No newline at end of file
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.xml b/features/org.eclipse.emf.cdo.license-feature/feature.xml
index 5beb875726..e23695dfe0 100644
--- a/features/org.eclipse.emf.cdo.license-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.license-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.license"
label="CDO License"
- version="4.1.400.qualifier"
+ version="4.1.500.qualifier"
provider-name="Eclipse Modeling Project"
image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.emf.cdo.license-feature/pom.xml b/features/org.eclipse.emf.cdo.license-feature/pom.xml
new file mode 100644
index 0000000000..3137c55ba1
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.license-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.license</artifactId>
+ <version>4.1.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/about.html b/features/org.eclipse.emf.cdo.license-feature/rootfiles/about.html
index d35d5aed64..d35d5aed64 100644
--- a/features/org.eclipse.emf.cdo.explorer-feature/about.html
+++ b/features/org.eclipse.emf.cdo.license-feature/rootfiles/about.html
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html b/features/org.eclipse.emf.cdo.license-feature/rootfiles/epl-v10.html
index cb1073a4ba..cb1073a4ba 100644
--- a/features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html
+++ b/features/org.eclipse.emf.cdo.license-feature/rootfiles/epl-v10.html
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/license.html b/features/org.eclipse.emf.cdo.license-feature/rootfiles/notice.html
index c3d34c3c21..c3d34c3c21 100644
--- a/features/org.eclipse.emf.cdo.explorer-feature/license.html
+++ b/features/org.eclipse.emf.cdo.license-feature/rootfiles/notice.html
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/.project b/features/org.eclipse.emf.cdo.migrator-feature/.project
index 0f1b3d56fb..83e7daacc0 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/.project
+++ b/features/org.eclipse.emf.cdo.migrator-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/build.properties b/features/org.eclipse.emf.cdo.migrator-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.migrator-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
index 1ee44fbfbe..7a0581c94c 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.migrator"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
new file mode 100644
index 0000000000..2fa5335de4
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.migrator</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/.project b/features/org.eclipse.emf.cdo.releng.help-feature/.project
deleted file mode 100644
index 6eac358982..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.releng.help-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 2e4a92ec2a..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 11 16:02:05 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d573634502..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 3556bac076..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/build.properties b/features/org.eclipse.emf.cdo.releng.help-feature/build.properties
deleted file mode 100644
index bab91c96aa..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2011, 2012, 2016 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties
deleted file mode 100644
index 43e616a6f6..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2011-2013, 2016 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = Release Engineering Documentation
-description = Contains the documentation of the CDO release engineering infrastructure.
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
deleted file mode 100644
index cc8fb226c4..0000000000
--- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eike Stepper - initial API and implementation
--->
-<feature
- id="org.eclipse.emf.cdo.releng.help"
- label="%featureName"
- version="4.2.400.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.emf.cdo.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.emf.cdo.releng.help"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/.project b/features/org.eclipse.emf.cdo.sdk-feature/.project
index 72c88a8346..097e4e019c 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/.project
+++ b/features/org.eclipse.emf.cdo.sdk-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/build.properties b/features/org.eclipse.emf.cdo.sdk-feature/build.properties
index 1f952a2060..a7fc85b909 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.sdk-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index f9bc9a92a5..4f61d467b5 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -44,18 +44,10 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.compare.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.server.embedded"
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.server.embedded.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.server.db"
version="0.0.0"/>
@@ -68,22 +60,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.sdk.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.server.hibernate.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.server.db4o.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.server.objectivity.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.migrator"
version="0.0.0"/>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
new file mode 100644
index 0000000000..baeb7773f9
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.sdk</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server-feature/.project b/features/org.eclipse.emf.cdo.server-feature/.project
index 68c1838543..17ee1970d0 100644
--- a/features/org.eclipse.emf.cdo.server-feature/.project
+++ b/features/org.eclipse.emf.cdo.server-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server-feature/build.properties b/features/org.eclipse.emf.cdo.server-feature/build.properties
index ac653f763c..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo.server-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index c535e32145..8b594e011f 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.server-feature/pom.xml b/features/org.eclipse.emf.cdo.server-feature/pom.xml
new file mode 100644
index 0000000000..0567c3ebc3
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/.project b/features/org.eclipse.emf.cdo.server.db-feature/.project
index a7b485c35f..1c1ef4cb6e 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.db-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/build.properties b/features/org.eclipse.emf.cdo.server.db-feature/build.properties
index 4b83b6f896..4c1c5ae184 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.db-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
index b093772ecc..b23feb8619 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.db"
label="%featureName"
- version="4.5.0.qualifier"
+ version="4.5.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/pom.xml b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
new file mode 100644
index 0000000000..dd4ede5429
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.db</artifactId>
+ <version>4.5.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/.project b/features/org.eclipse.emf.cdo.server.db4o-feature/.project
index 7feae90b00..72ed15cf58 100644
--- a/features/org.eclipse.emf.cdo.server.db4o-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.db4o-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/build.properties b/features/org.eclipse.emf.cdo.server.db4o-feature/build.properties
index 4b83b6f896..4c1c5ae184 100644
--- a/features/org.eclipse.emf.cdo.server.db4o-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.db4o-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml
index aa9cde728b..817b13c6e7 100644
--- a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.server.db4o"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/pom.xml b/features/org.eclipse.emf.cdo.server.db4o-feature/pom.xml
new file mode 100644
index 0000000000..2972c20886
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.db4o-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.db4o</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/.project b/features/org.eclipse.emf.cdo.server.embedded-feature/.project
index c327383517..347c4ad76a 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/build.properties b/features/org.eclipse.emf.cdo.server.embedded-feature/build.properties
index ac653f763c..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
new file mode 100644
index 0000000000..e18337c892
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.embedded</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/.project b/features/org.eclipse.emf.cdo.server.hibernate-feature/.project
index fcb0b07986..8f5ecd2329 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/build.properties b/features/org.eclipse.emf.cdo.server.hibernate-feature/build.properties
index 0c00850eeb..cd4e1d92e7 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
index 5be8deced0..3c63c50a68 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.hibernate"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/pom.xml b/features/org.eclipse.emf.cdo.server.hibernate-feature/pom.xml
new file mode 100644
index 0000000000..dde7b22cd6
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.hibernate</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.project b/features/org.eclipse.emf.cdo.server.lissome-feature/.project
index 168d2cbcbe..42a4fc13a9 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties b/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties
index a2f05a3e6c..500254a9c7 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
index eb5ad5ea2a..615305fc8f 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.lissome"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
new file mode 100644
index 0000000000..7b046c7db7
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.lissome</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/.project b/features/org.eclipse.emf.cdo.server.mongodb-feature/.project
index 28c49fce34..b18b0a1ab6 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/build.properties b/features/org.eclipse.emf.cdo.server.mongodb-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
index ba804777ea..365185d63f 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.mongodb"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
new file mode 100644
index 0000000000..296eed1312
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.mongodb</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/.project b/features/org.eclipse.emf.cdo.server.objectivity-feature/.project
index 1a236517c9..20c6e28e07 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/.project
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties b/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
index 4b83b6f896..4c1c5ae184 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
index 53f701c171..c1b187c2a0 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.server.objectivity"
label="%featureName"
- version="4.2.300.qualifier"
+ version="4.2.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/pom.xml b/features/org.eclipse.emf.cdo.server.objectivity-feature/pom.xml
new file mode 100644
index 0000000000..8f459d3fa9
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.server.objectivity</artifactId>
+ <version>4.2.400-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.site-feature/.gitignore b/features/org.eclipse.emf.cdo.site-feature/.gitignore
deleted file mode 100644
index 639cdd514d..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local.properties
diff --git a/features/org.eclipse.emf.cdo.site-feature/.project b/features/org.eclipse.emf.cdo.site-feature/.project
deleted file mode 100644
index e6a3279ddc..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.site-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>ignore.feature.content.changes</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b9743bf086..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/.project=UTF-8
diff --git a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 031cdf281c..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 12:35:03 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d573634502..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 3556bac076..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.site-feature/build.properties b/features/org.eclipse.emf.cdo.site-feature/build.properties
deleted file mode 100644
index 0c179df2d8..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties,\
- category.xml
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml
deleted file mode 100644
index 670700a3b0..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/category.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
- <!-- CDO Model Repository -->
- <feature id="org.eclipse.emf.cdo" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.compare" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.explorer" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.examples" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.doc" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.eclipse.emf.cdo.tests" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
- <feature id="org.gastro" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-
- <!-- CDO Model Repository Server -->
- <feature id="org.eclipse.emf.cdo.server" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
- <feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
- <feature id="org.eclipse.emf.cdo.server.db" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
- <feature id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
- <feature id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
- <feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature>
-
- <!-- CDO Model Repository Server Hibernate -->
- <feature id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature>
- <feature id="org.eclipse.emf.cdo.examples.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature>
- <feature id="org.eclipse.emf.cdo.tests.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature>
-
- <!-- CDO Dawn -->
- <feature id="org.eclipse.emf.cdo.dawn" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature>
- <feature id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature>
-
- <!-- Net4j Signalling Platform -->
- <feature id="org.eclipse.net4j" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
- <feature id="org.eclipse.net4j.doc" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
- <feature id="org.eclipse.net4j.examples" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
- <feature id="org.eclipse.net4j.sdk" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
- <feature id="org.eclipse.net4j.tests" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
- <feature id="org.eclipse.net4j.ui" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-
- <!-- Net4j DB Framework -->
- <feature id="org.eclipse.net4j.db" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.doc" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.derby" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.h2" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.hsqldb" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.mysql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.oracle" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
- <feature id="org.eclipse.net4j.db.postgresql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-
- <!-- Net4j Utilities -->
- <feature id="org.eclipse.net4j.util" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
- <feature id="org.eclipse.net4j.util.doc" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
- <feature id="org.eclipse.net4j.util.ui" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
-
- <!-- Others -->
- <feature id="org.eclipse.emf.cdo.epp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
- <feature id="org.eclipse.emf.cdo.ecore.retrofit" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.help" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
-
- <!-- Categories -->
- <category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/>
- <category-def name="org.eclipse.emf.cdo.server.category" label="CDO Model Repository Server"/>
- <category-def name="org.eclipse.emf.cdo.server.hibernate.category" label="CDO Model Repository Server Hibernate (optional)"/>
- <category-def name="org.eclipse.emf.cdo.dawn.category" label="CDO Dawn"/>
- <category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/>
- <category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/>
- <category-def name="org.eclipse.net4j.util.category" label="Net4j Utilities"/>
- <category-def name="org.eclipse.emf.cdo.releng.hidden.category" label="Others"/>
-
-</site>
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.properties b/features/org.eclipse.emf.cdo.site-feature/feature.properties
deleted file mode 100644
index 709ac715a0..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/feature.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-#GENERATED: featureName = CDO Model Repository Site
-description = Contains the CDO SDK, the CDO Dawn SDK the Net4j SDK and all their included features.
diff --git a/features/org.eclipse.emf.cdo.site-feature/local.properties.template b/features/org.eclipse.emf.cdo.site-feature/local.properties.template
deleted file mode 100644
index eb1ad11f21..0000000000
--- a/features/org.eclipse.emf.cdo.site-feature/local.properties.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-buckminster.output.root = C:/develop/cdo/master/build/result/output
-buckminster.temp.root = C:/develop/cdo/master/build/result/temp
-
-site.pack200 = false
-site.signing = false
diff --git a/features/org.eclipse.emf.cdo.tests-feature/.project b/features/org.eclipse.emf.cdo.tests-feature/.project
index bf9b3e5124..7442e380c2 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/.project
+++ b/features/org.eclipse.emf.cdo.tests-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.tests-feature/build.properties b/features/org.eclipse.emf.cdo.tests-feature/build.properties
index ac653f763c..b2bd415e63 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.tests-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 3914352fd8..b785744297 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.tests"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.3.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -34,10 +34,6 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.emf.cdo.tests.source"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.cdo.tests"
download-size="0"
@@ -60,6 +56,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.emf.cdo.tests.hibernate"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.emf.cdo.tests.mongodb"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.cdo.tests-feature/pom.xml b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
new file mode 100644
index 0000000000..38bb5943db
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.tests</artifactId>
+ <version>4.3.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.project b/features/org.eclipse.emf.cdo.tests.hibernate-feature/.project
deleted file mode 100644
index 8903c7ad80..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.tests.hibernate-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index bb6529259b..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 12:34:47 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d573634502..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 3556bac076..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/build.properties b/features/org.eclipse.emf.cdo.tests.hibernate-feature/build.properties
deleted file mode 100644
index 08e412d41e..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties
deleted file mode 100644
index 77a961aff1..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2011-2013, 2015 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = CDO Model Repository Server Hibernate Tests
-description = Contains the CDO Hibernate test plugins and sources. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.1.0/update for a p2 repository that contains Hibernate.
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml
deleted file mode 100644
index c0e54d5ef7..0000000000
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eike Stepper - initial API and implementation
--->
-<feature
- id="org.eclipse.emf.cdo.tests.hibernate"
- label="%featureName"
- version="4.2.400.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.emf.cdo.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <includes
- id="org.eclipse.emf.cdo.tests.hibernate.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.cdo.tests.hibernate"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/> <!-- Used to be true -->
-
-</feature>
diff --git a/features/org.eclipse.net4j-feature/.project b/features/org.eclipse.net4j-feature/.project
index 966326c735..7f3417e67b 100644
--- a/features/org.eclipse.net4j-feature/.project
+++ b/features/org.eclipse.net4j-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j-feature/build.properties b/features/org.eclipse.net4j-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.net4j-feature/build.properties
+++ b/features/org.eclipse.net4j-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 8e8beea3e2..b3b79150b9 100644
--- a/features/org.eclipse.net4j-feature/feature.xml
+++ b/features/org.eclipse.net4j-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j-feature/pom.xml b/features/org.eclipse.net4j-feature/pom.xml
new file mode 100644
index 0000000000..11dbb01153
--- /dev/null
+++ b/features/org.eclipse.net4j-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db-feature/.project b/features/org.eclipse.net4j.db-feature/.project
index 9a1361ddcb..55173c3446 100644
--- a/features/org.eclipse.net4j.db-feature/.project
+++ b/features/org.eclipse.net4j.db-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db-feature/build.properties b/features/org.eclipse.net4j.db-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.net4j.db-feature/build.properties
+++ b/features/org.eclipse.net4j.db-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml
index 380b37588e..fb6462effa 100644
--- a/features/org.eclipse.net4j.db-feature/feature.xml
+++ b/features/org.eclipse.net4j.db-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db-feature/pom.xml b/features/org.eclipse.net4j.db-feature/pom.xml
new file mode 100644
index 0000000000..27bbb86ac0
--- /dev/null
+++ b/features/org.eclipse.net4j.db-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.derby-feature/.project b/features/org.eclipse.net4j.db.derby-feature/.project
index db7874d5b3..ba53e51212 100644
--- a/features/org.eclipse.net4j.db.derby-feature/.project
+++ b/features/org.eclipse.net4j.db.derby-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.derby-feature/build.properties b/features/org.eclipse.net4j.db.derby-feature/build.properties
index aef8c6c3ed..c6d78b9a5b 100644
--- a/features/org.eclipse.net4j.db.derby-feature/build.properties
+++ b/features/org.eclipse.net4j.db.derby-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.derby-feature/feature.xml b/features/org.eclipse.net4j.db.derby-feature/feature.xml
index afe932dbea..e2f40e4d25 100644
--- a/features/org.eclipse.net4j.db.derby-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.derby-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.derby"
label="%featureName"
- version="4.2.300.qualifier"
+ version="4.2.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.derby-feature/pom.xml b/features/org.eclipse.net4j.db.derby-feature/pom.xml
new file mode 100644
index 0000000000..54b2f71d0e
--- /dev/null
+++ b/features/org.eclipse.net4j.db.derby-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.derby</artifactId>
+ <version>4.2.400-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.doc-feature/.project b/features/org.eclipse.net4j.db.doc-feature/.project
index 24b064e437..f5c1980bf9 100644
--- a/features/org.eclipse.net4j.db.doc-feature/.project
+++ b/features/org.eclipse.net4j.db.doc-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.doc-feature/build.properties b/features/org.eclipse.net4j.db.doc-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.net4j.db.doc-feature/build.properties
+++ b/features/org.eclipse.net4j.db.doc-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.doc-feature/feature.xml b/features/org.eclipse.net4j.db.doc-feature/feature.xml
index 85d817dd97..a1c8e47fed 100644
--- a/features/org.eclipse.net4j.db.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.doc"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.doc-feature/pom.xml b/features/org.eclipse.net4j.db.doc-feature/pom.xml
new file mode 100644
index 0000000000..e3bcdb6be4
--- /dev/null
+++ b/features/org.eclipse.net4j.db.doc-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.doc</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.h2-feature/.project b/features/org.eclipse.net4j.db.h2-feature/.project
index 0efae65a35..1aa3ec7055 100644
--- a/features/org.eclipse.net4j.db.h2-feature/.project
+++ b/features/org.eclipse.net4j.db.h2-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.h2-feature/build.properties b/features/org.eclipse.net4j.db.h2-feature/build.properties
index aef8c6c3ed..c6d78b9a5b 100644
--- a/features/org.eclipse.net4j.db.h2-feature/build.properties
+++ b/features/org.eclipse.net4j.db.h2-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index 0519fd5312..0e5c2c314b 100644
--- a/features/org.eclipse.net4j.db.h2-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.h2"
label="%featureName"
- version="4.3.0.qualifier"
+ version="4.3.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.h2-feature/pom.xml b/features/org.eclipse.net4j.db.h2-feature/pom.xml
new file mode 100644
index 0000000000..ddbad58246
--- /dev/null
+++ b/features/org.eclipse.net4j.db.h2-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.h2</artifactId>
+ <version>4.3.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/.project b/features/org.eclipse.net4j.db.hsqldb-feature/.project
index df13c00182..640c290354 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/.project
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/build.properties b/features/org.eclipse.net4j.db.hsqldb-feature/build.properties
index aef8c6c3ed..c6d78b9a5b 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/build.properties
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
index 0f5455da80..035796b2be 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.hsqldb"
label="%featureName"
- version="4.2.300.qualifier"
+ version="4.2.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml b/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
new file mode 100644
index 0000000000..2011072674
--- /dev/null
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.hsqldb</artifactId>
+ <version>4.2.400-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.mysql-feature/.project b/features/org.eclipse.net4j.db.mysql-feature/.project
index cf062dfa33..6bdb1f0004 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/.project
+++ b/features/org.eclipse.net4j.db.mysql-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.mysql-feature/build.properties b/features/org.eclipse.net4j.db.mysql-feature/build.properties
index aef8c6c3ed..c6d78b9a5b 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/build.properties
+++ b/features/org.eclipse.net4j.db.mysql-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.mysql-feature/feature.xml b/features/org.eclipse.net4j.db.mysql-feature/feature.xml
index 88b6ba23b9..b350fcb276 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.mysql-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.mysql"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.mysql-feature/pom.xml b/features/org.eclipse.net4j.db.mysql-feature/pom.xml
new file mode 100644
index 0000000000..19eb0f8de5
--- /dev/null
+++ b/features/org.eclipse.net4j.db.mysql-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.mysql</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.oracle-feature/.project b/features/org.eclipse.net4j.db.oracle-feature/.project
index 8b884a3dda..728e5c9170 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/.project
+++ b/features/org.eclipse.net4j.db.oracle-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.oracle-feature/build.properties b/features/org.eclipse.net4j.db.oracle-feature/build.properties
index a2f05a3e6c..500254a9c7 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/build.properties
+++ b/features/org.eclipse.net4j.db.oracle-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.oracle-feature/feature.xml b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
index 8b2c3ab469..861a7ea486 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.oracle"
label="%featureName"
- version="1.1.300.qualifier"
+ version="1.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.oracle-feature/pom.xml b/features/org.eclipse.net4j.db.oracle-feature/pom.xml
new file mode 100644
index 0000000000..a3f83a5bba
--- /dev/null
+++ b/features/org.eclipse.net4j.db.oracle-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.oracle</artifactId>
+ <version>1.1.400-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/.project b/features/org.eclipse.net4j.db.postgresql-feature/.project
index 357cc257fc..f4434a80ac 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/.project
+++ b/features/org.eclipse.net4j.db.postgresql-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/build.properties b/features/org.eclipse.net4j.db.postgresql-feature/build.properties
index aef8c6c3ed..c6d78b9a5b 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/build.properties
+++ b/features/org.eclipse.net4j.db.postgresql-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
index 0087469a03..82ee93c1d5 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.postgresql"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/pom.xml b/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
new file mode 100644
index 0000000000..1d9b7707e0
--- /dev/null
+++ b/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.db.postgresql</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.doc-feature/.project b/features/org.eclipse.net4j.doc-feature/.project
index 9e7aedbab2..39324b95ca 100644
--- a/features/org.eclipse.net4j.doc-feature/.project
+++ b/features/org.eclipse.net4j.doc-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.doc-feature/build.properties b/features/org.eclipse.net4j.doc-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.net4j.doc-feature/build.properties
+++ b/features/org.eclipse.net4j.doc-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.doc-feature/feature.xml b/features/org.eclipse.net4j.doc-feature/feature.xml
index 0ba643f9df..a963706180 100644
--- a/features/org.eclipse.net4j.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.doc"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.doc-feature/pom.xml b/features/org.eclipse.net4j.doc-feature/pom.xml
new file mode 100644
index 0000000000..71cb323d7c
--- /dev/null
+++ b/features/org.eclipse.net4j.doc-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.doc</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.examples-feature/.project b/features/org.eclipse.net4j.examples-feature/.project
index defe549a99..ee4046fda3 100644
--- a/features/org.eclipse.net4j.examples-feature/.project
+++ b/features/org.eclipse.net4j.examples-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.examples-feature/build.properties b/features/org.eclipse.net4j.examples-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.net4j.examples-feature/build.properties
+++ b/features/org.eclipse.net4j.examples-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index f1013c414a..ea579593ae 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -36,10 +36,6 @@
</url>
<includes
- id="org.eclipse.net4j.examples.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.net4j.examples.installer"
version="0.0.0"/>
diff --git a/features/org.eclipse.net4j.examples-feature/pom.xml b/features/org.eclipse.net4j.examples-feature/pom.xml
new file mode 100644
index 0000000000..87eb197f1c
--- /dev/null
+++ b/features/org.eclipse.net4j.examples-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.examples</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.examples.installer-feature/.project b/features/org.eclipse.net4j.examples.installer-feature/.project
index 6a0d53ba62..e683c340da 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/.project
+++ b/features/org.eclipse.net4j.examples.installer-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.examples.installer-feature/build.properties b/features/org.eclipse.net4j.examples.installer-feature/build.properties
index a2f05a3e6c..500254a9c7 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/build.properties
+++ b/features/org.eclipse.net4j.examples.installer-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.examples.installer-feature/feature.xml b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
index 05e11ef3ed..d627027363 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples.installer"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -35,10 +35,6 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.net4j.examples.installer.source"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.net4j.examples.installer"
download-size="0"
diff --git a/features/org.eclipse.net4j.examples.installer-feature/pom.xml b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
new file mode 100644
index 0000000000..447f1e87d4
--- /dev/null
+++ b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.examples.installer</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.sdk-feature/.project b/features/org.eclipse.net4j.sdk-feature/.project
index 6cb0909e06..c036d5c6af 100644
--- a/features/org.eclipse.net4j.sdk-feature/.project
+++ b/features/org.eclipse.net4j.sdk-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.sdk-feature/build.properties b/features/org.eclipse.net4j.sdk-feature/build.properties
index 669e3a67b4..75e0d9c363 100644
--- a/features/org.eclipse.net4j.sdk-feature/build.properties
+++ b/features/org.eclipse.net4j.sdk-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index 32071a1c92..7beed8f9a5 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.sdk"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -60,22 +60,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.net4j.db.hsqldb.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.net4j.db.mysql.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.net4j.db.postgresql.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.net4j.sdk.source"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.net4j.examples.installer"
version="0.0.0"/>
@@ -86,32 +70,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.commons.codec.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.httpclient.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.derby.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.h2.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/features/org.eclipse.net4j.sdk-feature/pom.xml b/features/org.eclipse.net4j.sdk-feature/pom.xml
new file mode 100644
index 0000000000..4f687ace3d
--- /dev/null
+++ b/features/org.eclipse.net4j.sdk-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.sdk</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.tests-feature/.project b/features/org.eclipse.net4j.tests-feature/.project
index 39e0a2c69c..ce76baf897 100644
--- a/features/org.eclipse.net4j.tests-feature/.project
+++ b/features/org.eclipse.net4j.tests-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.tests-feature/build.properties b/features/org.eclipse.net4j.tests-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.net4j.tests-feature/build.properties
+++ b/features/org.eclipse.net4j.tests-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index 8099d4b97a..e4ba4e772d 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.xml
+++ b/features/org.eclipse.net4j.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.tests"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -55,8 +55,4 @@
version="0.0.0"
unpack="false"/> <!-- Used to be true -->
- <includes
- id="org.eclipse.net4j.tests.source"
- version="0.0.0"/>
-
</feature>
diff --git a/features/org.eclipse.net4j.tests-feature/pom.xml b/features/org.eclipse.net4j.tests-feature/pom.xml
new file mode 100644
index 0000000000..85980084f0
--- /dev/null
+++ b/features/org.eclipse.net4j.tests-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.tests</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.ui-feature/.project b/features/org.eclipse.net4j.ui-feature/.project
index bc7f72274e..96da85bd29 100644
--- a/features/org.eclipse.net4j.ui-feature/.project
+++ b/features/org.eclipse.net4j.ui-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.ui-feature/build.properties b/features/org.eclipse.net4j.ui-feature/build.properties
index 7195a240bd..093bc8bcbd 100644
--- a/features/org.eclipse.net4j.ui-feature/build.properties
+++ b/features/org.eclipse.net4j.ui-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml
index b4e0bfa224..e08552734c 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.ui-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ui"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.ui-feature/pom.xml b/features/org.eclipse.net4j.ui-feature/pom.xml
new file mode 100644
index 0000000000..38cc71ec0b
--- /dev/null
+++ b/features/org.eclipse.net4j.ui-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.ui</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.util-feature/.project b/features/org.eclipse.net4j.util-feature/.project
index 1a919cd281..a29ad45fa3 100644
--- a/features/org.eclipse.net4j.util-feature/.project
+++ b/features/org.eclipse.net4j.util-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.util-feature/build.properties b/features/org.eclipse.net4j.util-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.net4j.util-feature/build.properties
+++ b/features/org.eclipse.net4j.util-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.util-feature/feature.xml b/features/org.eclipse.net4j.util-feature/feature.xml
index 5785c5a34a..ffdbf97c5e 100644
--- a/features/org.eclipse.net4j.util-feature/feature.xml
+++ b/features/org.eclipse.net4j.util-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.util-feature/pom.xml b/features/org.eclipse.net4j.util-feature/pom.xml
new file mode 100644
index 0000000000..e018f7dd0c
--- /dev/null
+++ b/features/org.eclipse.net4j.util-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.util</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.util.doc-feature/.project b/features/org.eclipse.net4j.util.doc-feature/.project
index eec4d6ed6a..289122cadf 100644
--- a/features/org.eclipse.net4j.util.doc-feature/.project
+++ b/features/org.eclipse.net4j.util.doc-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.util.doc-feature/build.properties b/features/org.eclipse.net4j.util.doc-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.net4j.util.doc-feature/build.properties
+++ b/features/org.eclipse.net4j.util.doc-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.util.doc-feature/feature.xml b/features/org.eclipse.net4j.util.doc-feature/feature.xml
index 1de4bf341c..077466acb3 100644
--- a/features/org.eclipse.net4j.util.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.util.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util.doc"
label="%featureName"
- version="4.2.400.qualifier"
+ version="4.2.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.util.doc-feature/pom.xml b/features/org.eclipse.net4j.util.doc-feature/pom.xml
new file mode 100644
index 0000000000..dabc3d6338
--- /dev/null
+++ b/features/org.eclipse.net4j.util.doc-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.util.doc</artifactId>
+ <version>4.2.500-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.net4j.util.ui-feature/.project b/features/org.eclipse.net4j.util.ui-feature/.project
index 53d8b021a3..b9bd771344 100644
--- a/features/org.eclipse.net4j.util.ui-feature/.project
+++ b/features/org.eclipse.net4j.util.ui-feature/.project
@@ -15,7 +15,7 @@
<arguments>
<dictionary>
<key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
</dictionary>
</arguments>
</buildCommand>
@@ -24,4 +24,15 @@
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.oomph.version.VersionNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/features/org.eclipse.net4j.util.ui-feature/build.properties b/features/org.eclipse.net4j.util.ui-feature/build.properties
index 08e412d41e..66e55bdd50 100644
--- a/features/org.eclipse.net4j.util.ui-feature/build.properties
+++ b/features/org.eclipse.net4j.util.ui-feature/build.properties
@@ -11,3 +11,4 @@
bin.includes = feature.xml,\
feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.net4j.util.ui-feature/feature.xml b/features/org.eclipse.net4j.util.ui-feature/feature.xml
index 557095e2df..2f3885a6e7 100644
--- a/features/org.eclipse.net4j.util.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.util.ui-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util.ui"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.6.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.util.ui-feature/pom.xml b/features/org.eclipse.net4j.util.ui-feature/pom.xml
new file mode 100644
index 0000000000..9db3144b9d
--- /dev/null
+++ b/features/org.eclipse.net4j.util.ui-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<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.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.net4j.util.ui</artifactId>
+ <version>4.6.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.gastro-feature/.project b/features/org.gastro-feature/.project
deleted file mode 100644
index f99d0bdaf0..0000000000
--- a/features/org.gastro-feature/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.gastro-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.gastro-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.gastro-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c28d2b10d3..0000000000
--- a/features/org.gastro-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 12:34:23 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.gastro-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.gastro-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d573634502..0000000000
--- a/features/org.gastro-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.gastro-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.gastro-feature/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 3556bac076..0000000000
--- a/features/org.gastro-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 10:06:10 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/features/org.gastro-feature/build.properties b/features/org.gastro-feature/build.properties
deleted file mode 100644
index 4b83b6f896..0000000000
--- a/features/org.gastro-feature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- feature.properties
diff --git a/features/org.gastro-feature/feature.properties b/features/org.gastro-feature/feature.properties
deleted file mode 100644
index 5ad3dc5ff4..0000000000
--- a/features/org.gastro-feature/feature.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = CDO Electronic Restaurant Example
-description = Contains the CDO Gastro RCP plugins, models and sources.
diff --git a/features/org.gastro-feature/feature.xml b/features/org.gastro-feature/feature.xml
deleted file mode 100644
index c9a8904546..0000000000
--- a/features/org.gastro-feature/feature.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eike Stepper - initial API and implementation
--->
-<feature
- id="org.gastro"
- label="%featureName"
- version="4.2.500.qualifier"
- provider-name="%providerName"
- plugin="org.gastro.rcp"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.emf.cdo.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <includes
- id="org.gastro.source"
- version="0.0.0"/>
-
- <plugin
- id="org.gastro.business"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.business.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.inventory"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.inventory.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.rcp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.rcp.department"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.rcp.table"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.server.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.gastro.testclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/> <!-- Used to be true -->
-
-</feature>

Back to the top