Update dependencies for plain Maven build
- For compatibility with 2020-03 and Epsilon 2.0.0
diff --git a/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml b/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
index 84a4b68..1c7e9fd 100644
--- a/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
@@ -33,7 +33,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
diff --git a/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml b/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
index 93f1b88..5c080d4 100644
--- a/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.hawk</groupId>
@@ -15,6 +14,7 @@
<packaging>jar</packaging>
<dependencies>
+ <!-- Hawk Core -->
<dependency>
<groupId>org.eclipse.hawk</groupId>
<artifactId>org.eclipse.hawk.core</artifactId>
@@ -25,11 +25,202 @@
<artifactId>org.eclipse.hawk.graph</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
+
+ <!-- Epsilon -->
<dependency>
<groupId>org.eclipse.epsilon</groupId>
- <artifactId>epsilon-core</artifactId>
- <version>1.5.1</version>
+ <artifactId>org.eclipse.epsilon.common.dt</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.common</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.ecl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.egl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.egl.traceability.fine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.emc.composite</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.emc.csv</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.emc.plainxml</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.eml.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.eol.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.eol.tools</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.epl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.erl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.etl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.eunit.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.eunit.junit</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.evl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.ewl.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.flock.engine</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.profiling</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.emc.emf</artifactId>
+ <version>${epsilon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.epsilon</groupId>
+ <artifactId>org.eclipse.epsilon.flexmi</artifactId>
+ <version>${epsilon.version}</version>
</dependency>
</dependencies>
+ <!-- Auto-activating profiles for SWT resolution -->
+ <profiles>
+ <profile>
+ <id>swt_windows_x86</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ <arch>x86</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>swt_windows_x86_64</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ <arch>amd64</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>swt_linux_x86</id>
+ <activation>
+ <os>
+ <family>linux</family>
+ <arch>x86</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>swt_linux_x86_64</id>
+ <activation>
+ <os>
+ <family>linux</family>
+ <arch>amd64</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>swt_mac_x86_64</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ <arch>x86_64</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml b/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
index 2c3ba9e..9f51d9d 100644
--- a/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
@@ -38,7 +38,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
</dependency>
</dependencies>
diff --git a/greycat/org.eclipse.hawk.greycat/pom-plain.xml b/greycat/org.eclipse.hawk.greycat/pom-plain.xml
index 4e133f1..3666567 100644
--- a/greycat/org.eclipse.hawk.greycat/pom-plain.xml
+++ b/greycat/org.eclipse.hawk.greycat/pom-plain.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
</dependency>
</dependencies>
diff --git a/pom-plain.xml b/pom-plain.xml
index 0a0c674..8d1811e 100644
--- a/pom-plain.xml
+++ b/pom-plain.xml
@@ -10,6 +10,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <epsilon.version>2.0.0</epsilon.version>
+ <swt.version>3.114.0</swt.version>
</properties>
<modules>
@@ -32,35 +34,72 @@
<dependencyManagement>
<dependencies>
+ <!-- Eclipse Platform -->
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>5.7.0.202003110725-r</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>3.17.100</version>
+ </dependency>
+
+ <!-- JFace/SWT -->
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ <version>${swt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ <version>3.19.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface.databinding</artifactId>
+ <version>1.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>3.16.200</version>
+ </dependency>
+
+ <!-- EMF -->
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
- <version>2.10.2-v20150123-0348</version>
+ <version>2.21.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
- <version>2.10.1-v20150123-0348</version>
+ <version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
- <version>2.10.2-v20150123-0348</version>
+ <version>2.16.0</version>
+ </dependency>
+
+ <!-- Orbit Equivalents -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.10</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>5.5.0.201909110433-r</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.6</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>27.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -69,16 +108,16 @@
<sourceDirectory>src</sourceDirectory>
<directory>target-plain</directory>
<outputDirectory>target-plain/classes</outputDirectory>
- <testOutputDirectory>target-plain/test-classes</testOutputDirectory>
+ <testOutputDirectory>target-plain/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
index e7813b6..2b703a3 100644
--- a/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
diff --git a/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
index 30662b7..eeedf67 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
@@ -25,9 +25,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>3.10.0-v20140318-2214</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
index f36b01d..f0c3bc1 100644
--- a/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.14.0</version>
</dependency>
</dependencies>
