diff options
| -rw-r--r-- | aspectjmatcher/pom.xml | 32 | ||||
| -rw-r--r-- | aspectjrt/pom.xml | 32 | ||||
| -rw-r--r-- | aspectjtools/aspectjtools-assembly.xml | 2 | ||||
| -rw-r--r-- | aspectjtools/pom.xml | 32 | ||||
| -rw-r--r-- | aspectjweaver/aspectjweaver-assembly.xml | 2 | ||||
| -rw-r--r-- | aspectjweaver/pom.xml | 32 | ||||
| -rw-r--r-- | installer/pom.xml | 34 | ||||
| -rw-r--r-- | pom.xml | 5 |
8 files changed, 161 insertions, 10 deletions
diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index b183bd3d6..c398420af 100644 --- a/aspectjmatcher/pom.xml +++ b/aspectjmatcher/pom.xml @@ -11,18 +11,21 @@ </parent> <artifactId>aspectjmatcher</artifactId> - <packaging>pom</packaging> <name>AspectJ Matcher</name> <build> <plugins> - <!-- skip creation of test-jar in here --> + <!-- Skip creation of main + test JARs --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + <execution> <id>test-jar</id> <phase>none</phase> </execution> @@ -116,6 +119,31 @@ </executions> </plugin> + <!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <!-- Remove dependencies declared in this POM (if any) from uber JAR and strip down POM --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>oss</flattenMode> + <pomElements> + <dependencies>remove</dependencies> + <repositories>remove</repositories> + </pomElements> + <outputDirectory>${project.build.directory}</outputDirectory> + <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index 930ba02ca..5e41a1558 100644 --- a/aspectjrt/pom.xml +++ b/aspectjrt/pom.xml @@ -11,7 +11,6 @@ </parent> <artifactId>aspectjrt</artifactId> - <packaging>pom</packaging> <name>AspectJ Runtime</name> <dependencies> @@ -25,12 +24,16 @@ <build> <plugins> - <!-- skip creation of test-jar in here --> + <!-- Skip creation of main + test JARs --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + <execution> <id>test-jar</id> <phase>none</phase> </execution> @@ -118,6 +121,31 @@ </executions> </plugin> + <!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <!-- Remove dependencies declared in this POM (if any) from uber JAR and strip down POM --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>oss</flattenMode> + <pomElements> + <dependencies>remove</dependencies> + <repositories>remove</repositories> + </pomElements> + <outputDirectory>${project.build.directory}</outputDirectory> + <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/aspectjtools/aspectjtools-assembly.xml b/aspectjtools/aspectjtools-assembly.xml index fbf45c808..9a6777509 100644 --- a/aspectjtools/aspectjtools-assembly.xml +++ b/aspectjtools/aspectjtools-assembly.xml @@ -13,6 +13,8 @@ <dependencySets> <dependencySet> <unpack>true</unpack> + <!-- Avoid warning when trying to add non-existing main artifact JAR --> + <useProjectArtifact>false</useProjectArtifact> <includes> <include>org.aspectj:org.eclipse.jdt.core</include> <include>org.aspectj:asm-renamed</include> diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index 62cf15ebf..7860f3a5a 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -11,18 +11,21 @@ </parent> <artifactId>aspectjtools</artifactId> - <packaging>pom</packaging> <name>AspectJ Compiler</name> <build> <plugins> - <!-- skip creation of test-jar in here --> + <!-- Skip creation of main + test JARs --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + <execution> <id>test-jar</id> <phase>none</phase> </execution> @@ -132,6 +135,31 @@ </executions> </plugin> + <!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <!-- Remove dependencies declared in this POM (if any) from uber JAR and strip down POM --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>oss</flattenMode> + <pomElements> + <dependencies>remove</dependencies> + <repositories>remove</repositories> + </pomElements> + <outputDirectory>${project.build.directory}</outputDirectory> + <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/aspectjweaver/aspectjweaver-assembly.xml b/aspectjweaver/aspectjweaver-assembly.xml index 4130c3c32..332504316 100644 --- a/aspectjweaver/aspectjweaver-assembly.xml +++ b/aspectjweaver/aspectjweaver-assembly.xml @@ -13,6 +13,8 @@ <dependencySets> <dependencySet> <unpack>true</unpack> + <!-- Avoid warning when trying to add non-existing main artifact JAR --> + <useProjectArtifact>false</useProjectArtifact> <includes> <include>org.aspectj:asm-renamed</include> </includes> diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index 3552ab630..69952e3b4 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -11,18 +11,21 @@ </parent> <artifactId>aspectjweaver</artifactId> - <packaging>pom</packaging> <name>AspectJ Weaver</name> <build> <plugins> - <!-- skip creation of test-jar in here --> + <!-- Skip creation of main + test JARs --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + <execution> <id>test-jar</id> <phase>none</phase> </execution> @@ -135,6 +138,31 @@ </executions> </plugin> + <!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <!-- Remove dependencies declared in this POM (if any) from uber JAR and strip down POM --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>oss</flattenMode> + <pomElements> + <dependencies>remove</dependencies> + <repositories>remove</repositories> + </pomElements> + <outputDirectory>${project.build.directory}</outputDirectory> + <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/installer/pom.xml b/installer/pom.xml index 977fa1d12..d8ada07d5 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -11,7 +11,6 @@ </parent> <artifactId>installer</artifactId> - <packaging>pom</packaging> <name>AspectJ Installer</name> <dependencies> @@ -24,12 +23,17 @@ <build> <plugins> - <!-- skip creation of test-jar in here --> + + <!-- Skip creation of main + test JARs --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + <execution> <id>test-jar</id> <phase>none</phase> </execution> @@ -61,6 +65,32 @@ </execution> </executions> </plugin> + + <!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <executions> + <!-- Remove dependencies declared in this POM (if any) from uber JAR and strip down POM --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <flattenMode>oss</flattenMode> + <pomElements> + <dependencies>remove</dependencies> + <repositories>remove</repositories> + </pomElements> + <outputDirectory>${project.build.directory}</outputDirectory> + <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> @@ -216,6 +216,11 @@ <artifactId>maven-assembly-plugin</artifactId> <version>3.1.1</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.2.2</version> + </plugin> </plugins> </pluginManagement> |