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

switch to original eclipse transformer for jakarta artifacts - update dependencies #4578

Merged
merged 2 commits into from
Dec 18, 2023
Merged

switch to original eclipse transformer for jakarta artifacts - update dependencies #4578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f114db
update dependencies
frantuma Dec 18, 2023
9fd72cd
switch to original eclipse transformer for jakarta artifacts
frantuma Dec 18, 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
19 changes: 0 additions & 19 deletions modules/swagger-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
Expand Down
19 changes: 0 additions & 19 deletions modules/swagger-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions modules/swagger-eclipse-transformer-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>swagger-eclipse-transformer-maven-plugin</description>
<packaging>maven-plugin</packaging>
<properties>
<maven.target.version>3.9.5</maven.target.version>
<maven.target.version>3.9.6</maven.target.version>
<eclipse.transformer.version>0.20</eclipse.transformer.version>
<maven-test-harness.version>3.3.0</maven-test-harness.version>
<shrinkwrap.version>1.2.6</shrinkwrap.version>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.9.0</version>
<version>3.10.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -106,7 +106,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.8.0</version>
<version>4.9.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
8 changes: 4 additions & 4 deletions modules/swagger-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -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"
}
Expand Down
19 changes: 0 additions & 19 deletions modules/swagger-integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 0 additions & 19 deletions modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
19 changes: 0 additions & 19 deletions modules/swagger-jaxrs2-servlet-initializer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,25 +118,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
23 changes: 2 additions & 21 deletions modules/swagger-jaxrs2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,25 +120,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -174,7 +155,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<version>3.30.1-GA</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -239,7 +220,7 @@
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>1.7.1.Final</version>
<version>1.8.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions modules/swagger-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.9.0</version>
<version>3.10.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -100,7 +100,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.8.0</version>
<version>4.9.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -290,9 +290,9 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.9.5</maven.version>
<maven.version>3.9.6</maven.version>
<junit.version>4.13.2</junit.version>
<wiremock-jetty-version>9.4.53.v20231009</wiremock-jetty-version>
<commons-compress-version>1.24.0</commons-compress-version>
<commons-compress-version>1.25.0</commons-compress-version>
</properties>
</project>
21 changes: 1 addition & 20 deletions modules/swagger-models/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,6 @@
<argLine>-Djdk.attach.allowAttachSelf</argLine>
</configuration>
</plugin>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<attach>false</attach>
<classifier>jakarta</classifier>
<outputDirectory>${project.basedir}/../swagger-project-jakarta/modules/${project.artifactId}-jakarta/transformed</outputDirectory>
</configuration>
<executions>
<execution>
<id>transform-jakarta</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down Expand Up @@ -98,6 +79,6 @@
<coverage.complexity.minimum>0.07</coverage.complexity.minimum>
<coverage.line.minimum>0.0</coverage.line.minimum>
<jmockit-version>1.49</jmockit-version>
<mockito-version>2.16.0</mockito-version>
<mockito-version>2.28.2</mockito-version>
</properties>
</project>
60 changes: 59 additions & 1 deletion modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,65 @@
<name>swagger-annotations-jakarta</name>
<description>swagger-annotations-jakarta</description>

<build></build>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.transformer</groupId>
<artifactId>transformer-maven-plugin</artifactId>
<version>${transformer-maven-plugin-version}</version>
<extensions>true</extensions>
<configuration>
<rules>
<jakartaDefaults>true</jakartaDefaults>
</rules>
<baseName>${project.build.finalName}-jakarta</baseName>
</configuration>
<executions>
<execution>
<id>default-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${project.version}</version>
</artifact>
</configuration>
</execution>
<execution>
<id>javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</artifact>
</configuration>
</execution>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies></dependencies>

Expand Down
3 changes: 0 additions & 3 deletions ...agger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md
View file
Open in desktop

This file was deleted.

Loading
Loading