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 5b55cbb [OWB-1368] adding jakarta boms 5b55cbb is described below commit 5b55cbb77897f5908f836d336226c2cefcbdb2ca Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Thu Feb 4 08:09:03 2021 +0100 [OWB-1368] adding jakarta boms --- bom/openwebbeans-se-bom/pom.xml | 108 +++++++++++++++++++++++++++++++++++++++ bom/openwebbeans-web-bom/pom.xml | 103 +++++++++++++++++++++++++++++++++++++ bom/pom.xml | 38 ++++++++++++++ pom.xml | 1 + src/site/apt/jakarta.apt | 11 ++++ 5 files changed, 261 insertions(+) diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml new file mode 100644 index 0000000..f2dfa56 --- /dev/null +++ b/bom/openwebbeans-se-bom/pom.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<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"> + <parent> + <artifactId>bom</artifactId> + <groupId>org.apache.openwebbeans.bom</groupId> + <version>2.0.22-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>openwebbeans-se-bom</artifactId> + <name>SE BOM</name> + <description>Apache OpenWebBeans SE BOM</description> + <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.3_spec</artifactId> + <version>${geronimo_annotation.version}</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_2.0_spec</artifactId> + <version>${geronimo_cdi.version}</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${geronimo_atinject.version}</version> + <classifier>jakarta</classifier> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.2_spec</artifactId> + <version>${geronimo_interceptor.version}</version> + <classifier>jakarta</classifier> + </dependency> + + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-spi</artifactId> + <version>${project.version}</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>${project.version}</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>${project.version}</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> +</project> \ No newline at end of file diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml new file mode 100644 index 0000000..d8108ca --- /dev/null +++ b/bom/openwebbeans-web-bom/pom.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<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"> + <parent> + <artifactId>bom</artifactId> + <groupId>org.apache.openwebbeans.bom</groupId> + <version>2.0.22-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>openwebbeans-web-bom</artifactId> + <name>Web BOM</name> + <description>Apache OpenWebBeans Web BOM</description> + <packaging>pom</packaging> + + <dependencies> + <!-- + specs are assumed provided for this one (servlet case mainly) + --> + + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-spi</artifactId> + <version>${project.version}</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>${project.version}</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-el22</artifactId> + <version>${project.version}</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-web</artifactId> + <version>${project.version}</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> +</project> \ No newline at end of file diff --git a/bom/pom.xml b/bom/pom.xml new file mode 100644 index 0000000..70d9e61 --- /dev/null +++ b/bom/pom.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<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"> + <parent> + <artifactId>openwebbeans</artifactId> + <groupId>org.apache.openwebbeans</groupId> + <version>2.0.22-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.openwebbeans.bom</groupId> + <artifactId>bom</artifactId> + <name>BOM</name> + <description>Apache OpenWebBeans BOM parent, mainly to simplify jakarta stack consumption.</description> + <packaging>pom</packaging> + + <modules> + <module>openwebbeans-se-bom</module> + <module>openwebbeans-web-bom</module> + </modules> +</project> diff --git a/pom.xml b/pom.xml index ad188d5..94b4cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -649,6 +649,7 @@ <module>webbeans-se</module> <module>webbeans-junit5</module> <module>webbeans-slf4j</module> + <module>bom</module> </modules> <dependencyManagement> diff --git a/src/site/apt/jakarta.apt b/src/site/apt/jakarta.apt index c76e718..b7448ba 100644 --- a/src/site/apt/jakarta.apt +++ b/src/site/apt/jakarta.apt @@ -97,3 +97,14 @@ Sample pom to use Jakarta artifacts/namespace instead of Javax one </dependency> </dependencies> +-------------------------------+ + +Alternatively, you can use the Jakarta bom starting with version 2.0.22: + ++-----+ +<dependency> + <artifactId>openwebbeans-se-bom</artifactId> + <groupId>org.apache.openwebbeans.bom</groupId> + <version>${owb.version}</version> + <type>pom</type> +</dependency> ++-----+