resolve conflicts

core-java-modules/core-java-regex/README.md

@@ -0,0 +1,8 @@
+=========
+
+## Core Java 8 Cookbooks and Examples
+
+### Relevant Articles: 
+- [An Overview of Regular Expressions Performance in Java](https://www.baeldung.com/java-regex-performance)
+- [A Guide To Java Regular Expressions API](http://www.baeldung.com/regular-expressions-java)
+- [Guide to Escaping Characters in Java RegExps](http://www.baeldung.com/java-regexp-escape-char)

core-java-modules/core-java-regex/pom.xml

@@ -2,9 +2,9 @@
 <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>core-java-text</artifactId>
+    <artifactId>core-java-regex</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-text</name>
+    <name>core-java-regex</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -28,7 +28,7 @@
     </dependencies>
 
     <build>
-        <finalName>core-java-text</finalName>
+        <finalName>core-java-regex</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.java.regex;
+package com.baeldung.regex;
 
 import static org.junit.Assert.*;
 

core-java-modules/core-java/README.md

@@ -2,7 +2,6 @@
 
 ### Relevant Articles: 
 - [Java Timer](http://www.baeldung.com/java-timer-and-timertask)
-- [A Guide To Java Regular Expressions API](http://www.baeldung.com/regular-expressions-java)
 - [Getting Started with Java Properties](http://www.baeldung.com/java-properties)
 - [Introduction to Nashorn](http://www.baeldung.com/java-nashorn)
 - [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
@@ -11,7 +10,6 @@
 - [How to Get a Name of a Method Being Executed?](http://www.baeldung.com/java-name-of-executing-method)
 - [Introduction to Java Serialization](http://www.baeldung.com/java-serialization)
 - [Guide to UUID in Java](http://www.baeldung.com/java-uuid)
-- [Guide to Escaping Characters in Java RegExps](http://www.baeldung.com/java-regexp-escape-char)
 - [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
 - [Quick Guide to Java Stack](http://www.baeldung.com/java-stack)
 - [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)

core-java-modules/pom.xml

@@ -113,7 +113,7 @@
         <module>core-java-strings</module>
         <module>core-java-sun</module>
 
-        <module>core-java-text</module>
+        <module>core-java-regex</module>
         <!-- <module>core-java-time-measurements</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
 
         <!-- <module>multimodulemavenproject</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->