You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2020/01/11 13:44:37 UTC
[openwebbeans] branch master updated (15dd023 -> 34b9e5c)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git.
from 15dd023 OWB-1307 remove org.apache.webbeans.conversation.Conversation.periodicDelay
new 7838d51 upgrade copyright to 2020
new 34b9e5c OWB-1308 upgrade various dependencies
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 2 +-
distribution/src/main/resources/NOTICE | 5 ++---
pom.xml | 16 ++++++++--------
webbeans-tomcat7/pom.xml | 1 -
4 files changed, 11 insertions(+), 13 deletions(-)
[openwebbeans] 01/02: upgrade copyright to 2020
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 7838d5189bbf65c24d01fc851d5ab84085d21da3
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Jan 11 13:52:14 2020 +0100
upgrade copyright to 2020
---
NOTICE | 2 +-
distribution/src/main/resources/NOTICE | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/NOTICE b/NOTICE
index a55ff12..860361e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache OpenWebBeans
-Copyright 2008 - 2019 The Apache Software Foundation
+Copyright 2008 - 2020 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/distribution/src/main/resources/NOTICE b/distribution/src/main/resources/NOTICE
index 1a2fb87..52bf051 100644
--- a/distribution/src/main/resources/NOTICE
+++ b/distribution/src/main/resources/NOTICE
@@ -1,11 +1,11 @@
Apache OpenWebBeans
-Copyright 2008 - 2019 The Apache Software Foundation
+Copyright 2008 - 2020 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Apache XBean :: ASM 6 shaded (repackaged)
-Copyright 2005-2019 The Apache Software Foundation
+Copyright 2005-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -15,6 +15,5 @@ The Apache Software Foundation (http://www.apache.org/).
For ASM:
-
This product includes software developed at
OW2 Consortium (http://asm.ow2.org/)
\ No newline at end of file
[openwebbeans] 02/02: OWB-1308 upgrade various dependencies
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 34b9e5ca5785a6d13b3db8c6ed8601cbb54e447a
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Jan 11 14:43:56 2020 +0100
OWB-1308 upgrade various dependencies
---
pom.xml | 16 ++++++++--------
webbeans-tomcat7/pom.xml | 1 -
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6b21cca..f3be5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,20 +61,20 @@
<geronimo_jaxws.version>1.2</geronimo_jaxws.version>
<geronimo_servlet.version>1.0</geronimo_servlet.version>
<geronimo_ejb.version>1.0.2</geronimo_ejb.version>
- <geronimo_el.version>1.0.4</geronimo_el.version>
- <geronimo_annotation.version>1.0</geronimo_annotation.version>
+ <geronimo_el.version>1.1</geronimo_el.version>
+ <geronimo_annotation.version>1.2</geronimo_annotation.version>
<geronimo_jpa.version>1.1</geronimo_jpa.version>
<geronimo_jta.version>1.1.1</geronimo_jta.version>
<geronimo_jsp.version>1.0.1</geronimo_jsp.version>
- <geronimo_cdi.version>1.0.1</geronimo_cdi.version>
- <geronimo_atinject.version>1.0</geronimo_atinject.version>
- <geronimo_interceptor.version>1.0</geronimo_interceptor.version>
+ <geronimo_cdi.version>1.1</geronimo_cdi.version>
+ <geronimo_atinject.version>1.1</geronimo_atinject.version>
+ <geronimo_interceptor.version>1.1</geronimo_interceptor.version>
<geronimo_validation.version>1.1</geronimo_validation.version>
<tomcat7.version>7.0.73</tomcat7.version>
<!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 -->
<jetty.version>9.4.12.v20180830</jetty.version>
- <myfaces.version>2.3.0</myfaces.version>
- <xbean.version>4.13</xbean.version>
+ <myfaces.version>2.3.6</myfaces.version>
+ <xbean.version>4.15</xbean.version>
<arquillian.version>1.1.13.Final</arquillian.version>
<cdi.tck.version>2.0.3.Final</cdi.tck.version>
<httpclient.version>4.5.2</httpclient.version>
@@ -626,7 +626,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
diff --git a/webbeans-tomcat7/pom.xml b/webbeans-tomcat7/pom.xml
index 4e5c8ee..036edfd 100644
--- a/webbeans-tomcat7/pom.xml
+++ b/webbeans-tomcat7/pom.xml
@@ -76,7 +76,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>