Skip to content

Commit

Permalink
osgi broke from upgrading maven plugins (#4738)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmottestad
hmottestad authored Aug 7, 2023
2 parents 19a758d + 3be1489 commit 1b889df
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 24 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/pr-verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
if: failure()
with:
repo: eclipse/rdf4j
workflow_id: ${{ github.run_id }}
access_token: ${{ github.token }}
copyright-check:
runs-on: ubuntu-latest
steps:
Expand Down
45 changes: 21 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 1b889df

Please sign in to comment.