You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/08/10 13:32:38 UTC
[nifi] branch main updated: NIFI-10183 Upgraded swagger-annotations to 1.6.6
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 24cea2a93b NIFI-10183 Upgraded swagger-annotations to 1.6.6
24cea2a93b is described below
commit 24cea2a93b9664e084c69e3cbd638bcf050f64c7
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Aug 9 16:12:13 2022 -0500
NIFI-10183 Upgraded swagger-annotations to 1.6.6
- Added managed dependency in root Maven configuration
- Removed different versions from other Maven configurations
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #6284.
---
c2/c2-protocol/c2-protocol-component-api/pom.xml | 1 -
minifi/pom.xml | 7 -------
nifi-api/pom.xml | 1 -
nifi-manifest/nifi-extension-manifest-model/pom.xml | 3 +--
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 -----
nifi-registry/nifi-registry-core/pom.xml | 5 -----
nifi-toolkit/nifi-toolkit-api/pom.xml | 3 ---
pom.xml | 6 ++++++
8 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
index 2175c6a4a6..cecfbf90af 100644
--- a/c2/c2-protocol/c2-protocol-component-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-component-api/pom.xml
@@ -33,7 +33,6 @@ limitations under the License.
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.16</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 484967b30c..a286f5efa7 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -475,13 +475,6 @@ limitations under the License.
<artifactId>mongo-java-driver</artifactId>
<version>3.2.2</version>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.16</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml
index c3c10a9b82..48bd0af9bd 100644
--- a/nifi-api/pom.xml
+++ b/nifi-api/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.16</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
diff --git a/nifi-manifest/nifi-extension-manifest-model/pom.xml b/nifi-manifest/nifi-extension-manifest-model/pom.xml
index 4078693d75..ef03680ee1 100644
--- a/nifi-manifest/nifi-extension-manifest-model/pom.xml
+++ b/nifi-manifest/nifi-extension-manifest-model/pom.xml
@@ -24,10 +24,9 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
+ <dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.16</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 09acefa94b..fae2512a36 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -254,11 +254,6 @@
<artifactId>quartz</artifactId>
<version>2.3.2</version>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.6.0</version>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
diff --git a/nifi-registry/nifi-registry-core/pom.xml b/nifi-registry/nifi-registry-core/pom.xml
index c236b6539a..2fcb774424 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -106,11 +106,6 @@
<artifactId>javax.el</artifactId>
<version>3.0.1-b08</version>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.16</version>
- </dependency>
<!-- open id connect - override transitive dependency version ranges -->
<dependency>
<groupId>com.nimbusds</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-api/pom.xml b/nifi-toolkit/nifi-toolkit-api/pom.xml
index 609dcbdf0b..1f9ad0ce96 100644
--- a/nifi-toolkit/nifi-toolkit-api/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-api/pom.xml
@@ -33,9 +33,6 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <!-- TODO - remove version tag here after core NiFi upgrades dependency
- from com.wordnik:swagger-annotations to io.swagger:swagger-annotations. -->
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/pom.xml b/pom.xml
index 2a705edb85..a9f3a9de52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
<netty.4.version>4.1.79.Final</netty.4.version>
<spring.version>5.3.22</spring.version>
<spring.security.version>5.7.2</spring.security.version>
+ <swagger.annotations.version>1.6.6</swagger.annotations.version>
<h2.version>2.1.214</h2.version>
<zookeeper.version>3.8.0</zookeeper.version>
</properties>
@@ -504,6 +505,11 @@
<artifactId>json-smart</artifactId>
<version>${json.smart.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger.annotations.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>