diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-04-16 12:14:31 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-04-16 12:14:31 +0700 |
| commit | d35885bc5faef4936aa5c4207da8f9a3a855630a (patch) | |
| tree | 60a0679ccfe0b74e29f118d7c9894dbc1631f391 /aspectjrt | |
| parent | 2f981bdde6263a1ab9f5e26ce202cbd8ed51ca70 (diff) | |
| download | aspectj-d35885bc5faef4936aa5c4207da8f9a3a855630a.tar.gz aspectj-d35885bc5faef4936aa5c4207da8f9a3a855630a.zip | |
Use dependencies instead of copies under 'lib' for assemblies
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>
Diffstat (limited to 'aspectjrt')
| -rw-r--r-- | aspectjrt/aspectjrt-assembly.xml | 4 | ||||
| -rw-r--r-- | aspectjrt/aspectjrt-sources-assembly.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/aspectjrt/aspectjrt-assembly.xml b/aspectjrt/aspectjrt-assembly.xml index d4108da92..5c3e41713 100644 --- a/aspectjrt/aspectjrt-assembly.xml +++ b/aspectjrt/aspectjrt-assembly.xml @@ -1,6 +1,6 @@ -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> <id>aspectjrt</id> diff --git a/aspectjrt/aspectjrt-sources-assembly.xml b/aspectjrt/aspectjrt-sources-assembly.xml index ec393398e..b4c13e2a9 100644 --- a/aspectjrt/aspectjrt-sources-assembly.xml +++ b/aspectjrt/aspectjrt-sources-assembly.xml @@ -1,8 +1,8 @@ -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> - <id>sources</id> +<id>aspectjrt-sources</id> <formats> <format>jar</format> |