iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
amit.pandey 2020-02-09 02:34:29 +05:30
parent fbbafeb4d2 3af7fbf8a7
commit b368399b28
12 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core-java-modules/core-java-regex/README.md Normal file
View File

@ -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)

6
core-java-modules/core-java-text/pom.xml → core-java-modules/core-java-regex/pom.xml
View File

@ -2,9 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<artifactId>core-java-text</artifactId> <artifactId>core-java-regex</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.1.0-SNAPSHOT</version>
<name>core-java-text</name> <name>core-java-regex</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
@ -28,7 +28,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>core-java-text</finalName> <finalName>core-java-regex</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>

0
core-java-modules/core-java-text/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java → core-java-modules/core-java-regex/src/main/java/com/baeldung/patternreuse/PatternPerformanceComparison.java
View File

0
core-java-modules/core-java-text/src/main/resources/logback.xml → core-java-modules/core-java-regex/src/main/resources/logback.xml
View File

0
core-java-modules/core-java-text/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java → core-java-modules/core-java-regex/src/test/java/com/baeldung/patternreuse/PatternUnitTest.java
View File

2
core-java-modules/core-java/src/test/java/com/baeldung/java/regex/RegexUnitTest.java → core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java
View File

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

0
core-java-modules/core-java-text/src/test/java/com/baeldung/regex/matcher/MatcherUnitTest.java → core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/matcher/MatcherUnitTest.java
View File

0
core-java-modules/core-java/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java → core-java-modules/core-java-regex/src/test/java/com/baeldung/regexp/EscapingCharsUnitTest.java
View File

0
core-java-modules/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java → core-java-modules/core-java-regex/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherManualTest.java
View File

2
core-java-modules/core-java/README.md
View File

@ -2,7 +2,6 @@
### Relevant Articles: ### Relevant Articles:
- [Java Timer](http://www.baeldung.com/java-timer-and-timertask) - [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) - [Getting Started with Java Properties](http://www.baeldung.com/java-properties)
- [Introduction to Nashorn](http://www.baeldung.com/java-nashorn) - [Introduction to Nashorn](http://www.baeldung.com/java-nashorn)
- [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency) - [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) - [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) - [Introduction to Java Serialization](http://www.baeldung.com/java-serialization)
- [Guide to UUID in Java](http://www.baeldung.com/java-uuid) - [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) - [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
- [Quick Guide to Java Stack](http://www.baeldung.com/java-stack) - [Quick Guide to Java Stack](http://www.baeldung.com/java-stack)
- [Compiling Java *.class Files with javac](http://www.baeldung.com/javac) - [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)

2
core-java-modules/pom.xml
View File

@ -113,7 +113,7 @@
<module>core-java-strings</module> <module>core-java-strings</module>
<module>core-java-sun</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>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 --> <!-- <module>multimodulemavenproject</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->