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.git
The following commit(s) were added to refs/heads/master by this push: new d58af1b OWB-1312 making build creating jakarta classifier artifacts d58af1b is described below commit d58af1b70e3d59aaaf44ca063afc970516fea20d Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Thu Feb 6 15:07:41 2020 +0100 OWB-1312 making build creating jakarta classifier artifacts --- pom.xml | 86 +++++++++++++++++++ src/site/apt/jakarta.apt | 99 ++++++++++++++++++++++ .../META-INF/openwebbeans/openwebbeans.properties | 3 + .../META-INF/openwebbeans/openwebbeans.properties | 2 + webbeans-maven/pom.xml | 2 +- .../META-INF/openwebbeans/openwebbeans.properties | 1 + 6 files changed, 192 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0752a89..1b15781 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,8 @@ <osgi.servlet.range>2.4</osgi.servlet.range> <osgi.el.range>2.2</osgi.el.range> <osgi.faces.range>2.0</osgi.faces.range> + + <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version> </properties> <mailingLists> @@ -349,6 +351,90 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${maven-shade-plugin.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>jakarta</shadedClassifierName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + </transformers> + <artifactSet> <!-- don't include transitive deps --> + <includes> + <include>${project.groupId}:${project.artifactId}</include> + </includes> + </artifactSet> + <relocations> + <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.jms</pattern> + <shadedPattern>jakarta.jms</shadedPattern> + </relocation> + <!-- + todo: javax.transaction, it is in the JVM so can have issue repackaging + --> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <configuration> diff --git a/src/site/apt/jakarta.apt b/src/site/apt/jakarta.apt new file mode 100644 index 0000000..c76e718 --- /dev/null +++ b/src/site/apt/jakarta.apt @@ -0,0 +1,99 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with this +~~ work for additional information regarding copyright ownership. The ASF +~~ licenses this file to You under the Apache License, Version 2.0 (the +~~ "License"); you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law +~~ or agreed to in writing, software distributed under the License is +~~ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the specific language +~~ governing permissions and limitations under the License. +Sample pom to use Jakarta artifacts/namespace instead of Javax one + + ++-------------------------------+ +<dependencies> + <!-- jakarta specs: to update to jakarta ones once released --> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-el_2.2_spec</artifactId> + <version>1.2</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.3_spec</artifactId> + <version>1.3</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_2.0_spec</artifactId> + <version>1.2</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.2</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.2_spec</artifactId> + <version>1.2</version> + <classifier>jakarta</classifier> + </dependency> + + <!-- openwebbeans with jakarta classifier --> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-spi</artifactId> + <version>2.0.15</version> + <classifier>jakarta</classifier> + <exclusions> + <exclusion> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-impl</artifactId> + <version>2.0.15</version> + <classifier>jakarta</classifier> + <exclusions> + <exclusion> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-se</artifactId> + <version>2.0.15</version> + <classifier>jakarta</classifier> + <exclusions> + <exclusion> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> +</dependencies> ++-------------------------------+ diff --git a/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index fec5259..0891473 100644 --- a/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -128,6 +128,9 @@ org.apache.webbeans.useBDABeansXMLScanner=false org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler org.apache.webbeans.proxy.mapping.javax.enterprise.context.SessionScoped=org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.RequestScoped=org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.SessionScoped=org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler ################################################################################################ ################################################################################################ diff --git a/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties index 6cd0d46..745af1c 100644 --- a/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties @@ -32,6 +32,8 @@ org.apache.webbeans.spi.deployer.MetaDataDiscoveryService=org.apache.webbeans.te org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler # some tests misused that so revert it to ensure they pass diff --git a/webbeans-maven/pom.xml b/webbeans-maven/pom.xml index 6316f9c..1c7869f 100644 --- a/webbeans-maven/pom.xml +++ b/webbeans-maven/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> + <version>${maven-shade-plugin.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index aaaabc7..6ed8b06 100644 --- a/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -38,6 +38,7 @@ org.apache.webbeans.application.supportsConversation=true # we have to switch back to the un-cached version of the normal scoping handler org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler +org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler org.apache.webbeans.container.InjectionResolver.fastMatching = false