Sfoglia il codice sorgente

Set maven-assembly-plugin version 3.1.1 explicitly for each POM module

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>
tags/java16-add-opens
Alexander Kriegisch 3 anni fa
parent
commit
ee5274fa7e
6 ha cambiato i file con 40 aggiunte e 21 eliminazioni
  1. 8
    3
      aspectjmatcher/pom.xml
  2. 6
    1
      aspectjrt/pom.xml
  3. 11
    8
      aspectjtools/pom.xml
  4. 8
    3
      aspectjweaver/pom.xml
  5. 7
    2
      installer/pom.xml
  6. 0
    4
      pom.xml

+ 8
- 3
aspectjmatcher/pom.xml Vedi File

@@ -24,12 +24,12 @@
<executions>
<execution>
<id>test-jar</id>
<phase></phase>
<phase>none</phase>
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,6 +57,11 @@

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!--
Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
-->
<version>3.1.1</version>
<executions>
<execution>
<id>aspectjmatcher-assembly</id>

+ 6
- 1
aspectjrt/pom.xml Vedi File

@@ -32,13 +32,18 @@
<executions>
<execution>
<id>test-jar</id>
<phase></phase>
<phase>none</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!--
Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
-->
<version>3.1.1</version>
<executions>
<execution>
<id>aspectjrt-assembly</id>

+ 11
- 8
aspectjtools/pom.xml Vedi File

@@ -32,12 +32,12 @@
<executions>
<execution>
<id>test-jar</id>
<phase></phase>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -58,7 +58,7 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>unzipjdt</id>
<phase>validate</phase>
@@ -74,7 +74,7 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>unzipjdtsrc</id>
<phase>validate</phase>
@@ -92,12 +92,15 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!--
Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
-->
<version>3.1.1</version>
<executions>
<execution>
<id>aspectjtools-assembly</id>
<phase>package</phase>

+ 8
- 3
aspectjweaver/pom.xml Vedi File

@@ -32,12 +32,12 @@
<executions>
<execution>
<id>test-jar</id>
<phase></phase>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -63,6 +63,11 @@

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!--
Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
-->
<version>3.1.1</version>
<executions>
<execution>
<id>aspectjweaver-assembly</id>

+ 7
- 2
installer/pom.xml Vedi File

@@ -31,13 +31,18 @@
<executions>
<execution>
<id>test-jar</id>
<phase></phase>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!--
Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
-->
<version>3.1.1</version>
<executions>
<execution>
<id>aspectjinstaller-assembly</id>

+ 0
- 4
pom.xml Vedi File

@@ -96,10 +96,6 @@
</executions>
</plugin>

<!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.1</version>
<configuration> <descriptors> <descriptor>assembly.xml</descriptor> </descriptors>
</configuration> </plugin> -->

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>

Loading…
Annulla
Salva