From 282f88d3b44440906cc65c1adadc36260642d90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerson=20Suny=C3=A9?= <sunye@atlanmod.org>
Date: Tue, 1 Oct 2024 09:46:00 +0200
Subject: [PATCH] Update eclipse plugin dependencies

---
 plugins/eclipse/bundles/ui/pom.xml            | 10 +---
 .../org.eclipse.gmt.modisco.java/pom.xml      |  4 +-
 plugins/eclipse/examples/projects/pom.xml     | 20 +++----
 plugins/eclipse/pom.xml                       |  3 +-
 plugins/eclipse/releng/configuration/pom.xml  | 24 +++++---
 plugins/eclipse/releng/update/pom.xml         |  2 +-
 pom.xml                                       | 58 +++++++++++--------
 7 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/plugins/eclipse/bundles/ui/pom.xml b/plugins/eclipse/bundles/ui/pom.xml
index be58c93f3..82d4a92d7 100644
--- a/plugins/eclipse/bundles/ui/pom.xml
+++ b/plugins/eclipse/bundles/ui/pom.xml
@@ -21,17 +21,9 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>2.2.0</version>
+            <version>${apache.felix.version}</version>
         </dependency>
 
-        <!--
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
-        </dependency>
-        -->
-
         <dependency>
             <groupId>org.atlanmod.neoemf</groupId>
             <artifactId>neoemf-core</artifactId>
diff --git a/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml b/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml
index d46f2c27c..cf7ef2c39 100644
--- a/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml
+++ b/plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.0-jre</version>
+            <version>33.3.1-jre</version>
         </dependency>
 
         <dependency>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.16</version>
         </dependency>
 
     </dependencies>
diff --git a/plugins/eclipse/examples/projects/pom.xml b/plugins/eclipse/examples/projects/pom.xml
index ed6b4873e..e65da73ca 100644
--- a/plugins/eclipse/examples/projects/pom.xml
+++ b/plugins/eclipse/examples/projects/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>2.2.0</version>
+            <version>${apache.felix.version}</version>
         </dependency>
 
         <dependency>
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -164,7 +164,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -217,7 +217,7 @@
 					<dependency>
 						<groupId>org.eclipse.platform</groupId>
     					<artifactId>org.eclipse.core.resources</artifactId>
-    					<version>3.14.0</version>
+    					<version>3.20.200</version>
 					</dependency>
 
                     <!-- Xtext -->
@@ -235,12 +235,6 @@
                         <version>${xtext.version}</version>
                     </dependency>
 
-                    <dependency>
-                        <groupId>org.eclipse.xtext</groupId>
-                        <artifactId>org.eclipse.xtext.generator</artifactId>
-                        <version>${xtext.version}</version>
-                    </dependency>
-
                     <dependency>
                         <groupId>org.eclipse.xtext</groupId>
                         <artifactId>org.eclipse.xtext.xtext.generator</artifactId>
@@ -274,13 +268,13 @@
                     <dependency>
                         <groupId>org.eclipse.emf</groupId>
                         <artifactId>org.eclipse.emf.ecore.xcore</artifactId>
-                        <version>1.17.0</version>
+                        <version>1.20.0</version>
                     </dependency>
 					
                     <dependency>
                         <groupId>org.eclipse.emf</groupId>
                         <artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
-                        <version>1.5.0</version>
+                        <version>1.7.0</version>
                     </dependency>
 
                     <!-- EMF: CodeGen -->
@@ -301,7 +295,7 @@
                     <dependency>
                         <groupId>org.eclipse.emf</groupId>
                         <artifactId>org.eclipse.emf.codegen.ecore.xtext</artifactId>
-                        <version>1.6.0</version>
+                        <version>1.8.0</version>
                     </dependency>
 
                 </dependencies>
diff --git a/plugins/eclipse/pom.xml b/plugins/eclipse/pom.xml
index e0d3c284d..4d3756491 100644
--- a/plugins/eclipse/pom.xml
+++ b/plugins/eclipse/pom.xml
@@ -25,13 +25,14 @@
         <module>releng</module>
     </modules>
 
+
     <dependencies>
         <dependency>
             <!-- Added to solve dependency problem to osgi.extender
                 (&(osgi.extender=osgi.component)(version>=1.4.0)(!(version>=2.0.0))) -->
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>2.1.28</version>
+            <version>${apache.felix.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/plugins/eclipse/releng/configuration/pom.xml b/plugins/eclipse/releng/configuration/pom.xml
index 25d8d096f..da0f23343 100644
--- a/plugins/eclipse/releng/configuration/pom.xml
+++ b/plugins/eclipse/releng/configuration/pom.xml
@@ -22,24 +22,31 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <tycho-plugin.version>2.7.3</tycho-plugin.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <tycho-plugin.version>4.0.9</tycho-plugin.version>
+        <apache.felix.version>2.2.12</apache.felix.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.debug>true</maven.compiler.debug>
         <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+        <compare.url>http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3</compare.url>
     </properties>
 
     <repositories>
         <repository>
             <id>emf-compare</id>
             <layout>p2</layout>
-            <url>https://download.eclipse.org/modeling/emf/compare/updates/releases/latest/</url>
+            <url>${compare.url}</url>
         </repository>
         <repository>
-            <id>2020-12</id>
+            <id>2024-12</id>
             <layout>p2</layout>
-            <url>https://download.eclipse.org/releases/2020-12/</url>
+            <url>https://download.eclipse.org/releases/2024-12/</url>
+        </repository>
+        <repository>
+            <id>emf</id>
+            <layout>p2</layout>
+            <url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/</url>
         </repository>
     </repositories>
 
@@ -70,7 +77,7 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <configuration>
                     <pomDependencies>consider</pomDependencies>
-                    <executionEnvironment>JavaSE-11</executionEnvironment>
+                    <executionEnvironment>JavaSE-17</executionEnvironment>
                     <environments>
                         <environment>
                             <os>win32</os>
@@ -91,7 +98,6 @@
                 </configuration>
             </plugin>
 
-
         </plugins>
 
         <pluginManagement>
@@ -99,7 +105,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.13.0</version>
                 </plugin>
                 
                 <plugin>
diff --git a/plugins/eclipse/releng/update/pom.xml b/plugins/eclipse/releng/update/pom.xml
index 260f90595..2efcc2b6c 100644
--- a/plugins/eclipse/releng/update/pom.xml
+++ b/plugins/eclipse/releng/update/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.promise</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 520590ee7..0347e50d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,31 +191,6 @@
     <build>
         <plugins>
 
-            <plugin>
-                <groupId>com.github.ferstl</groupId>
-                <artifactId>depgraph-maven-plugin</artifactId>
-                <version>4.0.3</version>
-                <configuration>
-
-                    <showGroupIds>true</showGroupIds>
-                    <showConflicts>true</showConflicts>
-                    <showDuplicates>true</showDuplicates>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>se.kth.castor</groupId>
-                <artifactId>depclean-maven-plugin</artifactId>
-                <version>2.0.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>depclean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -636,6 +611,39 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>dependency-analysis</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>com.github.ferstl</groupId>
+                        <artifactId>depgraph-maven-plugin</artifactId>
+                        <version>4.0.3</version>
+                        <configuration>
+                            <showGroupIds>true</showGroupIds>
+                            <showConflicts>true</showConflicts>
+                            <showDuplicates>true</showDuplicates>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>se.kth.castor</groupId>
+                        <artifactId>depclean-maven-plugin</artifactId>
+                        <version>2.0.6</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>depclean</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>