summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2021-07-22 12:02:49 +0100
committerefiacor <fiachra.corcoran@est.tech>2021-07-22 12:02:54 +0100
commit05eba8cb421bb948f5f72b8adec7cd34429391f4 (patch)
treec391a50fe13d61f5cd7d007f1c677b98c2e75bb0
parent354b0ae502cbf671ca9b045bda350c107396809b (diff)
[DMAAP-KAFKA] Revert module name change
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: I5fe1f4175085bf0dee0f571790c9f6d982f5fa83 Issue-ID: DMAAP-209
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizer.java (renamed from src/main/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizer.java)2
-rw-r--r--src/main/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1.java (renamed from src/main/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1.java)2
-rw-r--r--src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1.java (renamed from src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1.java)2
-rw-r--r--src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServerProvider1.java (renamed from src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServerProvider1.java)4
-rw-r--r--src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java (renamed from src/test/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizerTest.java)2
-rw-r--r--src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java (renamed from src/test/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1Test.java)2
-rw-r--r--src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java (renamed from src/test/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1Test.java)4
8 files changed, 11 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index be2e4ae..2a7c5db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
</sitePath>
<skip.docker.build>true</skip.docker.build>
<skip.docker.push>true</skip.docker.push>
+ <docker.nocache>true</docker.nocache>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
@@ -294,6 +295,7 @@
<image>
<name>onap/dmaap/kafka111</name>
<build>
+ <nocache>true</nocache>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>Dockerfile</dockerFile>
diff --git a/src/main/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizer.java b/src/main/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizer.java
index 09f704a..4ad10e8 100644
--- a/src/main/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizer.java
+++ b/src/main/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizer.java
@@ -19,7 +19,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import java.util.EnumSet;
import java.util.Map;
diff --git a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1.java b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1.java
index f230418..af5aa8f 100644
--- a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1.java
+++ b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1.java
@@ -19,7 +19,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import java.util.Map;
import javax.security.auth.Subject;
diff --git a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1.java b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1.java
index ae15bbc..7a9bede 100644
--- a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1.java
+++ b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1.java
@@ -19,7 +19,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServerProvider1.java b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServerProvider1.java
index b9fbf7a..37b408e 100644
--- a/src/main/java/org/onap/dmaap/kafkaauthorize/PlainSaslServerProvider1.java
+++ b/src/main/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServerProvider1.java
@@ -19,12 +19,12 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import java.security.Provider;
import java.security.Security;
-import org.onap.dmaap.kafkaauthorize.PlainSaslServer1.PlainSaslServerFactory1;
+import org.onap.dmaap.kafkaAuthorize.PlainSaslServer1.PlainSaslServerFactory1;
public class PlainSaslServerProvider1 extends Provider {
diff --git a/src/test/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizerTest.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java
index 098d472..e2e85af 100644
--- a/src/test/java/org/onap/dmaap/kafkaauthorize/KafkaCustomAuthorizerTest.java
+++ b/src/test/java/org/onap/dmaap/kafkaAuthorize/KafkaCustomAuthorizerTest.java
@@ -19,7 +19,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1Test.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java
index 33a0708..9383539 100644
--- a/src/test/java/org/onap/dmaap/kafkaauthorize/PlainLoginModule1Test.java
+++ b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainLoginModule1Test.java
@@ -19,7 +19,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1Test.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
index 6128978..5d18bbd 100644
--- a/src/test/java/org/onap/dmaap/kafkaauthorize/PlainSaslServer1Test.java
+++ b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
@@ -18,7 +18,7 @@
*
*
*******************************************************************************/
-package org.onap.dmaap.kafkaauthorize;
+package org.onap.dmaap.kafkaAuthorize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -38,7 +38,7 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProvider;
import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProviderFactory;
-import org.onap.dmaap.kafkaauthorize.PlainSaslServer1.PlainSaslServerFactory1;
+import org.onap.dmaap.kafkaAuthorize.PlainSaslServer1.PlainSaslServerFactory1;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;