Merge branch 'eugenp:master' into master

akka-modules/README.md

@@ -0,0 +1,3 @@
+## Akka 
+
+This module contains modules about Akka. 

akka-modules/akka-http/pom.xml

@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>akka-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 

akka-modules/akka-streams/pom.xml

@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>akka-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 

akka-modules/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>akka-modules</artifactId>
+    <name>akka-modules</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>akka-http</module>
+        <module>akka-streams</module>
+        <module>spring-akka</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>

akka-modules/spring-akka/pom.xml

@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>akka-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 

apache-cxf-modules/README.md

@@ -4,6 +4,4 @@ This module contains articles about Apache CXF
 
 ## Relevant Articles:
 
-- [Apache CXF Support for RESTful Web Services](https://www.baeldung.com/apache-cxf-rest-api)
-- [A Guide to Apache CXF with Spring](https://www.baeldung.com/apache-cxf-with-spring)
-- [Introduction to Apache CXF](https://www.baeldung.com/introduction-to-apache-cxf)
+- [Introduction to Apache CXF Aegis Data Binding](https://www.baeldung.com/aegis-data-binding-in-apache-cxf)

apache-cxf-modules/cxf-introduction/README.md

@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Introduction to Apache CXF](http://www.baeldung.com/introduction-to-apache-cxf)
+- [Introduction to Apache CXF](https://www.baeldung.com/introduction-to-apache-cxf)

axon/pom.xml

@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.axonframework</groupId>
                 <artifactId>axon-bom</artifactId>
-                <version>${axon.version}</version>
+                <version>${axon-bom.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -57,7 +57,7 @@
     </dependencies>
 
     <properties>
-        <axon.version>4.5.0</axon.version>
+        <axon-bom.version>4.5.13</axon-bom.version>
     </properties>
 
 </project>

cas/cas-secured-app/pom.xml

@@ -10,10 +10,9 @@
     <description>Demo project for CAS</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung.cas</groupId>
+        <artifactId>cas</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java

@@ -88,7 +88,6 @@ public class CasSecuredApplication {
     @Bean
     public SingleSignOutFilter singleSignOutFilter() {
         SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter();
-        singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443");
         singleSignOutFilter.setLogoutCallbackPath("/exit/cas");
         singleSignOutFilter.setIgnoreInitConfiguration(true);
         return singleSignOutFilter;