aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2020-08-15 22:38:51 -0700
committerGitHub <noreply@github.com>2020-08-15 22:38:51 -0700
commitd93bacd2e16e7ee13bd4c4e48a89ef8646fd0d68 (patch)
treea88365d7c9a13f729e2632b1538e5913303a6b98 /build
parent639f5030e0391e831138f9786cf831c3374449e7 (diff)
parentd5dada81e503e257d20e2aa829716fb5c3934072 (diff)
downloadaspectj-d93bacd2e16e7ee13bd4c4e48a89ef8646fd0d68.tar.gz
aspectj-d93bacd2e16e7ee13bd4c4e48a89ef8646fd0d68.zip
Merge branch 'master' into feature/collection-performance
Diffstat (limited to 'build')
-rw-r--r--build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java1
-rw-r--r--build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java1
-rw-r--r--build/src/main/java/org/aspectj/internal/tools/build/Builder.java1
-rw-r--r--build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java2
-rw-r--r--build/src/test/java/org/aspectj/internal/build/ModulesTest.java1
5 files changed, 0 insertions, 6 deletions
diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
index 809ac1cbb..a67872e8c 100644
--- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
+++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringBufferInputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
index 91506e439..31ed76201 100644
--- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
+++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Builder.java b/build/src/main/java/org/aspectj/internal/tools/build/Builder.java
index fad8b560a..b43578dd3 100644
--- a/build/src/main/java/org/aspectj/internal/tools/build/Builder.java
+++ b/build/src/main/java/org/aspectj/internal/tools/build/Builder.java
@@ -19,7 +19,6 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Properties;
diff --git a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
index 9030bbf77..2864bb92f 100644
--- a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
+++ b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
@@ -32,9 +32,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
/**
* This gathers sample code delimited with [START..END]-SAMPLE
diff --git a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java
index 6273556a5..ce6d77d78 100644
--- a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java
+++ b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java
@@ -18,7 +18,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import junit.framework.TestCase;