This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push: new b958795 [MEECROWAVE-283] meecrowave-junit jakarta shade b958795 is described below commit b958795964f67bc79cc9b5163c41ec475f52bd6a Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Thu Apr 22 09:12:23 2021 +0200 [MEECROWAVE-283] meecrowave-junit jakarta shade --- meecrowave-core/pom.xml | 1 - meecrowave-junit/pom.xml | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 33 ++++++++++------- 3 files changed, 116 insertions(+), 14 deletions(-) diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml index 41ed427..bce57d1 100644 --- a/meecrowave-core/pom.xml +++ b/meecrowave-core/pom.xml @@ -389,7 +389,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.2.4</version> <executions> <execution> <id>bundle</id> diff --git a/meecrowave-junit/pom.xml b/meecrowave-junit/pom.xml index dbc80cd..af63c9a 100644 --- a/meecrowave-junit/pom.xml +++ b/meecrowave-junit/pom.xml @@ -95,6 +95,102 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>jakarta</shadedClassifierName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <artifactSet> + <includes> + <include>${project.groupId}:${project.artifactId}</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>javax.activation</pattern> + <shadedPattern>jakarta.activation</shadedPattern> + </relocation> + <relocation> + <pattern>javax.annotation</pattern> + <shadedPattern>jakarta.annotation</shadedPattern> + </relocation> + <relocation> + <pattern>javax.el</pattern> + <shadedPattern>jakarta.el</shadedPattern> + </relocation> + <relocation> + <pattern>javax.enterprise</pattern> + <shadedPattern>jakarta.enterprise</shadedPattern> + </relocation> + <relocation> + <pattern>javax.decorator</pattern> + <shadedPattern>jakarta.decorator</shadedPattern> + </relocation> + <relocation> + <pattern>javax.inject</pattern> + <shadedPattern>jakarta.inject</shadedPattern> + </relocation> + <relocation> + <pattern>javax.interceptor</pattern> + <shadedPattern>jakarta.interceptor</shadedPattern> + </relocation> + <relocation> + <pattern>javax.servlet</pattern> + <shadedPattern>jakarta.servlet</shadedPattern> + </relocation> + <relocation> + <pattern>javax.transaction</pattern> + <shadedPattern>jakarta.transaction</shadedPattern> + </relocation> + <relocation> + <pattern>javax.validation</pattern> + <shadedPattern>jakarta.validation</shadedPattern> + </relocation> + <relocation> + <pattern>javax.persistence</pattern> + <shadedPattern>jakarta.persistence</shadedPattern> + </relocation> + <relocation> + <pattern>javax.faces</pattern> + <shadedPattern>jakarta.faces</shadedPattern> + </relocation> + <relocation> + <pattern>javax.ejb</pattern> + <shadedPattern>jakarta.ejb</shadedPattern> + </relocation> + <relocation> + <pattern>javax.ws</pattern> + <shadedPattern>jakarta.ws</shadedPattern> + </relocation> + <relocation> + <pattern>javax.cache</pattern> + <shadedPattern>jakarta.cache</shadedPattern> + </relocation> + <relocation> + <pattern>javax.jms</pattern> + <shadedPattern>jakarta.jms</shadedPattern> + </relocation> + <relocation> + <pattern>javax.json</pattern> + <shadedPattern>jakarta.json</shadedPattern> + </relocation> + <relocation> + <pattern>javax.resource</pattern> + <shadedPattern>jakarta.resource</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/pom.xml b/pom.xml index 5b40dbf..2845f69 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> -<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"> +<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> <parent> @@ -151,6 +152,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.2.4</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>3.0.2</version> <configuration> @@ -233,17 +240,17 @@ </profiles> <repositories> -<!-- only needed when under development - <repository> - <id>asf-snapshot</id> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> ---> + <!-- only needed when under development + <repository> + <id>asf-snapshot</id> + <url>https://repository.apache.org/content/repositories/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + --> </repositories> </project>