From d16a723949dfbcfcef5205fb211fcf4ecf8e0b6f Mon Sep 17 00:00:00 2001
From: chris <chris.englert@live.com>
Date: Sun, 24 May 2020 09:26:16 +0200
Subject: [PATCH] fix build, tests

---
 nifi-registry-oidc/nifi-registry-oidc-assembly/pom.xml |  4 ++--
 .../nifi-registry-oidc-extension/pom.xml               |  3 ++-
 .../oidc/OidcPasswordIdentityProviderTest.java         |  3 +++
 nifi-registry-oidc/pom.xml                             |  4 ++--
 nifi-tusio/pom.xml                                     | 10 ----------
 pom.xml                                                |  2 ++
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/nifi-registry-oidc/nifi-registry-oidc-assembly/pom.xml b/nifi-registry-oidc/nifi-registry-oidc-assembly/pom.xml
index 2f812af..eef3d6f 100644
--- a/nifi-registry-oidc/nifi-registry-oidc-assembly/pom.xml
+++ b/nifi-registry-oidc/nifi-registry-oidc-assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-oidc</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-oidc-extension</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-registry-oidc/nifi-registry-oidc-extension/pom.xml b/nifi-registry-oidc/nifi-registry-oidc-extension/pom.xml
index 3bb7d42..4fc4708 100644
--- a/nifi-registry-oidc/nifi-registry-oidc-extension/pom.xml
+++ b/nifi-registry-oidc/nifi-registry-oidc-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-oidc</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>2.28.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-registry-oidc/nifi-registry-oidc-extension/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java b/nifi-registry-oidc/nifi-registry-oidc-extension/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java
index 84adbdc..ba3314c 100644
--- a/nifi-registry-oidc/nifi-registry-oidc-extension/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java
+++ b/nifi-registry-oidc/nifi-registry-oidc-extension/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java
@@ -8,6 +8,8 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
@@ -15,6 +17,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@RunWith(MockitoJUnitRunner.class)
 public class OidcPasswordIdentityProviderTest {
 
     private OidcPasswordIdentityProvider provider;
diff --git a/nifi-registry-oidc/pom.xml b/nifi-registry-oidc/pom.xml
index 601720b..8f92d28 100644
--- a/nifi-registry-oidc/pom.xml
+++ b/nifi-registry-oidc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-extensions</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <nifi-registry.version>1.0.0-SNAPSHOT</nifi-registry.version>
+        <nifi-registry.version>0.5.0</nifi-registry.version>
     </properties>
 
     <modules>
diff --git a/nifi-tusio/pom.xml b/nifi-tusio/pom.xml
index fd7d02f..7f813f8 100644
--- a/nifi-tusio/pom.xml
+++ b/nifi-tusio/pom.xml
@@ -36,14 +36,4 @@
         <module>nifi-tusio-nar</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20.1</version>
-           </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 0467c45..144002f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,8 @@
     <artifactId>NiFi-Addons</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
+    <packaging>pom</packaging>
+
     <modules>
         <module>nifi-keycloak</module>
         <module>nifi-tusio</module>