Avoiding conflict between patches.

Author: lahodaj

build.xml

@@ -31,7 +31,7 @@
     <property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" />
     <property name="nbantext.jar" location="netbeans/nbbuild/build/nbantext.jar" />
     <property name="nb_all" location="netbeans" />
-    <property name="patches" value="patches/6133.diff patches/6330.diff patches/6481.diff patches/6615.diff patches/6631.diff patches/6637.diff patches/6642.diff patches/6649.diff patches/6690.diff patches/6771.diff patches/6329.diff patches/6742.diff patches/6780.diff patches/6834.diff patches/7001.diff patches/upgrade-codec.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
+    <property name="patches" value="patches/6133.diff patches/6330.diff patches/6481.diff patches/6615.diff patches/6631.diff patches/6637.diff patches/6642.diff patches/6649.diff patches/6690.diff patches/6771.diff patches/6329.diff patches/6742.diff patches/6780.diff patches/6834.diff patches/upgrade-codec.diff patches/7001.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
     <condition property="cmd.suffix" value=".cmd" else="">
         <os family="windows"/>
     </condition>

patches/7001.diff

@@ -304,10 +304,7 @@ diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbu
 index eb4b13b21b..09df2c1194 100644
 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
 +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
-@@ -25,7 +25,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav
- # bundled maven conflicts with other libraries
- java/maven.embedder/external/apache-maven-3.9.5-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar
- java/maven.embedder/external/apache-maven-3.9.5-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar
+@@ -28,4 +28,4 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav
 -java/maven.embedder/external/apache-maven-3.9.5-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar
 +java/maven.embedder/external/failureaccess-1.0.2.jar ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar