Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'features/org.eclipse.emf.cdo.compare-feature')
-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
4 files changed, 45 insertions, 2 deletions
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>

Back to the top