From d8d00ba41b762e4a0c0741234ce3eae1e4e790a6 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Sat, 20 Oct 2018 09:01:30 +0200
Subject: [PATCH] Update dependencies, fix packaging

---
 src/etc/poms/ant-apache-oro/pom.xml |  6 ----
 src/etc/poms/ant/pom.xml            | 54 ++++++++++++-----------------
 src/etc/poms/pom.xml                | 16 ++++++---
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml
index 14c079865..0147b2df3 100644
--- a/src/etc/poms/ant-apache-oro/pom.xml
+++ b/src/etc/poms/ant-apache-oro/pom.xml
@@ -48,12 +48,6 @@
       <version>2.0.8</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 84be0cb0a..b35714a9a 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -42,22 +42,10 @@
       <version>1.10.6-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-antunit</artifactId>
-      <version>1.3</version>
+      <version>1.4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -120,37 +108,37 @@
         <configuration>
           <excludes>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/launch/</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/xz/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/script/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/xz/</exclude>
             <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+            <exclude>org/apache/tools/ant/types/optional/image/</exclude>
+            <exclude>org/apache/tools/ant/types/optional/imageio/</exclude>
+            <exclude>org/apache/tools/ant/types/optional/xz/</exclude>
+            <exclude>org/apache/tools/ant/types/resolver/</exclude>
             <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
+            <exclude>org/apache/tools/ant/util/depend/bcel/</exclude>
             <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
           </excludes>
           <testExcludes>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/launch/</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
@@ -158,12 +146,13 @@
             <exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
+            <exclude>org/apache/tools/ant/types/resolver/</exclude>
             <exclude>org/apache/tools/ant/util/Script*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
+            <exclude>org/example/junitlauncher/</exclude>
           </testExcludes>
         </configuration>
       </plugin>
@@ -202,9 +191,10 @@
         <directory>../../../../src/main</directory>
         <filtering>true</filtering>
         <includes>
-          <include>org/apache/tools/ant/taskdefs/default.properties</include>
-          <include>org/apache/tools/ant/types/default.properties</include>
-          <include>org/apache/tools/ant/taskdefs/default.properties</include>
+          <include>org/apache/tools/ant/listener/defaults.properties</include>
+          <include>org/apache/tools/ant/taskdefs/defaults.properties</include>
+          <include>org/apache/tools/ant/types/defaults.properties</include>
+          <include>org/apache/tools/ant/antlib.xml</include>
           <include>org/apache/tools/ant/types/conditions/antlib.xml</include>
           <include>org/apache/tools/ant/defaultManifest.mf</include>
           <include>org/apache/tools/ant/version.txt</include>
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 17986926a..7595492ea 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -57,8 +57,8 @@
     <url>https://git-wip-us.apache.org/repos/asf/ant.git</url>
   </scm>
   <ciManagement>
-    <system>hudson</system>
-    <url>https://builds.apache.org/job/Ant_BuildFromPOMs/</url>
+    <system>jenkins</system>
+    <url>https://builds.apache.org/job/Ant-Build-from-POMs/</url>
   </ciManagement>
   <mailingLists>
     <mailingList>
@@ -114,6 +114,12 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>../../../src/main</sourceDirectory>
@@ -125,7 +131,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -139,12 +145,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.21.0</version>
+          <version>2.22.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.21.0</version>
+          <version>2.22.1</version>
         </plugin>
       </plugins>
     </pluginManagement>