Merge branch 'master' of

https://github.com/Angular2Guy/AngularAndSpring.git

Author: Angular2Guy

backend/.classpath

@@ -9,7 +9,6 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -29,12 +28,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

frontend/.classpath

@@ -23,18 +23,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

minikube/angularandspringwithkafka/values.yaml

@@ -44,5 +44,6 @@ envKafka:
     KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://:9092
     KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: false
     ALLOW_PLAINTEXT_LISTENER: yes
+    KAFKA_ENABLE_KRAFT: false
   secret:
     KAFKA_ZOOKEEPER_CONNECT: "zookeeperservice:2181"  

minikube/kafka/values.yaml

@@ -28,5 +28,6 @@ envKafka:
     KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://:9092
     KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: false
     ALLOW_PLAINTEXT_LISTENER: yes
+    KAFKA_ENABLE_KRAFT: false
   secret:
     KAFKA_ZOOKEEPER_CONNECT: "zookeeperservice:2181"