Dependabot should ignore dependencies coming from the P2 Site, even if they are in Maven Central. This way the correct combinations are used.

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

Author: Dennis Labordus

.github/dependabot.yml

@@ -27,6 +27,15 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 5
+    ignore:
+      # Next dependencies will be ignored, because they should stay in sync with the 'eclipse.aggr' versions.
+      - dependency-name: org.eclipse.core:org.eclipse.core.resources
+      - dependency-name: org.eclipse.emf:org.eclipse.emf.ecore
+      - dependency-name: org.eclipse.emf:org.eclipse.emf.common
+      - dependency-name: org.eclipse.ocl:org.eclipse.ocl.pivot
+      - 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
 
   - package-ecosystem: "docker"
     directory: "/app/src/main/docker/"

riseclipse/pom.xml

@@ -23,14 +23,17 @@ SPDX-License-Identifier: Apache-2.0
     </modules>
 
     <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.
+          -->
         <eclipse.core.resources.version>3.16.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>
 
+        <riseclipse.main.version>1.2.5</riseclipse.main.version>
         <riseclipse.scl.version>1.2.4</riseclipse.scl.version>
-        <riseclipse.main.version>1.2.6</riseclipse.main.version>
 
         <riseclipse.p2.root>${project.basedir}/riseclipse-p2-to-m2</riseclipse.p2.root>
     </properties>
@@ -46,13 +49,13 @@ SPDX-License-Identifier: Apache-2.0
         <dependencies>
             <dependency>
                 <groupId>io.github.riseclipse</groupId>
-                <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl</artifactId>
-                <version>${riseclipse.scl.version}</version>
+                <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
+                <version>${riseclipse.main.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.github.riseclipse</groupId>
-                <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-                <version>${riseclipse.main.version}</version>
+                <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl</artifactId>
+                <version>${riseclipse.scl.version}</version>
             </dependency>
 
             <dependency>

riseclipse/riseclipse-p2-to-m2/src/main/resources/riseclipse.aggr

@@ -21,7 +21,6 @@
         <bundles name="javax.inject" versionRange="1.0.0.v20220405-0441"/>
         <bundles name="org.antlr.runtime" versionRange="3.2.0.v20220404-1927"/>
         <bundles name="org.aopalliance" versionRange="1.0.0.v20220404-1927"/>
-        <bundles name="org.osgi.service.prefs" versionRange="1.0.0.v20220404-1927"/>
       </repositories>
     </contributions>
     <contributions label="EMF 2.30">