From b69cf245b1904e86434a431546ed6fc8baa6a23e Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 21 Jul 2018 18:54:51 +0530
Subject: [PATCH 1/2] [BAEL-7635] Removed test generated files : Will be
 gitignored

---
 xml/src/test/resources/example_dom4j_new.xml  | 10 ------
 .../test/resources/example_dom4j_updated.xml  | 32 -------------------
 xml/src/test/resources/example_jaxb_new.xml   |  9 ------
 3 files changed, 51 deletions(-)
 delete mode 100644 xml/src/test/resources/example_dom4j_new.xml
 delete mode 100755 xml/src/test/resources/example_dom4j_updated.xml
 delete mode 100644 xml/src/test/resources/example_jaxb_new.xml

diff --git a/xml/src/test/resources/example_dom4j_new.xml b/xml/src/test/resources/example_dom4j_new.xml
deleted file mode 100644
index 020760fdd3..0000000000
--- a/xml/src/test/resources/example_dom4j_new.xml
+++ /dev/null
@@ -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>
diff --git a/xml/src/test/resources/example_dom4j_updated.xml b/xml/src/test/resources/example_dom4j_updated.xml
deleted file mode 100755
index 962ca0c889..0000000000
--- a/xml/src/test/resources/example_dom4j_updated.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/xml/src/test/resources/example_jaxb_new.xml b/xml/src/test/resources/example_jaxb_new.xml
deleted file mode 100644
index 646d938869..0000000000
--- a/xml/src/test/resources/example_jaxb_new.xml
+++ /dev/null
@@ -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>

From fadeda2fc9a522727194b411450dc8a893d5c543 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 21 Jul 2018 19:41:03 +0530
Subject: [PATCH 2/2] [BAEL-7635] - Commented out sortpom-maven-plugin that
 changes pom.xml in every build, added new entries in .gitignore

---
 .gitignore                           | 9 +++++++++
 jhipster/jhipster-monolithic/pom.xml | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e78c1e7e24..a0a519c8cb 100644
--- a/.gitignore
+++ b/.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
\ No newline at end of file
diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml
index 0536f80ada..8b753f6f93 100644
--- a/jhipster/jhipster-monolithic/pom.xml
+++ b/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>