From 44ed92708708a4c8260516b123244bf48c09a5ce Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Wed, 12 Apr 2023 00:09:53 +0200
Subject: [PATCH] Use Maven targets for OSGi compliant artifacts from
 Maven-Central

And add license compliance check workflow based on the reusable GitHub
workflow provided by eclipse/dash-licenses.
---
 .github/workflows/licensecheck.yml     |  21 +++
 org.eclipse.xtext.p2repository/pom.xml |  19 ++-
 xtext-latest.target                    | 198 +++++++++++++++++++++----
 3 files changed, 209 insertions(+), 29 deletions(-)
 create mode 100644 .github/workflows/licensecheck.yml

diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml
new file mode 100644
index 00000000000..5cea3b71da4
--- /dev/null
+++ b/.github/workflows/licensecheck.yml
@@ -0,0 +1,21 @@
+# This workflow will check for Maven projects if the licenses of all (transitive) dependencies are vetted.
+
+name: License vetting status check
+
+on:
+  push:
+    branches: 
+      - 'master'
+  pull_request:
+    branches: 
+     - 'master'
+  issue_comment:
+    types: [created]
+
+jobs:
+  call-license-check:
+    uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
+    with:
+      projectId: modeling.tmf.xtext
+    secrets:
+      gitlabAPIToken: ${{ secrets.XTEXT_GITLAB_API_TOKEN }}
diff --git a/org.eclipse.xtext.p2repository/pom.xml b/org.eclipse.xtext.p2repository/pom.xml
index e84219cd02e..7afd1795d95 100644
--- a/org.eclipse.xtext.p2repository/pom.xml
+++ b/org.eclipse.xtext.p2repository/pom.xml
@@ -59,7 +59,7 @@
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
 					<executions>
-						<!-- sets the following properties 
+						<!-- sets the following properties
 						parsedVersion.majorVersion
 						parsedVersion.minorVersion
 						parsedVersion.incrementalVersion
@@ -316,6 +316,23 @@
 			</properties>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-gpg-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>pgp-sign</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>sign-p2-artifacts</goal>
+								</goals>
+								<configuration>
+									<skipIfJarsigned>true</skipIfJarsigned>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/xtext-latest.target b/xtext-latest.target
index e712d3f2cee..18fcc3f2719 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -9,7 +9,7 @@
 			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
+			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -21,9 +21,9 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/releases/2023-06/"/>
-			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0" />
-			<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0" />
-			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
+			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds" />
+			<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1"/>
@@ -49,35 +49,177 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
-			<unit id="org.kohsuke.args4j" version="0.0.0"/>
-			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
-			<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
-			<unit id="com.google.inject" version="5.0.1.v20221112-0806" />
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
 			<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
 			<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
-			<unit id="org.opentest4j" version="0.0.0"/>
-			<unit id="org.apiguardian.api" version="0.0.0"/>
-			<unit id="org.objectweb.asm" version="9.5.0"/>
-			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<unit id="org.slf4j.binding.simple" version="0.0.0"/>
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
-			<unit id="junit-jupiter-api" version="0.0.0"/>
-			<unit id="junit-jupiter-engine" version="0.0.0"/>
-			<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
-			<unit id="junit-jupiter-params" version="0.0.0"/>
-			<unit id="junit-platform-commons" version="0.0.0"/>
-			<unit id="junit-platform-engine" version="0.0.0"/>
-			<unit id="junit-platform-launcher" version="0.0.0"/>
-			<unit id="junit-platform-runner" version="0.0.0"/>
-			<unit id="junit-platform-suite-api" version="0.0.0"/>
-			<unit id="junit-platform-suite-commons" version="0.0.0"/>
-			<unit id="junit-vintage-engine" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
 		</location>
+		<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="ignore" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>args4j</groupId>
+					<artifactId>args4j</artifactId>
+					<version>2.33</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>ch.qos.reload4j</groupId>
+					<artifactId>reload4j</artifactId>
+					<version>1.2.24</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>com.google.code.gson</groupId>
+					<artifactId>gson</artifactId>
+					<version>2.10.1</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+					<version>30.1-jre</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>com.google.inject</groupId>
+					<artifactId>guice</artifactId>
+					<version>5.1.0</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>io.github.classgraph</groupId>
+					<artifactId>classgraph</artifactId>
+					<version>4.8.149</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>jakarta.inject</groupId>
+					<artifactId>jakarta.inject-api</artifactId>
+					<version>1.0.5</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.apiguardian</groupId>
+					<artifactId>apiguardian-api</artifactId>
+					<version>1.1.2</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.opentest4j</groupId>
+					<artifactId>opentest4j</artifactId>
+					<version>1.2.0</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm</artifactId>
+					<version>9.5</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-simple</artifactId>
+					<version>1.7.31</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
+			<exclude>com.google.code.findbugs:jsr305:3.0.1</exclude>
+			<exclude>com.google.code.findbugs:jsr305:3.0.2</exclude>
+			<exclude>javax.inject:javax.inject:1</exclude>
+			<exclude>org.checkerframework:checker-qual:3.5.0</exclude>
+		</location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>com.google.errorprone</groupId>
+					<artifactId>error_prone_annotations</artifactId>
+					<version>2.19.1</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
+			<instructions><![CDATA[
+Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+version:               ${version_cleanup;${mvnVersion}}
+Bundle-SymbolicName:   eclipse.xtext.wrapped.${mvnGroupId}.${mvnArtifactId}
+Bundle-Version:        ${version}
+Import-Package:        *
+Export-Package:        *;version="${version}";-noimport:=true
+-noextraheaders: true
+-removeheaders: Private-Package
+]]></instructions>
+		</location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="JUnit (Testing)" missingManifest="error" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-api</artifactId>
+					<version>5.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-engine</artifactId>
+					<version>5.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-migrationsupport</artifactId>
+					<version>5.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-params</artifactId>
+					<version>5.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-commons</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-engine</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-launcher</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-runner</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-suite-api</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.platform</groupId>
+					<artifactId>junit-platform-suite-commons</artifactId>
+					<version>1.9.3</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+					<version>5.9.3</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
+		</location>
 	</locations>
-</target>
+</target>
\ No newline at end of file