Upgrade RiseClipse dependencies and made build work.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

.github/dependabot.yml

@@ -36,6 +36,8 @@ updates:
       - dependency-name: org.eclipse.ocl:org.eclipse.ocl.xtext.completeocl
       - dependency-name: org.eclipse.ocl:org.eclipse.ocl.xtext.oclstdlib
       - dependency-name: org.antlr.runtime:org.antlr.runtime
+      - dependency-name: org.apache.log4j:org.apache.log4j
+      - dependency-name: javax.inject:javax.inject
 
   - package-ecosystem: "docker"
     directory: "/app/src/main/docker/"

riseclipse/pom.xml

@@ -24,16 +24,20 @@ SPDX-License-Identifier: Apache-2.0
 
     <properties>
         <!-- These versions aren't monitored by Dependabot and need to be in sync with the file 'eclipse.aggr'.
-             When updating the file 'eclipse.aggr' also update these versions.
+             When updating the file 'eclipse.aggr' also update these versions. But also check in the directory
+             'riseclipse/riseclipse-p2-to-m2/target/maven/repository/final', because sometimes the downloaded
+             version is newer.
           -->
-        <eclipse.core.resources.version>3.16.0</eclipse.core.resources.version>
+        <eclipse.core.resources.version>3.17.0</eclipse.core.resources.version>
         <eclipse.emf.ecore.version>2.27.0</eclipse.emf.ecore.version>
         <eclipse.emf.common.version>2.25.0</eclipse.emf.common.version>
         <eclipse.ocl.version>1.17.0</eclipse.ocl.version>
         <antlr.runtime.version>3.2.0</antlr.runtime.version>
+        <log4j.version>1.2.19</log4j.version>
+        <javax.inject.version>1.0.0</javax.inject.version>
 
         <riseclipse.main.version>1.2.6</riseclipse.main.version>
-        <riseclipse.scl.version>1.2.4</riseclipse.scl.version>
+        <riseclipse.scl.version>1.2.5</riseclipse.scl.version>
 
         <riseclipse.p2.root>${project.basedir}/riseclipse-p2-to-m2</riseclipse.p2.root>
     </properties>
@@ -51,11 +55,23 @@ SPDX-License-Identifier: Apache-2.0
                 <groupId>io.github.riseclipse</groupId>
                 <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
                 <version>${riseclipse.main.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.service.prefs</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.github.riseclipse</groupId>
                 <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl</artifactId>
                 <version>${riseclipse.scl.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.service.prefs</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -117,6 +133,16 @@ SPDX-License-Identifier: Apache-2.0
                 <artifactId>org.antlr.runtime</artifactId>
                 <version>${antlr.runtime.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.log4j</groupId>
+                <artifactId>org.apache.log4j</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.inject</groupId>
+                <artifactId>javax.inject</artifactId>
+                <version>${javax.inject.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

riseclipse/validator-riseclipse/pom.xml

@@ -67,6 +67,14 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.antlr.runtime</groupId>
             <artifactId>org.antlr.runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.log4j</groupId>
+            <artifactId>org.apache.log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>