fix build, tests

ChrisEnglert · May 24, 2020 · d16a723 · d16a723
1 parent 35a44a3
commit d16a723
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git 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
@@ -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/...ache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java b/...ache/nifi/registry/web/security/authentication/oidc/OidcPasswordIdentityProviderTest.java
@@ -8,13 +8,16 @@
 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;
 import static org.mockito.ArgumentMatchers.eq;
 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
@@ -5,15 +5,15 @@
     <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>
 
     <artifactId>nifi-registry-oidc</artifactId>
     <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
@@ -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
@@ -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>