diff options
Diffstat (limited to 'aspectjtools')
| -rw-r--r-- | aspectjtools/aspectjtools-assembly.xml | 2 | ||||
| -rw-r--r-- | aspectjtools/pom.xml | 51 |
2 files changed, 51 insertions, 2 deletions
diff --git a/aspectjtools/aspectjtools-assembly.xml b/aspectjtools/aspectjtools-assembly.xml index 9a6777509..004e1048e 100644 --- a/aspectjtools/aspectjtools-assembly.xml +++ b/aspectjtools/aspectjtools-assembly.xml @@ -17,7 +17,7 @@ <useProjectArtifact>false</useProjectArtifact> <includes> <include>org.aspectj:org.eclipse.jdt.core</include> - <include>org.aspectj:asm-renamed</include> + <include>org.ow2.asm:asm</include> </includes> </dependencySet> </dependencySets> diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index 78b8539f5..dae023141 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -84,7 +84,8 @@ <configuration> <classifier>sources</classifier> <!--<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>--> - <includeArtifactIds>org.eclipse.jdt.core,asm-renamed</includeArtifactIds> + <includeGroupIds>org.aspectj,org.ow2.asm</includeGroupIds> + <includeArtifactIds>org.eclipse.jdt.core,asm</includeArtifactIds> <outputDirectory>${project.build.directory}/unzipped-sources</outputDirectory> <!-- Avoid accidentally shading test-scoped dependencies like JUnit --> <includeScope>runtime</includeScope> @@ -174,6 +175,49 @@ </executions> </plugin> + <!-- + Relocate ASM from 'org.objectweb.asm' to 'aj.org.objectweb.asm' + + TODO: Using Maven Shade after Maven Assembly instead of creating uber JAR and relocating package names at the + same time is suboptimal and maybe slower than doing both at the same time. Migrating from Assembly to Shade + requires all dependencies to produce source JARs, though, which currently is not the case. Because we also + want to create a complete source JAR, for now we keep Assembly around, because it manually copies project + sources from their respective directories before zipping them up. + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <createSourcesJar>true</createSourcesJar> + <createDependencyReducedPom>false</createDependencyReducedPom> + <shadedArtifactAttached>false</shadedArtifactAttached> + </configuration> + <executions> + <execution> + <id>asm-relocate</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <minimizeJar>false</minimizeJar> + <shadeSourcesContent>true</shadeSourcesContent> + <artifactSet> + <includes> + <include>${project.groupId}:${project.artifactId}</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>org.objectweb.asm</pattern> + <shadedPattern>aj.org.objectweb.asm</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>truezip-maven-plugin</artifactId> @@ -289,6 +333,10 @@ <version>${project.version}</version> </dependency> <dependency> +<<<<<<< HEAD + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> +======= <groupId>org.aspectj</groupId> <artifactId>util</artifactId> <version>${project.version}</version> @@ -347,6 +395,7 @@ <groupId>org.aspectj</groupId> <artifactId>taskdefs</artifactId> <version>${project.version}</version> +>>>>>>> xander/maven-central-deployment </dependency> </dependencies> |