aboutsummaryrefslogtreecommitdiffstats
path: root/aspectjtools
Commit message (Collapse)AuthorAgeFilesLines
* Use dependencies instead of copies under 'lib' for assembliesAlexander Kriegisch2021-04-163-83/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Manage version version maven-assembly-plugin:3.1.1Alexander Kriegisch2021-04-161-5/+1
| | | | | | No more manual version setting everywhere. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Switch from 'libx' to 'lib', delete all obsolete binariesAlexander Kriegisch2021-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | Because 'cd lib && mvn compile' can now download and (un)zip many previously SCM-committed third-party dependencies, the following 'lib' subdirectories have been deleted: - ant - asm - commons - jarjar - junit - regexp - saxon This one is new (but not stored in SCM): - jdtcore-aj For each of them, there now is a .gitignore entry, so as to prevent developers from accidentally committing the downloaded binaries again. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Replace JDT Core system dependency by deployed oneAlexander Kriegisch2021-04-091-2/+2
| | | | | | | | | | Get rid of system paths. Instead, rely on JDT Core Shadows to deploy both binary and source JARs to GitHub Packages. The former module directory was deleted completely. Instead, the JARs are redundantly copied into 'libs/jdtcore-aj' in order to be found there by tests and other Ant scripts. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Bump maven-antrun-plugin from 1.6 to 3.0.0Alexander Kriegisch2021-03-291-7/+7
| | | | | | | | This is not strictly necessary, but probably does not hurt either. While upgrading, '<tasks>' tags have been renamed to the new standard '<target>'. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Unzip dependencies in phase 'prepare-package' before building assembliesAlexander Kriegisch2021-03-281-3/+3
| | | | | | | | Before it was phase 'validate', which was way too early and somewhat annoying and time-consuming when during development we just call validate in order to check if the POMs are valid, as the name implies. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Add link to JDK-8263924 bug ticket to POMs using maven-assembly-pluginAlexander Kriegisch2021-03-221-0/+3
| | | | | | | | This is a follow-up on commit @0b182d60. I have just received confirmation from Oracle that my issue was accepted: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8263924 Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Fix invalid manifests leading to "Could not find or load main class"Alexander Kriegisch2021-03-191-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: Please avoid line breaks in manifest values! They are passed on like this: Assembly Plugin -> Plexus Archiver -> JRE java.util.jar .Manifest.write(OutputStream). The JRE Manifest class inserts hard line breaks always after 72 characters, no matter if those 72 characters contain line feeds, tabs or spaces. Hence, it can happen that unwanted blank lines end up in the middle of a manifest section, making the manifest invalid. Calls like e.g. 'java -cp aspectjtools.jar org.aspectj.tools.ajc.Main' can then fail with the absolutely unexpected error 'Could not find or load main class org.aspectj.tools.ajc.Main'. In IntelliJ IDEA you can deactivate wrapping text inside XML tags like this: "File | Settings | Editor | Code Style | XML | Wrap text -> off" The problem occurs in Maven Assembly in versions higher than 2.2. More exactly, it occurs in Plexus Archiver after in more recent versions it switched to using the JRE Manifest class. TODO 1: Either add a test step in phase 'verify' doing something like this: new Manifest(new FileInputStream("MANIFEST.MF")); This would lead to "IOException: invalid header field (line xy)" in case of an invalid manifest file. TODO 2: Or file a JRE bug at Oracle or OpenJDK, wherever appropriate. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Upgrade to ASM 9.1, delete obsolete ASM binariesAlexander Kriegisch2021-03-161-1/+1
| | | | | | | | | | | Keep only ASM 2.0 binary because it is still used in UnweavableTest which uses an old ASM API, e.g. with a ClassWriter constructor which no longer exists. Also add JarJar 1.3 library because it is needed by an Ant task in lib/asm/build.xml. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Set maven-assembly-plugin version 3.1.1 explicitly for each POM moduleAlexander Kriegisch2021-03-111-8/+11
| | | | | | | | | | | | Background: There are CI tests failing because the version is not taken from the parent POM, even if set in the 'pluginManagement' section. Instead, it is resolved via the Maven Super POM, e.g. 2.2-beta-5, see: https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html That assembly plugin version in turn requires plexus-archiver 1.0-alpha-12. The latter cannot be downloaded from Maven Central, leading to the problems seen during builds. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
* Revert to 1.9.7.BUILD-SNAPSHOTAndy Clement2020-08-211-1/+1
|
* 1.9.7 milestone 1 publishedAndy Clement2020-08-211-1/+1
|
* Rev to 1.9.7.BUILD-SNAPSHOTAndy Clement2020-07-221-1/+1
|
* AspectJ 1.9.6 final bitsV1_9_6Andy Clement2020-07-221-1/+1
|
* Update ASM and fix packaging for matcher artifactAndy Clement2020-07-171-1/+1
|
* Move to 1.9.6.BUILD-SNAPSHOT versionAndy Clement2019-11-281-1/+1
|
* 1.9.5 release versions in pomsV1_9_5Andy Clement2019-11-281-1/+1
|
* Java 13 supportAndy Clement2019-11-251-1/+1
|
* Update to 1.9.5.BUILD-SNAPSHOT in pomsAndy Clement2019-06-031-1/+1
|
* 1.9.4 POMSAndy Clement2019-05-101-1/+1
|
* pushed versions to 1.9.4.BUILD-SNAPSHOTAndy Clement2019-04-171-1/+1
|
* tidyup retired modules and add aspectjtools submoduleAndy Clement2019-02-083-0/+387