You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/03/23 14:08:40 UTC
[tomee] branch master updated: Minor: Regenerated BOMs for 2a946d8f0c9b9d88c9b9b3793a294c47cc708664
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new ce03b0a Minor: Regenerated BOMs for 2a946d8f0c9b9d88c9b9b3793a294c47cc708664
ce03b0a is described below
commit ce03b0ac29b1e4e33665a9e8a60d43d7c9f8979d
Author: rzo1 <rz...@users.noreply.github.com>
AuthorDate: Wed Mar 23 14:08:08 2022 +0000
Minor: Regenerated BOMs for 2a946d8f0c9b9d88c9b9b3793a294c47cc708664
Signed-off-by: GitHub <no...@github.com>
---
boms/tomee-microprofile/pom.xml | 10 +++++-----
.../src/main/resources/tomee/conf/catalina.properties | 2 --
.../src/main/resources/tomee/conf/server.xml | 4 ++--
.../src/main/resources/tomee/conf/catalina.properties | 2 --
boms/tomee-plume/src/main/resources/tomee/conf/server.xml | 4 ++--
.../src/main/resources/tomee/conf/catalina.properties | 2 --
boms/tomee-plus/src/main/resources/tomee/conf/server.xml | 4 ++--
.../src/main/resources/tomee/conf/catalina.properties | 2 --
boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml | 4 ++--
9 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 40b3e20..bc776ca 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.13.2</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.13.2</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.2</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.13.2</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1942,7 +1942,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.30</version>
+ <version>1.28</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
index 9f0c046..d73a8bf 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
@@ -141,7 +141,6 @@ ecj-*.jar,\
el-api.jar,\
geronimo-spec-jaxrpc*.jar,\
h2*.jar,\
-ha-api-*.jar,\
hamcrest-*.jar,\
hibernate*.jar,\
httpclient*.jar,\
@@ -152,7 +151,6 @@ jasper.jar,\
jaspic-api.jar,\
jaxb-*.jar,\
jaxen-*.jar,\
-jaxws-rt-*.jar,\
jdom-*.jar,\
jetty-*.jar,\
jmx-tools.jar,\
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
index 46a42fc..8038e33 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
@@ -86,8 +86,8 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true">
- <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" xpoweredBy="false" server="Apache TomEE" />
+ maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
index 9f0c046..d73a8bf 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
@@ -141,7 +141,6 @@ ecj-*.jar,\
el-api.jar,\
geronimo-spec-jaxrpc*.jar,\
h2*.jar,\
-ha-api-*.jar,\
hamcrest-*.jar,\
hibernate*.jar,\
httpclient*.jar,\
@@ -152,7 +151,6 @@ jasper.jar,\
jaspic-api.jar,\
jaxb-*.jar,\
jaxen-*.jar,\
-jaxws-rt-*.jar,\
jdom-*.jar,\
jetty-*.jar,\
jmx-tools.jar,\
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
index 46a42fc..8038e33 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
@@ -86,8 +86,8 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true">
- <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" xpoweredBy="false" server="Apache TomEE" />
+ maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
index 9f0c046..d73a8bf 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
@@ -141,7 +141,6 @@ ecj-*.jar,\
el-api.jar,\
geronimo-spec-jaxrpc*.jar,\
h2*.jar,\
-ha-api-*.jar,\
hamcrest-*.jar,\
hibernate*.jar,\
httpclient*.jar,\
@@ -152,7 +151,6 @@ jasper.jar,\
jaspic-api.jar,\
jaxb-*.jar,\
jaxen-*.jar,\
-jaxws-rt-*.jar,\
jdom-*.jar,\
jetty-*.jar,\
jmx-tools.jar,\
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
index 46a42fc..8038e33 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
@@ -86,8 +86,8 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true">
- <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" xpoweredBy="false" server="Apache TomEE" />
+ maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
index 9f0c046..d73a8bf 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
@@ -141,7 +141,6 @@ ecj-*.jar,\
el-api.jar,\
geronimo-spec-jaxrpc*.jar,\
h2*.jar,\
-ha-api-*.jar,\
hamcrest-*.jar,\
hibernate*.jar,\
httpclient*.jar,\
@@ -152,7 +151,6 @@ jasper.jar,\
jaspic-api.jar,\
jaxb-*.jar,\
jaxen-*.jar,\
-jaxws-rt-*.jar,\
jdom-*.jar,\
jetty-*.jar,\
jmx-tools.jar,\
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
index 46a42fc..8038e33 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
@@ -86,8 +86,8 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true">
- <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" xpoweredBy="false" server="Apache TomEE" />
+ maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />