You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jg...@apache.org on 2023/03/23 18:08:25 UTC
[nifi] branch main updated: NIFI-11276 Upgraded nifi-toolkit-api to Swagger Codegen 3
This is an automated email from the ASF dual-hosted git repository.
jgresock pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 132bce4245 NIFI-11276 Upgraded nifi-toolkit-api to Swagger Codegen 3
132bce4245 is described below
commit 132bce4245dc946d25fb1cd44d362494a8abfad9
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Mar 13 10:27:54 2023 -0500
NIFI-11276 Upgraded nifi-toolkit-api to Swagger Codegen 3
- Added dependency on swagger-annotations version 3
- Disabled API and Model test generation
Signed-off-by: Joe Gresock <jg...@gmail.com>
This closes #7038.
---
nifi-toolkit/nifi-toolkit-api/pom.xml | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/nifi-toolkit/nifi-toolkit-api/pom.xml b/nifi-toolkit/nifi-toolkit-api/pom.xml
index 1994eed5d2..33e83baece 100644
--- a/nifi-toolkit/nifi-toolkit-api/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-api/pom.xml
@@ -34,6 +34,11 @@ language governing permissions and limitations under the License. -->
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>2.2.8</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
@@ -64,28 +69,12 @@ language governing permissions and limitations under the License. -->
</dependency>
</dependencies>
- <!--
- Based on execution of swagger-codegen similar to the following.
- (Double dashes spaced to prevent Maven error.)
- $ java -jar .../swagger-codegen-cli.jar generate \
- -i swagger.json \
- -l java \
- -o src2 \
- - -group-id org.apache.nifi \
- - -artifact-id nifi.client-api \
- - -artifact-version 1.2.0-SNAPSHOT \
- - -invoker-package org.apache.nifi.client \
- - -api-package org.apache.nifi.client.api \
- - -model-package org.apache.nifi.client.model \
- - -http-user-agent apache-nifi-swagger-client-java
- -->
-
<build>
<plugins>
<plugin>
- <groupId>io.swagger</groupId>
+ <groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>2.4.27</version>
+ <version>3.0.41</version>
<executions>
<execution>
<goals>
@@ -94,6 +83,8 @@ language governing permissions and limitations under the License. -->
<configuration>
<inputSpec>${project.parent.parent.basedir}/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/target/swagger-ui/swagger.json</inputSpec>
<language>java</language>
+ <generateApiTests>false</generateApiTests>
+ <generateModelTests>false</generateModelTests>
<configOptions>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api-toolkit</artifactId>
@@ -112,7 +103,6 @@ language governing permissions and limitations under the License. -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
<configuration>
<skip>true</skip>
</configuration>