This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new 4a1a69029 OWB-1417 re-enable bom and distributions
4a1a69029 is described below
commit 4a1a69029c00214c04c8bbb4b8dd007c5744c343
Author: Mark Struberg <[email protected]>
AuthorDate: Fri Jan 27 20:57:42 2023 +0100
OWB-1417 re-enable bom and distributions
---
bom/openwebbeans-se-bom/pom.xml | 10 +++---
bom/openwebbeans-web-bom/pom.xml | 12 +++----
distribution/pom.xml | 27 +++++++---------
distribution/src/assembly/dist-binary.xml | 14 ++++----
pom.xml | 54 +++++++++----------------------
webbeans-osgi/pom.xml | 11 ++++---
6 files changed, 47 insertions(+), 81 deletions(-)
diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml
index 2a453ead5..08056bd72 100644
--- a/bom/openwebbeans-se-bom/pom.xml
+++ b/bom/openwebbeans-se-bom/pom.xml
@@ -51,30 +51,29 @@
<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>
+ <groupId>jakarta.*</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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -83,14 +82,13 @@
<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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml
index c2536d5e3..de9cf434e 100644
--- a/bom/openwebbeans-web-bom/pom.xml
+++ b/bom/openwebbeans-web-bom/pom.xml
@@ -37,14 +37,13 @@
<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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -53,14 +52,13 @@
<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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -69,14 +67,13 @@
<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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -85,14 +82,13 @@
<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>
+ <groupId>jakarta.*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2c4f41dd0..e8c3a1e88 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -117,25 +117,25 @@
<dependencies>
<!-- spec APIs -->
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
<dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<!-- scanner and ASM-->
@@ -184,11 +184,6 @@
<artifactId>openwebbeans-el22</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openwebbeans-spi</artifactId>
@@ -201,7 +196,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-tomcat7</artifactId>
+ <artifactId>openwebbeans-tomcat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/distribution/src/assembly/dist-binary.xml
b/distribution/src/assembly/dist-binary.xml
index 93211c3e6..9e3829318 100644
--- a/distribution/src/assembly/dist-binary.xml
+++ b/distribution/src/assembly/dist-binary.xml
@@ -80,28 +80,26 @@ under the License.
<dependencySet>
<outputDirectory>api</outputDirectory>
<includes>
-
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-interceptor_1.2_spec:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-annotation_1.3_spec:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-el_2.2_spec:jar</include>
+
<include>jakarta.annotation:jakarta.annotation-api:jar</include>
+ <include>jakarta.inject:jakarta.inject:jar</include>
+
<include>jakarta.enterprise:jakarta.enterprise.cdi-api:jar</include>
+ <include>jakarta.interceptor:jakarta.interceptor:jar</include>
+ <include>jakarta.el:jakarta.el:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>plugins</outputDirectory>
<includes>
-
<include>org.apache.openwebbeans:openwebbeans-resource</include>
<include>org.apache.openwebbeans:openwebbeans-jsf</include>
<include>org.apache.openwebbeans:openwebbeans-jms</include>
<include>org.apache.openwebbeans:openwebbeans-ejb</include>
<include>org.apache.openwebbeans:openwebbeans-ee</include>
<include>org.apache.openwebbeans:openwebbeans-ee-common</include>
<include>org.apache.openwebbeans:openwebbeans-el22</include>
-
<include>org.apache.openwebbeans:openwebbeans-resource</include>
<include>org.apache.openwebbeans:openwebbeans-osgi</include>
<include>org.apache.openwebbeans:openwebbeans-web</include>
- <include>org.apache.openwebbeans:openwebbeans-tomcat7</include>
+ <include>org.apache.openwebbeans:openwebbeans-tomcat</include>
</includes>
</dependencySet>
diff --git a/pom.xml b/pom.xml
index 1bc875b88..b6aca1498 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,17 +74,19 @@
<httpclient.version>4.5.14</httpclient.version>
<xbean.version>4.22</xbean.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>
-
-<!-- OLD remove: -->
- <!-- jetty 9.4.13+ broke session persistence:
https://github.com/eclipse/jetty.project/issues/3597 -->
- <jetty.version>9.4.12.v20180830</jetty.version>
<cdi.tck.version>4.0.7</cdi.tck.version>
- <osgi.servlet.range>2.4</osgi.servlet.range>
- <osgi.el.range>2.2</osgi.el.range>
- <osgi.faces.range>2.0</osgi.faces.range>
+ <osgi.servlet.range>4.0</osgi.servlet.range>
+ <osgi.el.range>4.0</osgi.el.range>
+ <osgi.faces.range>4.0</osgi.faces.range>
+
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+
+ <!-- OLD remove: -->
+ <!-- jetty 9.4.13+ broke session persistence:
https://github.com/eclipse/jetty.project/issues/3597 -->
+ <jetty.version>9.4.12.v20180830</jetty.version>
+
</properties>
<mailingLists>
@@ -303,7 +305,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.3.0</version>
+ <version>5.1.8</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -742,12 +744,12 @@
<module>webbeans-jms</module>
<module>webbeans-tck</module>
<module>webbeans-jsf</module>
-<!--X TODO re-enable
- <module>webbeans-jetty9</module>
<module>webbeans-osgi</module>
- <module>samples</module>
<module>distribution</module>
<module>bom</module>
+<!--X TODO re-enable
+ <module>webbeans-jetty9</module>
+ <module>samples</module>
-->
</modules>
@@ -881,24 +883,18 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>${geronimo_jpa.version}</version>
</dependency>
-
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>${geronimo_jsp.version}</version>
- </dependency>
-
+-->
<!-- this is used for TCK tests -->
<dependency>
@@ -938,30 +934,12 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- CDI Testing Framework -->
- <dependency>
- <groupId>org.apache.openwebbeans.test</groupId>
- <artifactId>cditest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans.test</groupId>
- <artifactId>cditest-owb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml
index cf06ac11f..ca3f4cbd7 100644
--- a/webbeans-osgi/pom.xml
+++ b/webbeans-osgi/pom.xml
@@ -29,11 +29,7 @@
<description>Apache OpenWebBeans OSGi ClassLoader scanning
support</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </dependency>
-
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
@@ -61,6 +57,11 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.xbean</groupId>
