Merge 16c0d43 into bf3e456

eclipse-passage · Jul 2, 2023 · 39e84f1 · 39e84f1
2 parents bf3e456 + 16c0d43
commit 39e84f1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 14 deletions.
diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
@@ -42,7 +42,7 @@
 		<cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
 
 		<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/</eclipserun-repo>
-		<released.baseline>https://download.eclipse.org/passage/updates/release/2.7.1/</released.baseline>
+		<released.baseline>https://download.eclipse.org/passage/updates/release/2.8.0/</released.baseline>
 		<staging.baseline>https://download.eclipse.org/passage/drops/integration/latest/</staging.baseline>
 
 		<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>

diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target b/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target
@@ -19,7 +19,7 @@
 			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.28/R-4.28-202306050440/"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
@@ -30,7 +30,7 @@
 			<unit id="org.eclipse.emfforms.setup.base" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34/"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -42,11 +42,11 @@
 			<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712/"/>
 			<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
+			<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202305230839/"/>
 			<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -62,40 +62,69 @@
 			<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/passage/updates/release/2.7.1/"/>
+			<repository location="https://download.eclipse.org/passage/updates/release/2.8.0/"/>
 			<unit id="org.eclipse.passage.lbc.execute.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.passage.ldc.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.passage.lic.define.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.passage.loc.operator.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
+			<repository location="https://download.eclipse.org/sirius/updates/releases/7.2.0/2023-03/"/>
 			<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
+			<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.16.0/"/>
 			<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
 			<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
-			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
-			<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
-			<unit id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
 			<unit id="jakarta.servlet" version="0.0.0"/>
 			<unit id="javax.activation" version="0.0.0"/>
 			<unit id="org.apache.commons.csv" version="0.0.0"/>
-			<unit id="org.apache.logging.log4j" version="0.0.0"/>
 			<unit id="org.bouncycastle.bcpg" version="0.0.0"/>
 			<unit id="org.bouncycastle.bcpkix" version="0.0.0"/>
 			<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
 			<unit id="org.bouncycastle.bcutil" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>
-			<unit id="org.slf4j.api" version="0.0.0"/>
-			<unit id="org.slf4j.apis.log4j" version="0.0.0"/>
+		</location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>com.github.oshi</groupId>
+					<artifactId>oshi-core</artifactId>
+					<version>6.2.2</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>net.java.dev.jna</groupId>
+					<artifactId>jna-platform</artifactId>
+					<version>5.13.0</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>net.java.dev.jna</groupId>
+					<artifactId>jna</artifactId>
+					<version>5.13.0</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+					<version>1.7.36</version>
+					<type>jar</type>
+				</dependency>
+				<!-- slf4j-api requires 1 impl, providing a dummy one... -->
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-nop</artifactId>
+					<version>1.7.36</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
 		</location>
 	</locations>
 </target>