You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/01/03 17:39:22 UTC

[brooklyn-server] branch master updated (33c9aa2 -> 3db88c4)

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.


    from 33c9aa2  also accept guava prefix when mapping and deserializing inner classes
     new 8790e84  bump felix version to match karaf
     new 3db88c4  bump pax and jetty versions to match karaf

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:
 pom.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

[brooklyn-server] 02/02: bump pax and jetty versions to match karaf

Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 3db88c4d0c10d9b5a4e68333fba7ac2b1548e21e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Jan 3 17:15:14 2022 +0000

    bump pax and jetty versions to match karaf
---
 pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ac2ff1..b908eaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,10 +183,12 @@
         <!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
         <karaf.version>4.3.5</karaf.version>
         <karaf.plugin.version>${karaf.version}</karaf.plugin.version>
-        <jetty.version>9.4.41.v20210516</jetty.version> <!-- 9.4.41.v20210516 from Karaf 4.3.4 -->
+        <pax-web.version>7.3.23</pax-web.version> <!-- karaf 4.3 -->
+        <jetty.version>9.4.43.v20210629</jetty.version> <!-- pax 7.3.23 from karaf 4.3 -->
         <commons-collections.version>3.2.2</commons-collections.version>
-        <pax-web.version>7.3.17</pax-web.version>
         <spifly.version>1.3.2</spifly.version> <!-- 1.3.0 from kubernetes; 1.2.4 from pax-jetty; v1.3.2 from erstwhile jetty feature; but 1.3.2 fixes an NPE bug in 1.3.0 so use it -->
+        <jaxb-api.version>2.3.3</jaxb-api.version>
+        <spifly.version>1.3.2</spifly.version> <!-- v1.3.2 from jetty feature; v1.2.4 from pax-jetty -->
         <felix.framework.version>6.0.5</felix.framework.version>
 
         <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->

[brooklyn-server] 01/02: bump felix version to match karaf

Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 8790e84e9a4194a9ad2130342e58657c32a26193
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Jan 3 16:18:43 2022 +0000

    bump felix version to match karaf
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5bee563..4ac2ff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
         <commons-collections.version>3.2.2</commons-collections.version>
         <pax-web.version>7.3.17</pax-web.version>
         <spifly.version>1.3.2</spifly.version> <!-- 1.3.0 from kubernetes; 1.2.4 from pax-jetty; v1.3.2 from erstwhile jetty feature; but 1.3.2 fixes an NPE bug in 1.3.0 so use it -->
-        <felix.framework.version>6.0.3</felix.framework.version>
+        <felix.framework.version>6.0.5</felix.framework.version>
 
         <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
         <jna.version>5.9.0</jna.version>