diff options
Diffstat (limited to 'aspectjweaver')
| -rw-r--r-- | aspectjweaver/aspectjweaver-assembly.xml | 26 | ||||
| -rw-r--r-- | aspectjweaver/aspectjweaver-sources-assembly.xml | 11 | ||||
| -rw-r--r-- | aspectjweaver/pom.xml | 46 |
3 files changed, 42 insertions, 41 deletions
diff --git a/aspectjweaver/aspectjweaver-assembly.xml b/aspectjweaver/aspectjweaver-assembly.xml index af08bc45c..4130c3c32 100644 --- a/aspectjweaver/aspectjweaver-assembly.xml +++ b/aspectjweaver/aspectjweaver-assembly.xml @@ -1,15 +1,24 @@ -<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>aspectjweaver</id> - + <formats> <format>jar</format> </formats> - + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <unpack>true</unpack> + <includes> + <include>org.aspectj:asm-renamed</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> <directory>../weaver/target/classes</directory> @@ -67,15 +76,6 @@ <exclude>META-INF/maven/**</exclude> </excludes> </fileSet> - <fileSet> - <directory>target/asm-unzipped</directory> - <outputDirectory>.</outputDirectory> - <excludes> - <exclude>META-INF/maven/**</exclude> - <exclude>org/**</exclude> - <exclude>META-INF/MANIFEST.MF</exclude> - </excludes> - </fileSet> </fileSets> </assembly> diff --git a/aspectjweaver/aspectjweaver-sources-assembly.xml b/aspectjweaver/aspectjweaver-sources-assembly.xml index 17e112d39..e1760dfe5 100644 --- a/aspectjweaver/aspectjweaver-sources-assembly.xml +++ b/aspectjweaver/aspectjweaver-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>aspectjweaver-sources</id> <formats> <format>jar</format> @@ -43,12 +43,11 @@ <directory>../loadtime/src/main/java</directory> <outputDirectory>.</outputDirectory> </fileSet> - <!-- + <!-- Dependencies --> <fileSet> - <directory>target/asm-unzipped</directory> + <directory>target/unzipped-sources</directory> <outputDirectory>.</outputDirectory> </fileSet> - --> </fileSets> </assembly> diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index da4b3b233..921401691 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -14,14 +14,6 @@ <packaging>pom</packaging> <name>AspectJ Weaver</name> - <dependencies> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>weaver</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> <plugins> @@ -37,26 +29,24 @@ </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>unzipasm</id> + <id>unzip-dependency-sources</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> <phase>prepare-package</phase> <configuration> - <target> - <echo message="unzip jarjar'd asm" /> - <unzip - src="${project.basedir}/../lib/asm/asm-9.1.renamed.jar" - dest="target/asm-unzipped" /> - </target> + <classifier>sources</classifier> + <!--<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>--> + <includeArtifactIds>asm-renamed</includeArtifactIds> + <outputDirectory>${project.build.directory}/unzipped-sources</outputDirectory> + <!-- Avoid accidentally shading test-scoped dependencies like JUnit --> + <includeScope>runtime</includeScope> </configuration> - <goals> - <goal>run</goal> - </goals> </execution> </executions> </plugin> @@ -82,7 +72,6 @@ <Can-Redefine-Classes>true</Can-Redefine-Classes> </manifestEntries> - <manifestSections> <manifestSection> <name>org/aspectj/weaver/</name> @@ -148,4 +137,17 @@ </plugins> </build> + + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>weaver</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>asm-renamed</artifactId> + </dependency> + </dependencies> + </project> |