From aa5cca76189b143f0f2f0bc521cdae9283bdf7ee Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 22 Aug 2023 20:01:13 +0000
Subject: [PATCH] fix: ant-contrib/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEIVY-5847858
---
 ant-contrib/pom.xml | 590 ++++++++++++++++++++++----------------------
 1 file changed, 295 insertions(+), 295 deletions(-)

diff --git a/ant-contrib/pom.xml b/ant-contrib/pom.xml
index aa6a4f4..f068106 100644
--- a/ant-contrib/pom.xml
+++ b/ant-contrib/pom.xml
@@ -1,297 +1,297 @@
-<!-- Licensed to the Ant-Contrib Project under one or more contributor license
-	agreements. See the NOTICE file distributed with this work for additional
-	information regarding copyright ownership. The Ant-Contrib Project licenses
-	this file to You under the Apache License, Version 2.0 (the "License"); you
-	may not use this file except in compliance with the License. You may obtain
-	a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
-	required by applicable law or agreed to in writing, software distributed
-	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-	OR CONDITIONS OF ANY KIND, either express or implied. See the License for
-	the specific language governing permissions and limitations under the License. -->
+<!-- Licensed to the Ant-Contrib Project under one or more contributor license
+	agreements. See the NOTICE file distributed with this work for additional
+	information regarding copyright ownership. The Ant-Contrib Project licenses
+	this file to You under the Apache License, Version 2.0 (the "License"); you
+	may not use this file except in compliance with the License. You may obtain
+	a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+	required by applicable law or agreed to in writing, software distributed
+	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+	OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+	the specific language governing permissions and limitations under the License. -->
 <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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>ant-contrib</groupId>
-	<artifactId>ant-contrib</artifactId>
-	<packaging>jar</packaging>
-	<name>ant-contrib</name>
-	<version>1.0b6-SNAPSHOT</version>
-	<description>Ant-contrib tasks for Apache Ant</description>
-	<url>http://ant-contrib.sourceforge.net:80</url>
-	<issueManagement>
-		<system>SourceForge Tracker</system>
-		<url>http://sourceforge.net/tracker/?group_id=36177/</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Gump</system>
-		<url>http://vmgump.apache.org/gump/public/ant-contrib/index.html</url>
-	</ciManagement>
-	<inceptionYear>2001</inceptionYear>
-	<mailingLists>
-		<mailingList>
-			<name>ant-contrib-cvs</name>
-			<subscribe>https://lists.sourceforge.net/lists/listinfo/ant-contrib-cvs</subscribe>
-			<unsubscribe>https://lists.sourceforge.net/lists/listinfo/ant-contrib-cvs</unsubscribe>
-			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=ant-contrib-cvs</archive>
-		</mailingList>
-		<mailingList>
-			<name>ant-contrib-developers</name>
-			<subscribe>http://lists.sourceforge.net/mailman/listinfo/ant-contrib-developers</subscribe>
-			<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/ant-contrib-developers</unsubscribe>
-			<post>ant-contrib-developers@lists.sourceforge.net</post>
-			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=ant-contrib-developers</archive>
-		</mailingList>
-	</mailingLists>
-	<organization>
-		<name>Ant-Contrib Project</name>
-		<url>http://ant-contrib.sourceforge.net</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://ant-contrib.svn.sourceforge.net/svnroot/ant-contrib/ant-contrib/trunk</connection>
-		<developerConnection>scm:svn:https://ant-contrib.svn.sourceforge.net/svnroot/ant-contrib/ant-contrib/trunk</developerConnection>
-		<url>http://ant-contrib.svn.sourceforge.net/viewvc/ant-contrib/ant-contrib/trunk/</url>
-	</scm>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<reportFormat>plain</reportFormat>
-					<!-- TODO: figure why these are failing -->
-					<excludes>
-						<exclude>**/IfTaskTest.java</exclude>
-						<exclude>**/OutOfDateTest.java</exclude>
-						<exclude>**/PropertySelectorTest.java</exclude>
-						<exclude>**/AntclipseTest.java</exclude>
-						<exclude>**/AntServerTest.java</exclude>
-						<exclude>**/VerifyDesignTest.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestSections>
-							<manifestSection>
-								<name>net.sf.antcontrib.cpptasks</name>
-								<manifestEntries>
-									<Implementation-Title>Ant-contrib Tasks for Apache Ant.</Implementation-Title>
-									<Implementation-Version>${project.version}</Implementation-Version>
-									<Implementation-Vendor>Ant-Contrib Project</Implementation-Vendor>
-								</manifestEntries>
-							</manifestSection>
-						</manifestSections>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<!-- release builds will put SVN tags into the SCM page, this changes
-						it back to a branch -->
-					<execution>
-						<phase>pre-site</phase>
-						<id>pre-site</id>
-						<configuration>
-							<tasks>
-								<mkdir dir="target/taskdocs-classes"/>
-								<javac srcdir="src/taskdocs/java" destdir="target/taskdocs-classes" debug="true"/>
-								<mkdir dir="src/site/xdoc/antdocs"/>
-								<javadoc sourcepath="src/main/java" doclet="net.sf.antcontrib.taskdocs.TaskDoclet" docletPath="target/taskdocs-classes" classpath="${user.home}/.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar">
-									<fileset dir="src/main/java" includes="**/*.java"/>
-								</javadoc>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<phase>site</phase>
-						<id>untag-site</id>
-						<configuration>
-							<tasks>
-								<taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"/>
-								<replaceregexp file="target/site/source-repository.html" match="/tags/[^ ]*" replace="/trunk" flags="g"/>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/bin.xml</descriptor>
-					</descriptors>
-					<appendAssemblyId>false</appendAssemblyId>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>assembly</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>clirr-maven-plugin</artifactId>
-				<configuration>
-					<comparisonVersion>1.0b3</comparisonVersion>
-				</configuration>
-			</plugin>
-		</plugins>
-		<testSourceDirectory>test/src</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>test/resources</directory>
-			</testResource>
-		</testResources>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.10.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant-launcher</artifactId>
-			<version>1.9.5</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>bcel</groupId>
-			<artifactId>bcel</artifactId>
-			<version>5.1</version>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.12.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- could not find a copy of Ivy in M2's repository, download http://www.jayasoft.org/downloads/ivy/1.4.1/ivy-1.4.1.jar
-			and then mvn install:install-file -DgroupId=jayasoft -DartifactId=ivy -Dpackaging=jar
-			-Dversion=1.4.1 -Dfile=ivy-1.4.1.jar -->
-		<dependency>
-			<groupId>org.jvnet.hudson</groupId>
-			<artifactId>ivy</artifactId>
-			<version>1.4.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ivy</groupId>
-			<artifactId>ivy</artifactId>
-			<version>2.5.1</version>
-		</dependency>
-	</dependencies>
-	<reporting>
-		<excludeDefaults>true</excludeDefaults>
-		<plugins>
-			<plugin>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>scm</report>
-							<report>cim</report>
-							<report>javadoc</report>
-							<report>issue-tracking</report>
-							<report>mailing-list</report>
-							<report>license</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<goals>site-deploy</goals>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-changes-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>changes-report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-				<configuration>
-					<issueLinkTemplate>http://sourceforge.net/tracker/index.php?func=detail&amp;aid=%ISSUE%&amp;group_id=36177&amp;atid=416920</issueLinkTemplate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
-	<distributionManagement>
-		<repository>
-			<id>ant-contrib.repo</id>
-			<url>scp://shell.sourceforge.net/home/groups/a/an/ant-contrib/htdocs/m2-repo</url>
-		</repository>
-		<site>
-			<id>cpptasks.site</id>
-			<url>scp://shell.sourceforge.net/home/groups/a/an/ant-contrib/htdocs</url>
-		</site>
-	</distributionManagement>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>ant-contrib</groupId>
+	<artifactId>ant-contrib</artifactId>
+	<packaging>jar</packaging>
+	<name>ant-contrib</name>
+	<version>1.0b6-SNAPSHOT</version>
+	<description>Ant-contrib tasks for Apache Ant</description>
+	<url>http://ant-contrib.sourceforge.net:80</url>
+	<issueManagement>
+		<system>SourceForge Tracker</system>
+		<url>http://sourceforge.net/tracker/?group_id=36177/</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Gump</system>
+		<url>http://vmgump.apache.org/gump/public/ant-contrib/index.html</url>
+	</ciManagement>
+	<inceptionYear>2001</inceptionYear>
+	<mailingLists>
+		<mailingList>
+			<name>ant-contrib-cvs</name>
+			<subscribe>https://lists.sourceforge.net/lists/listinfo/ant-contrib-cvs</subscribe>
+			<unsubscribe>https://lists.sourceforge.net/lists/listinfo/ant-contrib-cvs</unsubscribe>
+			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=ant-contrib-cvs</archive>
+		</mailingList>
+		<mailingList>
+			<name>ant-contrib-developers</name>
+			<subscribe>http://lists.sourceforge.net/mailman/listinfo/ant-contrib-developers</subscribe>
+			<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/ant-contrib-developers</unsubscribe>
+			<post>ant-contrib-developers@lists.sourceforge.net</post>
+			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=ant-contrib-developers</archive>
+		</mailingList>
+	</mailingLists>
+	<organization>
+		<name>Ant-Contrib Project</name>
+		<url>http://ant-contrib.sourceforge.net</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:https://ant-contrib.svn.sourceforge.net/svnroot/ant-contrib/ant-contrib/trunk</connection>
+		<developerConnection>scm:svn:https://ant-contrib.svn.sourceforge.net/svnroot/ant-contrib/ant-contrib/trunk</developerConnection>
+		<url>http://ant-contrib.svn.sourceforge.net/viewvc/ant-contrib/ant-contrib/trunk/</url>
+	</scm>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<reportFormat>plain</reportFormat>
+					<!-- TODO: figure why these are failing -->
+					<excludes>
+						<exclude>**/IfTaskTest.java</exclude>
+						<exclude>**/OutOfDateTest.java</exclude>
+						<exclude>**/PropertySelectorTest.java</exclude>
+						<exclude>**/AntclipseTest.java</exclude>
+						<exclude>**/AntServerTest.java</exclude>
+						<exclude>**/VerifyDesignTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestSections>
+							<manifestSection>
+								<name>net.sf.antcontrib.cpptasks</name>
+								<manifestEntries>
+									<Implementation-Title>Ant-contrib Tasks for Apache Ant.</Implementation-Title>
+									<Implementation-Version>${project.version}</Implementation-Version>
+									<Implementation-Vendor>Ant-Contrib Project</Implementation-Vendor>
+								</manifestEntries>
+							</manifestSection>
+						</manifestSections>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<!-- release builds will put SVN tags into the SCM page, this changes
+						it back to a branch -->
+					<execution>
+						<phase>pre-site</phase>
+						<id>pre-site</id>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/taskdocs-classes"/>
+								<javac srcdir="src/taskdocs/java" destdir="target/taskdocs-classes" debug="true"/>
+								<mkdir dir="src/site/xdoc/antdocs"/>
+								<javadoc sourcepath="src/main/java" doclet="net.sf.antcontrib.taskdocs.TaskDoclet" docletPath="target/taskdocs-classes" classpath="${user.home}/.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar">
+									<fileset dir="src/main/java" includes="**/*.java"/>
+								</javadoc>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+						<phase>site</phase>
+						<id>untag-site</id>
+						<configuration>
+							<tasks>
+								<taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"/>
+								<replaceregexp file="target/site/source-repository.html" match="/tags/[^ ]*" replace="/trunk" flags="g"/>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-nodeps</artifactId>
+						<version>1.6.5</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/bin.xml</descriptor>
+					</descriptors>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>assembly</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>clirr-maven-plugin</artifactId>
+				<configuration>
+					<comparisonVersion>1.0b3</comparisonVersion>
+				</configuration>
+			</plugin>
+		</plugins>
+		<testSourceDirectory>test/src</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>test/resources</directory>
+			</testResource>
+		</testResources>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.10.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant-launcher</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>bcel</groupId>
+			<artifactId>bcel</artifactId>
+			<version>5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.12.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- could not find a copy of Ivy in M2's repository, download http://www.jayasoft.org/downloads/ivy/1.4.1/ivy-1.4.1.jar
+			and then mvn install:install-file -DgroupId=jayasoft -DartifactId=ivy -Dpackaging=jar
+			-Dversion=1.4.1 -Dfile=ivy-1.4.1.jar -->
+		<dependency>
+			<groupId>org.jvnet.hudson</groupId>
+			<artifactId>ivy</artifactId>
+			<version>1.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ivy</groupId>
+			<artifactId>ivy</artifactId>
+			<version>2.5.2</version>
+		</dependency>
+	</dependencies>
+	<reporting>
+		<excludeDefaults>true</excludeDefaults>
+		<plugins>
+			<plugin>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>scm</report>
+							<report>cim</report>
+							<report>javadoc</report>
+							<report>issue-tracking</report>
+							<report>mailing-list</report>
+							<report>license</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<artifactId>maven-release-plugin</artifactId>
+				<configuration>
+					<goals>site-deploy</goals>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-changes-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>changes-report</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+				<configuration>
+					<issueLinkTemplate>http://sourceforge.net/tracker/index.php?func=detail&amp;aid=%ISSUE%&amp;group_id=36177&amp;atid=416920</issueLinkTemplate>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+	<distributionManagement>
+		<repository>
+			<id>ant-contrib.repo</id>
+			<url>scp://shell.sourceforge.net/home/groups/a/an/ant-contrib/htdocs/m2-repo</url>
+		</repository>
+		<site>
+			<id>cpptasks.site</id>
+			<url>scp://shell.sourceforge.net/home/groups/a/an/ant-contrib/htdocs</url>
+		</site>
+	</distributionManagement>
 </project>