Skip to content

[Feature] Migrate to Jakarta namespaces and update Java compatibility to 17 #501

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

Open
daniel-kmiecik wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[Feature] Migrate to Jakarta namespaces and update Java compatibility to 17 #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e0a3e3
feat: migrate to Jakarta namespaces and update Java compatibility to …
daniel-kmiecik Apr 16, 2026
4265786
chore: update Java version to 17 in CI configurations
daniel-kmiecik Apr 17, 2026
9e44361
chore: update maven-javadoc-plugin source version to 17
daniel-kmiecik Apr 17, 2026
5830add
feat: update required Java version to 17 and remove unused jxr plugin…
daniel-kmiecik Apr 20, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/maven-pulls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11 ]
java: [ 17, 21 ]

steps:
- uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11 ]
java: [ 17, 21 ]

steps:
- uses: actions/checkout@v6
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
mvn --no-transfer-progress -B verify --file pom.xml
export MY_JAVA_VERSION=`java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1`
echo "JAVA VERSION" ${MY_JAVA_VERSION}
if [[ ${MY_JAVA_VERSION} == "8" ]];
if [[ ${MY_JAVA_VERSION} == "17" ]];
then
export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
echo "POM VERSION" ${MY_POM_VERSION}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/next-snapshot-v1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Next Snapshot V1

on:
workflow_dispatch:
branches: ["v1"]

jobs:
build:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/next-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Next Snapshot

on:
workflow_dispatch:
branches: ["master"]

jobs:
build:
Expand All @@ -23,7 +22,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 17
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/prepare-release-v1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Prepare Release V1

on:
workflow_dispatch:
branches: ["v1"]

jobs:
build:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/prepare-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Prepare Release

on:
workflow_dispatch:
branches: ["master"]

jobs:
build:
Expand All @@ -20,10 +19,10 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Set up Java 8
- name: Set up Java 17
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 17
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-v1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Release V1

on:
workflow_dispatch:
branches: ["v1"]

jobs:
build:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Release

on:
workflow_dispatch:
branches: ["master"]

jobs:
build:
Expand All @@ -20,10 +19,10 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Set up Java 8
- name: Set up Java 17
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 17
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
Expand Down
97 changes: 45 additions & 52 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packaging>jar</packaging>
<name>swagger-inflector</name>
<description>swagger-inflector</description>
<version>2.0.18-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<url>https://github.com/swagger-api/swagger-inflector</url>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-inflector.git</connection>
Expand Down Expand Up @@ -72,18 +72,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<configuration>
<!-- Prevent `gpg` from using pinentry programs -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand All @@ -100,7 +88,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>1.8</version>
<version>17</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -159,13 +147,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-version}</version>
<configuration>
<source>1.8</source>
<source>17</source>
<encoding>UTF-8</encoding>
<maxmemory>1g</maxmemory>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
</links>
<excludePackageNames>${javadoc.package.exclude}</excludePackageNames>
<detectOfflineLinks>false</detectOfflineLinks>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
<executions>
<execution>
Expand All @@ -181,8 +167,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand All @@ -209,16 +194,13 @@
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>
<useTestScope>true</useTestScope>
<systemProperties>
<systemProperty>
<name>config</name>
<value>src/test/config/config1.yaml</value>
</systemProperty>
<config>src/test/config/config1.yaml</config>
</systemProperties>
<webApp>
<contextPath>/</contextPath>
Expand All @@ -240,10 +222,6 @@
<goals>
<goal>start</goal>
</goals>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<daemon>true</daemon>
</configuration>
</execution>
<execution>
<id>stop-jetty</id>
Expand Down Expand Up @@ -344,15 +322,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.6</version>
<version>3.9.0</version>
<reportSets>
<reportSet>
<reports>
Expand All @@ -367,7 +342,7 @@
<!-- Swagger -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -409,11 +384,27 @@
<version>${jersey2-version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -452,7 +443,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.6</version>
<version>7.12.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -481,8 +472,8 @@
</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>
<version>${jackson.version}</version>
</dependency>
<dependency>
Expand All @@ -491,8 +482,8 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-yaml-provider</artifactId>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-yaml-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
Expand All @@ -501,14 +492,14 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-xml-provider</artifactId>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-xml-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -530,11 +521,13 @@
<properties>
<maven-javadoc-version>3.6.2</maven-javadoc-version>
<swagger-core-version>2.2.35</swagger-core-version>
<swagger-parser-version>2.1.31</swagger-parser-version>
<swagger-parser-version>2.1.40</swagger-parser-version>
<jackson.version>2.21.1</jackson.version>
<jetty-version>9.4.56.v20240826</jetty-version>
<jersey2-version>2.46</jersey2-version>
<servlet-api-version>3.1.0</servlet-api-version>
<jetty-version>12.0.14</jetty-version>
<jersey2-version>3.1.9</jersey2-version>
<jaxb-api-version>4.0.2</jaxb-api-version>
<jaxb-impl-version>4.0.5</jaxb-impl-version>
<servlet-api-version>6.0.0</servlet-api-version>
<commons-io-version>2.21.0</commons-io-version>
<commons-lang-version>3.20.0</commons-lang-version>
<commons-csv-version>1.10.0</commons-csv-version>
Expand Down
24 changes: 14 additions & 10 deletions scripts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,20 @@
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>
<monitoredDirName>.</monitoredDirName>
<scanTargets>
<scanTarget>inflector.yaml</scanTarget>
<scanTarget>src/main/swagger/openapi.yaml</scanTarget>
</scanTargets>
<scanIntervalSeconds>1</scanIntervalSeconds>
<scan>1</scan>
<scanTargetPatterns>
<scanTargetPattern>
<directory>${project.basedir}</directory>
<includes>
<include>inflector.yaml</include>
<include>src/main/swagger/openapi.yaml</include>
</includes>
</scanTargetPattern>
</scanTargetPatterns>
<webApp>
<contextPath>/</contextPath>
</webApp>
Expand Down Expand Up @@ -169,11 +173,11 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-inflector</artifactId>
<version>2.0.18-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<properties>
<jetty-version>9.4.53.v20231009</jetty-version>
<jetty-version>12.0.14</jetty-version>
<logback-version>1.5.22</logback-version>
<junit-version>4.13.2</junit-version>
<slf4j-version>1.7.36</slf4j-version>
Expand Down
2 changes: 1 addition & 1 deletion scripts/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<servlet-name>swagger-inflector</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-name>jakarta.ws.rs.Application</param-name>
<param-value>io.swagger.oas.inflector.OpenAPIInflector</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/oas/inflector/CustomMediaTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package io.swagger.oas.inflector;

import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MediaType;

public class CustomMediaTypes {

Expand Down
Loading
Loading