You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/06/22 08:57:49 UTC
[maven-surefire] 02/02: m-shade-p: alternative 2
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch shade
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 3ada5cf45c132ab2a75297098a782f44d3f9810d
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Jun 22 10:57:24 2020 +0200
m-shade-p: alternative 2
---
surefire-shadefire/pom.xml | 181 +++++++++++++++++++++++++--------------------
1 file changed, 100 insertions(+), 81 deletions(-)
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 556404c..0f4c782 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -18,92 +18,111 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire</artifactId>
- <version>3.0.0-M6-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>3.0.0-M6-SNAPSHOT</version>
+ </parent>
- <artifactId>surefire-shadefire</artifactId>
+ <artifactId>surefire-shadefire</artifactId>
- <name>ShadeFire JUnit3 Provider</name>
- <description>A super-shaded junit3 provider that is used by surefire to build itself,
- that basically has ALL classes relocated to facilitate no API-conflict whatsoever with ourself.
- The only remaining point of conflict is around the booter properties file format.
- </description>
+ <name>ShadeFire JUnit3 Provider</name>
+ <description>A super-shaded junit3 provider that is used by surefire to build itself,
+ that basically has ALL classes relocated to facilitate no API-conflict whatsoever with ourself.
+ The only remaining point of conflict is around the booter properties file format.
+ </description>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-booter</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>relocated-packages</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.apache.maven.surefire:surefire-shared-utils</include>
- <include>org.apache.maven.surefire:surefire-logger-api</include>
- <include>org.apache.maven.surefire:surefire-api</include>
- <include>org.apache.maven.surefire:surefire-extensions-spi</include>
- <include>org.apache.maven.surefire:surefire-booter</include>
- <include>org.apache.maven.surefire:common-junit3</include>
- <include>org.apache.maven.surefire:surefire-junit3</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.maven</pattern>
- <shadedPattern>org.apache.maven.shadefire</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>relocated-packages</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.maven.surefire:surefire-shared-utils</include>
+ <include>org.apache.maven.surefire:surefire-logger-api</include>
+ <include>org.apache.maven.surefire:surefire-api</include>
+ <include>org.apache.maven.surefire:surefire-extensions-spi</include>
+ <include>org.apache.maven.surefire:surefire-booter</include>
+ <include>org.apache.maven.surefire:common-junit3</include>
+ <include>org.apache.maven.surefire:surefire-junit3</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.maven</pattern>
+ <shadedPattern>org.apache.maven.shadefire</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ <execution>
+ <id>relocated-services</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.maven.surefire</pattern>
+ <shadedPattern>org.apache.maven.shadefire.surefire</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.maven.plugin</pattern>
+ <shadedPattern>org.apache.maven.shadefire.plugin</shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>