Align Moka with
- Papyrus migration to Batik 1.14 (Bug 578311)
- Eclipse 2021-12
- AJDT 421
Change-Id: Ief7c64d8515d354b1aec6d5fb60d6e6b2cdd4044
Signed-off-by: Florian NOYRIT <florian.noyrit@cea.fr>
diff --git a/plugins/org.eclipse.papyrus.moka.fuml/pom.xml b/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
index 53185f4..6ab2d4b 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- Parent POM (i.e., Engines) -->
@@ -22,9 +20,9 @@
<build>
<plugins>
<plugin>
- <groupId>com.nickwongdev</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.14.0</version>
<configuration>
<complianceLevel>11</complianceLevel>
</configuration>
diff --git a/plugins/org.eclipse.papyrus.moka.pscs/pom.xml b/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
index 07d28f9..f465325 100644
--- a/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pscs/pom.xml
@@ -21,9 +21,9 @@
<build>
<plugins>
<plugin>
- <groupId>com.nickwongdev</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.14.0</version>
<configuration>
<complianceLevel>11</complianceLevel>
</configuration>
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/pom.xml b/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
index fbaae66..2590b2f 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
+++ b/plugins/org.eclipse.papyrus.moka.pssm/pom.xml
@@ -21,9 +21,9 @@
<build>
<plugins>
<plugin>
- <groupId>com.nickwongdev</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.14.0</version>
<configuration>
<complianceLevel>11</complianceLevel>
</configuration>
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
index 18c2615..546f223 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Moka Target Platform" sequenceNumber="1634806128">
+<target name="Moka Target Platform" sequenceNumber="1647277313">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,7 +10,18 @@
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.json" version="0.0.0"/>
- <repository id="eclipse" location="http://download.eclipse.org/releases/2021-09"/>
+ <repository id="eclipse" location="http://download.eclipse.org/releases/2021-12"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
@@ -19,9 +30,8 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.aspectj.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
- <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/410/dev/update/"/>
+ <repository id="aspectj" location="https://download.eclipse.org/tools/ajdt/421/dev/update/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
index 1a3342b..df58933 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
@@ -1,22 +1,32 @@
target "Moka Target Platform" with source requirements
-location "http://download.eclipse.org/releases/2021-09" eclipse {
+location "http://download.eclipse.org/releases/2021-12" eclipse {
org.eclipse.platform.feature.group lazy
- org.eclipse.rcp.feature.group lazy
- org.eclipse.jdt.feature.group lazy
- org.eclipse.equinox.p2.discovery.feature.feature.group lazy
- org.eclipse.equinox.executable.feature.group lazy
+ org.eclipse.rcp.feature.group lazy
+ org.eclipse.jdt.feature.group lazy
+ org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+ org.eclipse.equinox.executable.feature.group lazy
org.eclipse.json lazy
}
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/" orbit {
+ org.apache.batik.anim [1.14.0,1.15.0)
+ org.apache.batik.dom [1.14.0,1.15.0)
+ org.apache.batik.dom.svg [1.14.0,1.15.0)
+ org.apache.batik.xml [1.14.0,1.15.0)
+}
+
+location "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902" gmfRuntime {
+ org.eclipse.gmf.runtime.sdk.feature.group lazy
+}
+
location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" papyrus {
org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.papyrus.junit.feature.feature.group lazy
}
-location "http://download.eclipse.org/tools/ajdt/410/dev/update/" aspectj {
+location "https://download.eclipse.org/tools/ajdt/421/dev/update/" aspectj {
org.aspectj.feature.group lazy
- org.eclipse.ajdt.feature.group lazy
org.eclipse.equinox.weaving.sdk.feature.group lazy
}
@@ -25,10 +35,10 @@
org.eclipse.nebula.visualization.feature.feature.group lazy
}
-location "https://download.eclipse.org/paho/releases/1.2.0/Java" paho{
+location "https://download.eclipse.org/paho/releases/1.2.0/Java" paho {
org.eclipse.paho.client.mqttv3 lazy
}
location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
- org.eclipse.xwt.feature.feature.group lazy
+ org.eclipse.xwt.feature.feature.group lazy
}
\ No newline at end of file
