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

[OLINGO-1600] Upgrade JDK 17 + Jakarta + Spring (6) #151

Merged
merged 7 commits into from
Dec 17, 2023
Merged

[OLINGO-1600] Upgrade JDK 17 + Jakarta + Spring (6) #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e696bc
upgrade jdk and java ee
Jun 5, 2023
6c8ebc3
Merge branch 'master' into upgrade/jdk-and-jakarta
eduardoraupp Sep 25, 2023
7e0637b
[OLINGO-1600] Merge branches
mibo Nov 6, 2023
295dfcb
[OLINGO-1600] Updated complier plugin config
mibo Nov 6, 2023
ae1c045
[OLINGO-1600] Set version to 5.0.0-ALPHA-01
mibo Nov 14, 2023
ab7cf15
[OLINGO-1600] Set version to 5.0.0-ALPHA-02
mibo Nov 19, 2023
05f8656
[OLINGO-1600] Dependency version updates
mibo Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Set up JDK 8 (Corretto)
- name: Set up JDK 17 (Corretto)
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'corretto'
cache: maven

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 8 (Corretto)
- uses: actions/checkout@v4
- name: Set up JDK 17 (Corretto)
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'corretto'
cache: maven
- name: Build with Maven
Expand Down
2 changes: 1 addition & 1 deletion dist/android-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/client-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/javadoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/server-lib-ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/server-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ext/client-android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ext/client-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ext/karaf/karaf-features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion ext/karaf/karaf-fit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public Option[] config() {
return new Option[] {
olingoBaseConfig(),
features(olingoUrl, "olingo-server", "olingo-client"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "5.0.0-SNAPSHOT-RC01"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "5.0.0-ALPHA-02-RC01"),
logLevel(LogLevel.INFO)
};
}
Expand Down
2 changes: 1 addition & 1 deletion ext/karaf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ext/pojogen-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
7 changes: 5 additions & 2 deletions ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -62,6 +62,9 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<includes>
<include>${project.basedir}/target/generated-sources/**</include>
</includes>
</configuration>
</plugin>
<plugin>
Expand Down
7 changes: 5 additions & 2 deletions ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -62,6 +62,9 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<includes>
<include>${project.basedir}/target/generated-sources/**</include>
</includes>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
<relativePath>..</relativePath>
</parent>

Expand Down
40 changes: 31 additions & 9 deletions fit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<version>5.0.0-ALPHA-02</version>
</parent>

<properties>
Expand Down Expand Up @@ -82,8 +82,8 @@

<!-- REST services CXF -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.6_mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand All @@ -102,22 +102,44 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<!-- /REST services CXF -->

<!-- Jakarta -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.version}</version>
</dependency>

<!-- JAVAX -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>

<!-- SPRING -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-log4j</artifactId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Expand Down Expand Up @@ -185,7 +207,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.2.1</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand Down
4 changes: 2 additions & 2 deletions fit/src/it/demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions fit/src/it/openType/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions fit/src/it/staticService/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>

<properties>
<project.source>1.6</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>
<project.source>17</project.source>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
28 changes: 14 additions & 14 deletions fit/src/main/java/org/apache/olingo/fit/Demo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
import java.io.IOException;
import java.io.InputStream;

import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down
30 changes: 15 additions & 15 deletions fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
import java.io.IOException;
import java.io.InputStream;

import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down
Loading