Merge main into develop (#4739)

eclipse-rdf4j · Aug 7, 2023 · 5ec0c62 · 5ec0c62
2 parents 9c8a745 + 1b889df
commit 5ec0c62
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 24 deletions.
diff --git 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
@@ -628,7 +628,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>
@@ -638,12 +638,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>
@@ -652,12 +652,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>
@@ -708,7 +708,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>
@@ -724,7 +724,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>
@@ -759,17 +759,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>
@@ -786,19 +786,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>
@@ -828,7 +825,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>
@@ -845,7 +842,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>
@@ -855,7 +852,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>
@@ -869,7 +866,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>
@@ -924,12 +921,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>
@@ -1020,19 +1017,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>