From 7f114db7d3ffb1d7c74f1a3edaa253e0c5ccd755 Mon Sep 17 00:00:00 2001 From: frantuma Date: Mon, 18 Dec 2023 20:39:54 +0100 Subject: [PATCH 1/2] update dependencies --- .../pom.xml | 6 +++--- modules/swagger-gradle-plugin/build.gradle | 10 +++++----- modules/swagger-jaxrs2/pom.xml | 4 ++-- modules/swagger-maven-plugin/pom.xml | 8 ++++---- modules/swagger-models/pom.xml | 2 +- .../modules/swagger-jaxrs2-jakarta/pom.xml | 2 +- .../swagger-maven-plugin-jakarta/pom.xml | 4 ++-- modules/swagger-project-jakarta/pom.xml | 20 +++++++++---------- pom.xml | 14 ++++++------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/swagger-eclipse-transformer-maven-plugin/pom.xml b/modules/swagger-eclipse-transformer-maven-plugin/pom.xml index 63cdb45b6a..458eac8f9c 100644 --- a/modules/swagger-eclipse-transformer-maven-plugin/pom.xml +++ b/modules/swagger-eclipse-transformer-maven-plugin/pom.xml @@ -13,7 +13,7 @@ swagger-eclipse-transformer-maven-plugin maven-plugin - 3.9.5 + 3.9.6 0.20 3.3.0 1.2.6 @@ -94,7 +94,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.9.0 + 3.10.2 provided @@ -106,7 +106,7 @@ org.codehaus.plexus plexus-archiver - 4.8.0 + 4.9.0 test diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle index 6354428330..d378eec636 100644 --- a/modules/swagger-gradle-plugin/build.gradle +++ b/modules/swagger-gradle-plugin/build.gradle @@ -24,7 +24,7 @@ compileJava { dependencies { implementation gradleApi() - implementation 'org.apache.commons:commons-lang3:3.13.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' testImplementation gradleTestKit() testImplementation('com.github.tomakehurst:wiremock:2.27.2') { @@ -40,7 +40,7 @@ dependencies { } testImplementation 'javax.servlet:javax.servlet-api:3.1.0' testImplementation 'com.google.guava:guava:32.1.3-jre' - testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1.1' + testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1.6' testImplementation "io.swagger.core.v3:swagger-jaxrs2:${project.version}" testImplementation 'junit:junit:4+' testImplementation "org.eclipse.jetty:jetty-server:${project.jettyVersion}" @@ -48,10 +48,10 @@ dependencies { testImplementation "org.eclipse.jetty:jetty-servlets:${project.jettyVersion}" testImplementation "org.eclipse.jetty:jetty-webapp:${project.jettyVersion}" testImplementation "org.eclipse.jetty:jetty-proxy:${project.jettyVersion}" - testImplementation "org.apache.httpcomponents:httpclient:4.5.13" + testImplementation "org.apache.httpcomponents:httpclient:4.5.14" testImplementation "commons-codec:commons-codec:1.16.0" - testImplementation "commons-io:commons-io:2.14.0" - testImplementation "org.apache.commons:commons-compress:1.21" + testImplementation "commons-io:commons-io:2.15.1" + testImplementation "org.apache.commons:commons-compress:1.25.0" testImplementation "com.github.jknack:handlebars:4.3.1" testImplementation "com.github.jknack:handlebars-helpers:4.3.1" } diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml index e91866d7d9..f78fee3dd0 100644 --- a/modules/swagger-jaxrs2/pom.xml +++ b/modules/swagger-jaxrs2/pom.xml @@ -174,7 +174,7 @@ org.javassist javassist - 3.29.2-GA + 3.30.1-GA commons-io @@ -239,7 +239,7 @@ org.jboss.arquillian.testng arquillian-testng-container - 1.7.1.Final + 1.8.0.Final test diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml index b6f3c476f1..61c71d56d2 100644 --- a/modules/swagger-maven-plugin/pom.xml +++ b/modules/swagger-maven-plugin/pom.xml @@ -88,7 +88,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.9.0 + 3.10.2 provided @@ -100,7 +100,7 @@ org.codehaus.plexus plexus-archiver - 4.8.0 + 4.9.0 test @@ -290,9 +290,9 @@ UTF-8 - 3.9.5 + 3.9.6 4.13.2 9.4.53.v20231009 - 1.24.0 + 1.25.0 diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml index bb1a2e4597..d799de452d 100644 --- a/modules/swagger-models/pom.xml +++ b/modules/swagger-models/pom.xml @@ -98,6 +98,6 @@ 0.07 0.0 1.49 - 2.16.0 + 2.28.2 diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml index a616c0d618..18a212da7c 100644 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml @@ -32,7 +32,7 @@ org.javassist javassist - 3.29.2-GA + 3.30.1-GA commons-io diff --git a/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml index 7919e045d5..52cfcafcd5 100644 --- a/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.9.0 + 3.10.2 provided @@ -176,6 +176,6 @@ UTF-8 - 3.9.5 + 3.9.6 diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml index 94a8247d94..7975cf35e5 100644 --- a/modules/swagger-project-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/pom.xml @@ -572,16 +572,16 @@ 2.1.2 6.4.0 5.0.0 - 3.1.3 + 3.1.5 4.13.2 - 2.15.2 - 2.15.2 - 1.4.13 - 4.8.162 + 2.16.0 + 2.16.0 + 1.4.14 + 4.8.165 32.1.3-jre - 1.10.13 - 3.13.0 - 2.15.0 + 1.10.14 + 3.14.0 + 2.15.1 2.0.9 9.4.53.v20231009 7.8.0 @@ -601,7 +601,7 @@ UTF-8 https://oss.sonatype.org/content/repositories/snapshots/ - 3.9.5 - 1.21 + 3.9.6 + 1.25.0 diff --git a/pom.xml b/pom.xml index d7dfeb5100..d83d987fb8 100644 --- a/pom.xml +++ b/pom.xml @@ -657,14 +657,14 @@ 4.0.4 2.41 4.13.2 - 2.15.2 - 2.15.2 - 1.4.13 - 4.8.162 + 2.16.0 + 2.16.0 + 1.4.14 + 4.8.165 32.1.3-jre - 1.10.13 - 3.13.0 - 2.15.0 + 1.10.14 + 3.14.0 + 2.15.1 2.0.9 9.4.53.v20231009 7.8.0 From 9fd72cd5ee34619840af0ba464d17687466d39c7 Mon Sep 17 00:00:00 2001 From: frantuma Date: Mon, 18 Dec 2023 22:51:49 +0100 Subject: [PATCH 2/2] switch to original eclipse transformer for jakarta artifacts --- modules/swagger-annotations/pom.xml | 19 ---- modules/swagger-core/pom.xml | 19 ---- modules/swagger-gradle-plugin/build.gradle | 2 +- modules/swagger-integration/pom.xml | 19 ---- .../pom.xml | 19 ---- .../pom.xml | 19 ---- modules/swagger-jaxrs2/pom.xml | 19 ---- modules/swagger-models/pom.xml | 19 ---- .../swagger-annotations-jakarta/pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../modules/swagger-core-jakarta/pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../swagger-integration-jakarta/pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../modules/swagger-jaxrs2-jakarta/pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - .../modules/swagger-models-jakarta/pom.xml | 60 +++++++++++- .../transformed/README.md | 3 - modules/swagger-project-jakarta/pom.xml | 93 +------------------ pom.xml | 23 +---- 24 files changed, 418 insertions(+), 274 deletions(-) delete mode 100644 modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-core-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-integration-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/transformed/README.md delete mode 100644 modules/swagger-project-jakarta/modules/swagger-models-jakarta/transformed/README.md diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml index cbb644dfe8..000c895f73 100644 --- a/modules/swagger-annotations/pom.xml +++ b/modules/swagger-annotations/pom.xml @@ -30,25 +30,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml index 9e773ea062..32744c9603 100644 --- a/modules/swagger-core/pom.xml +++ b/modules/swagger-core/pom.xml @@ -46,25 +46,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle index d378eec636..6f5ff46769 100644 --- a/modules/swagger-gradle-plugin/build.gradle +++ b/modules/swagger-gradle-plugin/build.gradle @@ -40,7 +40,7 @@ dependencies { } testImplementation 'javax.servlet:javax.servlet-api:3.1.0' testImplementation 'com.google.guava:guava:32.1.3-jre' - testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1.6' + testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1.1' testImplementation "io.swagger.core.v3:swagger-jaxrs2:${project.version}" testImplementation 'junit:junit:4+' testImplementation "org.eclipse.jetty:jetty-server:${project.jettyVersion}" diff --git a/modules/swagger-integration/pom.xml b/modules/swagger-integration/pom.xml index ccda48ae4f..b3616fc685 100644 --- a/modules/swagger-integration/pom.xml +++ b/modules/swagger-integration/pom.xml @@ -58,25 +58,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml index bfc1f2f85e..ff74316afb 100644 --- a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml +++ b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml @@ -113,25 +113,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-jaxrs2-servlet-initializer/pom.xml b/modules/swagger-jaxrs2-servlet-initializer/pom.xml index bc63bbf751..76e5609d76 100644 --- a/modules/swagger-jaxrs2-servlet-initializer/pom.xml +++ b/modules/swagger-jaxrs2-servlet-initializer/pom.xml @@ -118,25 +118,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml index f78fee3dd0..63cc1cd5cb 100644 --- a/modules/swagger-jaxrs2/pom.xml +++ b/modules/swagger-jaxrs2/pom.xml @@ -120,25 +120,6 @@ - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml index d799de452d..18b5994d2e 100644 --- a/modules/swagger-models/pom.xml +++ b/modules/swagger-models/pom.xml @@ -44,25 +44,6 @@ -Djdk.attach.allowAttachSelf - - io.swagger.core.v3 - swagger-eclipse-transformer-maven-plugin - ${project.version} - - false - jakarta - ${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed - - - - transform-jakarta - - run - - package - - - diff --git a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml index 6275c6dd5a..03cbfbf642 100644 --- a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-annotations-jakarta swagger-annotations-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-annotations + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-annotations + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-annotations + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml index a78c40c7b7..5d2ea4ae7c 100644 --- a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-core-jakarta swagger-core-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-core + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-core + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-core + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-core-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml index e6948be780..72ed782075 100644 --- a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-integration-jakarta swagger-integration-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-integration + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-integration + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-integration + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml index 18a212da7c..c4cf468413 100644 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-jaxrs2-jakarta swagger-jaxrs2-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2 + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2 + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2 + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml index 228d9f1b64..5e8778f848 100644 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-jaxrs2-servlet-initializer-jakarta swagger-jaxrs2-servlet-initializer-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml index dc151cc8cc..7ee9307be4 100644 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-jaxrs2-servlet-initializer-v2-jakarta swagger-jaxrs2-servlet-initializer-v2-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer-v2 + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer-v2 + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-jaxrs2-servlet-initializer-v2 + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml index f8871634bd..4b29d44e6d 100644 --- a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml @@ -12,7 +12,65 @@ swagger-models-jakarta swagger-models-jakarta - + + + + org.eclipse.transformer + transformer-maven-plugin + ${transformer-maven-plugin-version} + true + + + true + + ${project.build.finalName}-jakarta + + + + default-jar + + jar + + + + ${project.groupId} + swagger-models + ${project.version} + + + + + javadoc-jar + + jar + + + + ${project.groupId} + swagger-models + ${project.version} + javadoc + + + + + source-jar + + jar + + + + ${project.groupId} + swagger-models + ${project.version} + sources + + + + + + + diff --git a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/transformed/README.md b/modules/swagger-project-jakarta/modules/swagger-models-jakarta/transformed/README.md deleted file mode 100644 index e96b3ae207..0000000000 --- a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/transformed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -#### Don't delete - -Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml index 7975cf35e5..915d13b5eb 100644 --- a/modules/swagger-project-jakarta/pom.xml +++ b/modules/swagger-project-jakarta/pom.xml @@ -111,95 +111,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - true - true - - - - attach-sources - verify - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.2 - - true - 1.8 - UTF-8 - 1g - - http://docs.oracle.com/javase/8/docs/api - - ${javadoc.package.exclude} - - - - attach-javadocs - verify - - jar - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - empty-javadoc-jar - package - - jar - - - javadoc - ${basedir}/javadoc - - - - - - maven-resources-plugin - - 3.1.0 - - - copy-resources - package - - copy-resources - - - ${project.build.directory} - true - - - transformed - false - - ${project.artifactId}-${project.version}.jar - - - - - - - - - org.sonatype.plugins nexus-staging-maven-plugin @@ -568,7 +479,7 @@ 2.2 3.1.0 3.0.2 - 2.3.3 + 3.0.1 2.1.2 6.4.0 5.0.0 @@ -600,7 +511,7 @@ UTF-8 https://oss.sonatype.org/content/repositories/snapshots/ - + 0.5.0 3.9.6 1.25.0 diff --git a/pom.xml b/pom.xml index d83d987fb8..c4872133b7 100644 --- a/pom.xml +++ b/pom.xml @@ -222,25 +222,6 @@ true--> - @@ -416,7 +397,6 @@ - modules/swagger-eclipse-transformer-maven-plugin modules/swagger-annotations modules/swagger-models modules/swagger-core @@ -425,6 +405,7 @@ modules/swagger-jaxrs2-servlet-initializer modules/swagger-jaxrs2-servlet-initializer-v2 modules/swagger-maven-plugin + modules/swagger-eclipse-transformer-maven-plugin modules/swagger-project-jakarta @@ -680,7 +661,7 @@ 0.90 0.90 0 - + 0.5.0 UTF-8 https://oss.sonatype.org/content/repositories/snapshots/