Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare for JDK11 build #222

Merged
merged 15 commits into from
Dec 14, 2021
Merged

Prepare for JDK11 build #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
581c672
Remove Powermock
berezovskyi Dec 11, 2021
933b328
Bump mockito-core to 4.1.0
berezovskyi Dec 11, 2021
ad37b18
Temp commit; debuggin oslc-java-client
berezovskyi Dec 11, 2021
2a08277
Fix wink client build and clean up xml-apis dependencies
berezovskyi Dec 11, 2021
50e754d
ban com.sun.xml.bind:jaxb-impl
berezovskyi Dec 11, 2021
ee69851
Enable JDK 11 build in the test matrix
berezovskyi Dec 11, 2021
2d94dc9
Update maven.yml
berezovskyi Dec 11, 2021
3be1619
Use newest WAR plugin
berezovskyi Dec 11, 2021
5bece24
Drop JDK 18ea for now and try to get JDK 17 building
berezovskyi Dec 12, 2021
57d0148
Fix the matrix
berezovskyi Dec 12, 2021
94fc57e
Disable JDK 17 builds for now and test 12-16 to see where it fails
berezovskyi Dec 12, 2021
859b379
Try bumping to Jena 3.17 to check if it helps build under JDK 16/17
berezovskyi Dec 12, 2021
e6b2dcd
Try bumping to Jena 3.17 / don't enforce commons-io
berezovskyi Dec 12, 2021
ffc02a9
Roll back to 3.16
berezovskyi Dec 12, 2021
82ccd18
Cache per JDK
berezovskyi Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 26 additions & 6 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,40 @@ on:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
jdk: ['8', '11']
# temurin is Eclipse/AdoptOpenJDK/Adoptium
# liberica is a build of Oracle GraalVM
distribution: ['temurin', 'zulu', 'liberica']
experimental: [false]
# jena 3.x has some locking problems under JDK 16/17
# include:
# - jdk: '16'
# experimental: true
# distribution: zulu
# - jdk: '17'
# experimental: true
# distribution: zulu
## - jdk: '18-ea'
# experimental: true
continue-on-error: ${{ matrix.experimental }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
- name: Build with Maven
run: |
mvn -B package --file pom.xml
17 changes: 0 additions & 17 deletions client/oslc-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,14 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.23.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<!--CQ 13719-->
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
Expand Down Expand Up @@ -146,18 +143,4 @@
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.0</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
23 changes: 8 additions & 15 deletions client/oslc-java-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<type>pom</type>
<version>3.14.0</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
Expand Down Expand Up @@ -143,10 +143,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency> <!--See https://bugs.eclipse.org/bugs/show_bug.cgi?id=513048-->
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand All @@ -168,13 +164,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
<version>3.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -230,13 +225,6 @@
</build>
<dependencyManagement>
<dependencies>
<!--
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.5.13</version>
</dependency>
-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -250,7 +238,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand All @@ -262,6 +250,11 @@
<artifactId>jaxb-impl</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.1</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
16 changes: 2 additions & 14 deletions core/oslc4j-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<name>Lyo :: Core :: OSLC</name>
<description>Core components of the Eclipse Lyo OSLC4J SDK.</description>

<properties>
<powermock.version>1.6.5</powermock.version>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.ws.rs</groupId>
Expand Down Expand Up @@ -76,15 +72,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -116,7 +105,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>
</plugins>
</build>
Expand Down
11 changes: 4 additions & 7 deletions ...oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package org.eclipse.lyo.oslc4j.core.model;

import org.eclipse.lyo.oslc4j.core.exception.OslcCoreMissingSetMethodException;
import org.junit.Test;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import org.eclipse.lyo.oslc4j.core.exception.OslcCoreMissingSetMethodException;
import org.junit.Test;

import static org.junit.Assert.*;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;

/**
* @version $version-stub$
Expand Down
1 change: 0 additions & 1 deletion core/shacl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>
</plugins>
</build>
Expand Down