Replace JDiff by regular Maven dependency from GitHub Packages

One less SCM-committed binary, one less system-scoped dependency.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

6 files changed, 29 insertions, 49 deletions

diff --git a/lib/jdiff/jdiff.jar b/lib/jdiff/jdiff.jar
deleted file mode 100644
index 792e2c532..000000000
--- a/lib/jdiff/jdiff.jar
+++ /dev/null
diff --git a/lib/jdiff/jdiffReadme.txt b/lib/jdiff/jdiffReadme.txt
deleted file mode 100644
index bca69422f..000000000
--- a/lib/jdiff/jdiffReadme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The jdiff library is a component from the JDiffPlugin by Andre Kaplan
-available from http://plugins.jedit.org/plugins/JDiffPlugin under the GPL.
diff --git a/libx/pom.xml b/libx/pom.xml
index 463f01716..8670f1a08 100644
--- a/libx/pom.xml
+++ b/libx/pom.xml
@@ -136,28 +136,12 @@
               <sha1>c61a373f6d50ff8fcfba900934f7254d44f9735b</sha1>
             </configuration>
           </execution>
+          <!--
+            Obsolete because we uploaded both binary and source JARs to GitHub Packages, so we can use JDiff as a
+            normal dependency. Keep this for reference, so we can remember where we found it.
+          -->
+          <!--
           <execution>
-            <!--
-              Binary jdiff:jdiff:1.0.9 is available on Maven Central, but different from committed version.
-              There are API changes, some classes referenced in org.aspectj.testing.util.TestUtil are unavailable.
-              Therefore, we would have to try and port the existing functionality, making sure the tests still
-              run.
-
-              Downloading snapshot from
-              https://sourceforge.net/p/jedit/svn/24818/tree/plugins/JDiffPlugin/tags/jdiffplugin-1_2_2/jdiff/
-              produces exactly identical source files as in the committed JAR. But there is no corresponding Maven
-              artifact or even binary download package. We would have to compile the code within AspectJ and
-              deploy it locally or Sonatype (Maven Central) or maven.springframework.org.
-
-              Downloading source or binary packages from
-              https://sourceforge.net/projects/jedit-plugins/files/JDiffPlugin/1.3/
-              also has identical source files (except for tiny copyright changes), but contains more classes
-              (a superset of the committed ones). Again, there is no Maven artifact for it.
-
-              Another option would be to include the only 4 Java classes into the 'testing-util' source tree. They
-              are only used from there and could easily be compiled together with the module, package names
-              relocated or not.
-            -->
             <id>download-jdiff</id>
             <phase>generate-resources</phase>
             <goals>
@@ -170,6 +154,7 @@
               <sha1>eba63fd845203c6b245fbcb81c0de8e2c83d16c7</sha1>
             </configuration>
           </execution>
+          -->
         </executions>
       </plugin>
 
@@ -553,6 +538,24 @@
               </fileset>
             </configuration>
           </execution>
+          <!--
+            Obsolete because we uploaded both binary and source JARs to GitHub Packages, so we can use JDiff as a normal
+            dependency. Keep this for reference, so we can remember how we built it. After download + zip the deployment
+            was made right from the libx/jdiff directory, using the following commands (without the line breaks):
+
+            mvn -Dfile=jdiff.jar -DrepositoryId=github -Durl=https://maven.pkg.github.com/kriegaex/aspectj-packages
+              -DgroupId=jdiff -DartifactId=jdiff -Dpackaging=jar -Dversion=1.3
+              deploy:deploy-file
+
+            mvn -Dfile=jdiff-src.zip -DrepositoryId=github -Durl=https://maven.pkg.github.com/kriegaex/aspectj-packages
+              -DgroupId=jdiff -DartifactId=jdiff -Dpackaging=jar -Dversion=1.3
+              -Dtypes=java-source -Dclassifier=sources
+              deploy:deploy-file
+
+            The second command yields an error, trying to re-upload a POM, but that is no problem because the POM would
+            be identical to the one already uploaded with the first command.
+          -->
+          <!--
           <execution>
             <id>zip-jdiff-binaries</id>
             <phase>process-resources</phase>
@@ -562,10 +565,6 @@
             <configuration>
               <verbose>true</verbose>
               <fileset>
-                <!--
-                  This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
-                  were normal file system paths. No additional moves and deletes with Antrun are necessary.
-                -->
                 <directory>jdiff/JDiffPlugin-1.3.zip/JDiffPlugin.jar</directory>
                 <outputDirectory>jdiff/jdiff.jar</outputDirectory>
                 <includes>
@@ -587,10 +586,6 @@
             <configuration>
               <verbose>true</verbose>
               <fileset>
-                <!--
-                  This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
-                  were normal file system paths. No additional moves and deletes with Antrun are necessary.
-                -->
                 <directory>jdiff/JDiffPlugin-1.3.zip/JDiffPlugin</directory>
                 <outputDirectory>jdiff/jdiff-src.zip</outputDirectory>
                 <includes>
@@ -603,6 +598,7 @@
               </fileset>
             </configuration>
           </execution>
+          -->
         </executions>
       </plugin>
 
@@ -625,7 +621,8 @@
                     <include>asm/**</include>
                     <include>commons/**</include>
                     <include>jarjar/**</include>
-                    <include>jdiff/**</include>
+                    <!-- Obsolete because JDiff is on GitHub Packages now. Keep for reference. -->
+                    <!--<include>jdiff/**</include>-->
                     <include>jdtcore-aj/**</include>
                     <include>junit/**</include>
                     <include>regexp/**</include>
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index f2613d996..a2d8aa604 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -247,13 +247,6 @@
 			<systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
 		</dependency>
 		<dependency>
-			<groupId>jdiff</groupId>
-			<artifactId>jdiff</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath>
-		</dependency>
-		<dependency>
 			<!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->
 			<groupId>ant</groupId>
 			<artifactId>ant-launcher</artifactId>
diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index 8e5262fd6..1b8da6666 100644
--- a/testing-util/pom.xml
+++ b/testing-util/pom.xml
@@ -37,11 +37,10 @@
       <version>4.13</version>
     </dependency>
     <dependency>
+      <!-- Identical to lib/jdiff/jdiff.jar, a former system-scoped dependency. Now to be found on GitHub Packages. -->
       <groupId>jdiff</groupId>
       <artifactId>jdiff</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath>
+      <version>1.3</version>
     </dependency>
   </dependencies>
 
diff --git a/testing/pom.xml b/testing/pom.xml
index 660dec41f..0f1089e1f 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -85,13 +85,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>jdiff</groupId>
-      <artifactId>jdiff</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath>
-    </dependency>
-    <dependency>
       <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>