Merge pull request #4777 from amit2103/BAEL-7635

Bael 7635

.gitignore

@@ -48,3 +48,12 @@ dependency-reduced-pom.xml
 *.so
 *.dylib
 *.dll
+
+xml/src/test/resources/example_dom4j_new.xml
+xml/src/test/resources/example_dom4j_updated.xml
+xml/src/test/resources/example_jaxb_new.xml
+core-java-io/hard_link.txt
+core-java-io/target_link.txt
+core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
+ethereum/logs/
+jmeter/src/main/resources/*-JMeter.csv

jhipster/jhipster-monolithic/pom.xml

@@ -347,7 +347,7 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
+            <!-- <plugin>
                 <groupId>com.github.ekryd.sortpom</groupId>
                 <artifactId>sortpom-maven-plugin</artifactId>
                 <version>${sortpom-maven-plugin.version}</version>
@@ -367,7 +367,7 @@
                     <keepBlankLines>true</keepBlankLines>
                     <expandEmptyElements>false</expandEmptyElements>
                 </configuration>
-            </plugin>
+            </plugin> -->
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>

xml/src/test/resources/example_dom4j_new.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMLTutorials>
-  <tutorial tutId="01" type="xml">
-    <title>XML with Dom4J</title>
-    <description>XML handling with Dom4J</description>
-    <date>14/06/2016</date>
-    <author>Dom4J tech writer</author>
-  </tutorial>
-</XMLTutorials>

xml/src/test/resources/example_dom4j_updated.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tutorials>
-	<tutorial tutId="01" type="java">
-		<title>Guava updated</title>
-		<description>Introduction to Guava</description>
-		<date>04/04/2016</date>
-		<author>GuavaAuthor</author>
-	</tutorial>
-	<tutorial tutId="02" type="java">
-		<title>XML updated</title>
-		<description>Introduction to XPath</description>
-		<date>04/05/2016</date>
-		<author>XMLAuthor</author>
-	</tutorial>
-	<tutorial tutId="03" type="android">
-		<title>Android updated</title>
-		<description>Introduction to Android</description>
-		<date>04/03/2016</date>
-		<author>AndroidAuthor</author>
-	</tutorial>
-	<tutorial tutId="04" type="java">
-		<title>Spring updated</title>
-		<description>Introduction to Spring</description>
-		<date>04/02/2016</date>
-		<author>SpringAuthor</author>
-		<sections>
-			<section name="core">Spring Core</section>
-			<section name="mvc">Spring MVC</section>
-			<section name="batch">Spring Batch</section>
-		</sections>
-	</tutorial>
-</tutorials>

xml/src/test/resources/example_jaxb_new.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<tutorials>
-    <tutorial tutId="01" type="XML">
-        <author>Jaxb author</author>
-        <date>04/02/2015</date>
-        <description>XML Binding with Jaxb</description>
-        <title>XML with Jaxb</title>
-    </tutorial>
-</tutorials>