Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorZoltan Ujhelyi2016-08-26 09:55:37 +0000
committerZoltan Ujhelyi2017-01-30 14:44:16 +0000
commitde4f491942a42c38cc04b61bdb24a2aff4ededee (patch)
tree6e1f7a85992b8ccd29e2d41b1ab1785355515c5c /releng
parent74a23b45be562e45e1055b5793b8ae68dde6f4c2 (diff)
downloadorg.eclipse.emf.diffmerge.core-de4f491942a42c38cc04b61bdb24a2aff4ededee.tar.gz
org.eclipse.emf.diffmerge.core-de4f491942a42c38cc04b61bdb24a2aff4ededee.tar.xz
org.eclipse.emf.diffmerge.core-de4f491942a42c38cc04b61bdb24a2aff4ededee.zip
[500320] Upgrade build
maven experimentation Bug: 500320 Change-Id: Ie99b159e35181ca61244533627658e3361312601 Signed-off-by: Matthieu Helleboid <matthieu.helleboid@thalesgroup.com> Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/.project11
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml67
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/.project11
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target16
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/pom.xml11
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/.project11
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/category.xml25
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/pom.xml11
-rw-r--r--releng/pom.xml17
9 files changed, 180 insertions, 0 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/.project b/releng/org.eclipse.emf.diffmerge.configuration/.project
new file mode 100644
index 00000000..7e5cd801
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.configuration/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.configuration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
new file mode 100644
index 00000000..e3c4c581
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -0,0 +1,67 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho.version>0.25.0</tycho.version>
+ <tycho.extras.version>0.25.0</tycho.extras.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.target</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </artifact>
+ </target>
+
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.target/.project b/releng/org.eclipse.emf.diffmerge.target/.project
new file mode 100644
index 00000000..a9799206
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.target/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.target</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
new file mode 100644
index 00000000..c98dec86
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="org.eclipse.emf.diffmerge" sequenceNumber="3">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/mars"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license/"/>
+</location>
+</locations>
+</target>
diff --git a/releng/org.eclipse.emf.diffmerge.target/pom.xml b/releng/org.eclipse.emf.diffmerge.target/pom.xml
new file mode 100644
index 00000000..d550610b
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.target/pom.xml
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.emf.diffmerge.target</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+
+ <parent>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.update/.project b/releng/org.eclipse.emf.diffmerge.update/.project
new file mode 100644
index 00000000..bea08d2a
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.update/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.update</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.update/category.xml b/releng/org.eclipse.emf.diffmerge.update/category.xml
new file mode 100644
index 00000000..76a5b96b
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.scm.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.scm.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.tests.feature_0.1.0.qualifier.jar" id="org.eclipse.emf.diffmerge.tests.feature" version="0.1.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.7.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>
+</site>
diff --git a/releng/org.eclipse.emf.diffmerge.update/pom.xml b/releng/org.eclipse.emf.diffmerge.update/pom.xml
new file mode 100644
index 00000000..370944cb
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.update/pom.xml
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.emf.diffmerge.update</artifactId>
+ <packaging>eclipse-repository</packaging>
+
+ <parent>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
new file mode 100644
index 00000000..ce055c0b
--- /dev/null
+++ b/releng/pom.xml
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.root</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>org.eclipse.emf.diffmerge.update</module>
+ <module>org.eclipse.emf.diffmerge.target</module>
+ </modules>
+</project>
+

Back to the top