From 3be1489d0ec2ad9bbe88b1d194faa7088b4ea9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= <hmottestad@gmail.com>
Date: Mon, 7 Aug 2023 15:05:49 +0200
Subject: [PATCH] osgi broke from upgrading maven plugins, hard to know which
 one did it. Also make a new verify workflow so that this doesn't happen
 again.

---
 .github/workflows/pr-verify.yml | 24 ++++++++++++++++++
 pom.xml                         | 45 +++++++++++++++------------------
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
index 6b57a7ba22e..5a4ba91ae6b 100644
--- a/.github/workflows/pr-verify.yml
+++ b/.github/workflows/pr-verify.yml
@@ -98,6 +98,30 @@ jobs:
       uses: scacap/action-surefire-report@v1
       with:
         check_name: Test report - slow-tests
+  package-assembly:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-jdk11-maven-
+      - name: Package assembly
+        run: mvn package -Passembly -DskipTests
+      - name: Cancel workflow on failure
+        uses: vishnudxb/cancel-workflow@v1.2
+        if: failure()
+        with:
+          repo: eclipse/rdf4j
+          workflow_id: ${{ github.run_id }}
+          access_token: ${{ github.token }}
   copyright-check:
     runs-on: ubuntu-latest
     steps:
diff --git a/pom.xml b/pom.xml
index 348c2a0f8d3..e93cfdce125 100644
--- a/pom.xml
+++ b/pom.xml
@@ -633,7 +633,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.4.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -643,12 +643,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>3.3.1</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.10.1</version>
 					<configuration>
 						<fork>false</fork>
 						<encoding>utf8</encoding>
@@ -657,12 +657,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.4.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.0.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -713,7 +713,7 @@
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>5.1.9</version>
+					<version>5.1.8</version>
 					<extensions>true</extensions>
 					<configuration>
 						<instructions>
@@ -729,7 +729,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.4.1</version>
 					<configuration>
 						<encoding>utf8</encoding>
 						<source>11</source>
@@ -764,17 +764,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.1</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.2.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.2.0</version>
+					<version>1.1.0</version>
 					<executions>
 						<execution>
 							<phase>generate-resources</phase>
@@ -791,19 +791,16 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.1.2</version>
+					<version>3.0.0-M7</version>
 					<configuration>
 						<encoding>UTF-8</encoding>
 						<argLine>-Xmx2048M</argLine>
-						<excludes>
-							<exclude>**/*IT.java</exclude>
-						</excludes>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.1.2</version>
+					<version>3.0.0-M7</version>
 					<configuration>
 						<encoding>UTF-8</encoding>
 						<forkCount>1</forkCount>
@@ -833,7 +830,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.3.2</version>
 					<configuration>
 						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
@@ -850,7 +847,7 @@
 				<plugin>
 					<groupId>net.revelc.code.formatter</groupId>
 					<artifactId>formatter-maven-plugin</artifactId>
-					<version>2.23.0</version>
+					<version>2.21.0</version>
 					<configuration>
 						<configFile>${project.basedir}/eclipse-settings/eclipse-rdf4j-conventions.xml</configFile>
 						<lineEnding>LF</lineEnding>
@@ -860,7 +857,7 @@
 				<plugin>
 					<groupId>net.revelc.code</groupId>
 					<artifactId>impsort-maven-plugin</artifactId>
-					<version>1.9.0</version>
+					<version>1.8.0</version>
 					<configuration>
 						<groups>java.,javax.,org.,com.</groups>
 						<staticGroups>java,*</staticGroups>
@@ -874,7 +871,7 @@
 				<plugin>
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.17.2</version>
+					<version>0.17.1</version>
 					<configuration>
 						<oldVersion>
 							<dependency>
@@ -929,12 +926,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.4.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.1.0</version>
 					<executions>
 						<execution>
 							<id>enforce-maven-3</id>
@@ -1025,19 +1022,19 @@
 						<dependency>
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>extra-enforcer-rules</artifactId>
-							<version>1.7.0</version>
+							<version>1.6.1</version>
 						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>4.0.0-M9</version>
+					<version>4.0.0-M4</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>