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 2021/12/17 09:57:31 UTC
[brooklyn-server] branch master updated (de03564 -> 9efa36b)
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 de03564 This closes #1282
new 9769137 Adding staging repo for Karaf 4.3.4 and bumping it
new 352f909 Added plugin repository
new 1576e42 Bumping Karaf 4.3.4 dep version on Brooklyn
new c0ebf0e fix typo
new e0f37af restore version of jackson as newer version has test-breaking code change
new 9efa36b This closes #1285
The 6 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:
.../resolve/jackson/AsPropertyIfAmbiguous.java | 2 +-
pom.xml | 34 +++++++++++++++-------
2 files changed, 24 insertions(+), 12 deletions(-)
[brooklyn-server] 01/06: Adding staging repo for Karaf 4.3.4 and bumping it
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 976913748f4f5f00ed6990ef8ec82ed34936801c
Author: Juan Cabrerizo <ju...@cabrerizo.es>
AuthorDate: Wed Dec 15 16:48:22 2021 +0000
Adding staging repo for Karaf 4.3.4 and bumping it
---
karaf/pom.xml | 2 +-
pom.xml | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/karaf/pom.xml b/karaf/pom.xml
index cfaad5e..945bc67 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -140,7 +140,7 @@
<version>0.12</version>
<configuration>
<consoleOutput>true</consoleOutput>
- <excludes combine.children="append">
+ <excludes combine.children="append">q
<!-- Exclude sandbox because not part of distribution: not in tgz, and not uploaded to maven-central -->
<exclude>sandbox/**</exclude>
<!-- Exclude release because not part of distribution: not in tgz, and not uploaded to maven-central -->
diff --git a/pom.xml b/pom.xml
index 395cee7..7786d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,13 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>testKaraf434</id>
+ <url>https://repository.apache.org/content/repositories/orgapachekaraf-1165/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<properties>
@@ -181,7 +188,7 @@
<kubernetes-client.version>5.8.0</kubernetes-client.version>
<!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
- <karaf.version>4.3.0</karaf.version>
+ <karaf.version>4.3.4</karaf.version>
<karaf.plugin.version>${karaf.version}</karaf.plugin.version>
<jetty.version>9.4.39.v20210325</jetty.version> <!-- 9.4.31.v20200723 from Karaf 4.3.0 -->
<commons-collections.version>3.2.2</commons-collections.version>
[brooklyn-server] 06/06: This closes #1285
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 9efa36beca5b93ce789b48abf881edb2eb2f2068
Merge: de03564 e0f37af
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 17 09:57:26 2021 +0000
This closes #1285
.../resolve/jackson/AsPropertyIfAmbiguous.java | 2 +-
pom.xml | 34 +++++++++++++++-------
2 files changed, 24 insertions(+), 12 deletions(-)
[brooklyn-server] 02/06: Added plugin repository
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 352f9091bce1cbda68822a8c94439626dfeeb488
Author: Juan Cabrerizo <ju...@cabrerizo.es>
AuthorDate: Wed Dec 15 21:14:43 2021 +0000
Added plugin repository
---
pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7786d58..1f8c8cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,12 @@
</snapshots>
</repository>
</repositories>
-
+ <pluginRepositories>
+ <pluginRepository>
+ <id>testKaraf434-plugin</id>
+ <url>https://repository.apache.org/content/repositories/orgapachekaraf-1165/</url>
+ </pluginRepository>
+ </pluginRepositories>
<properties>
<brooklyn.version>1.1.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
[brooklyn-server] 05/06: restore version of jackson as newer version has test-breaking code change
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 e0f37af0ed51759e033381c5507739199f509a71
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 17 09:46:01 2021 +0000
restore version of jackson as newer version has test-breaking code change
karaf seems to work with older version, though one error at startup: "BundleWiring is null for: javax.mail [3]"
---
.../apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java b/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
index 1ad8eea..3941bbe 100644
--- a/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
+++ b/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
@@ -178,7 +178,7 @@ public class AsPropertyIfAmbiguous {
}
}
-// @Override
+ @Override
protected Object _deserializeTypedForId(JsonParser p, DeserializationContext ctxt,
TokenBuffer tb) throws IOException
{
@@ -223,4 +223,4 @@ public class AsPropertyIfAmbiguous {
}
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 240dd8b..3f97f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<activator.servicemix.version>2.9.0</activator.servicemix.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<!-- double-check downstream projects before changing jackson version -->
- <fasterxml.jackson.version>2.12.5</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.11.3</fasterxml.jackson.version>
<cxf.version>3.4.0</cxf.version>
<httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version> <!-- To match cxf-http-async -->
<httpcomponents.httpcore.version>4.4.14</httpcomponents.httpcore.version> <!-- To match cxf -->
[brooklyn-server] 03/06: Bumping Karaf 4.3.4 dep version on Brooklyn
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 1576e4200634f65300a36167ac5657a66b3832f1
Author: Juan Cabrerizo <ju...@cabrerizo.es>
AuthorDate: Thu Dec 16 11:25:03 2021 +0000
Bumping Karaf 4.3.4 dep version on Brooklyn
---
.../core/resolve/jackson/AsPropertyIfAmbiguous.java | 2 +-
pom.xml | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java b/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
index 10a7bcb..1ad8eea 100644
--- a/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
+++ b/core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
@@ -178,7 +178,7 @@ public class AsPropertyIfAmbiguous {
}
}
- @Override
+// @Override
protected Object _deserializeTypedForId(JsonParser p, DeserializationContext ctxt,
TokenBuffer tb) throws IOException
{
diff --git a/pom.xml b/pom.xml
index 1f8c8cd..240dd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,8 +138,8 @@
<activator.servicemix.version>2.9.0</activator.servicemix.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<!-- double-check downstream projects before changing jackson version -->
- <fasterxml.jackson.version>2.11.3</fasterxml.jackson.version>
- <cxf.version>3.3.9</cxf.version>
+ <fasterxml.jackson.version>2.12.5</fasterxml.jackson.version>
+ <cxf.version>3.4.0</cxf.version>
<httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version> <!-- To match cxf-http-async -->
<httpcomponents.httpcore.version>4.4.14</httpcomponents.httpcore.version> <!-- To match cxf -->
<!-- @deprecated since 0.11 -->
@@ -151,7 +151,7 @@
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.6.2</swagger.version>
<mx4j.version>3.0.1</mx4j.version>
- <bouncycastle.version>1.67</bouncycastle.version> <!-- beyond this gives asn1 errors, needs a new dep probably -->
+ <bouncycastle.version>1.69</bouncycastle.version> <!-- beyond this gives asn1 errors, needs a new dep probably -->
<eddsa.version>0.2.0</eddsa.version> <!-- eddsa 0.3.0 needs sun x509 -->
<sshj.version>0.27.0</sshj.version> <!-- jclouds 2.4 uses 0.27; 0.32 needs eddsa 0.3.0 -->
<!-- jzlib osgi version is 1.1.3.2, but bundle is 1.1.3_2 ; JClouds 2.2.0 pulls in 1.0.7_1 but is happy with 1.1.3.2 -->
@@ -161,9 +161,9 @@
<jetty-schemas.version>3.1.M0</jetty-schemas.version>
<airline.version>0.7</airline.version>
<freemarker.version>2.3.31</freemarker.version>
- <commons-io.version>2.4</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
<jsonPath.version>2.4.0</jsonPath.version>
- <commons-compress.version>1.20</commons-compress.version>
+ <commons-compress.version>1.21</commons-compress.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
@@ -195,14 +195,14 @@
<!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
<karaf.version>4.3.4</karaf.version>
<karaf.plugin.version>${karaf.version}</karaf.plugin.version>
- <jetty.version>9.4.39.v20210325</jetty.version> <!-- 9.4.31.v20200723 from Karaf 4.3.0 -->
+ <jetty.version>9.4.41.v20210516</jetty.version> <!-- 9.4.41.v20210516 from Karaf 4.3.4 -->
<commons-collections.version>3.2.2</commons-collections.version>
- <pax-web.version>7.3.9</pax-web.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>
<!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
- <jna.version>4.1.0</jna.version>
+ <jna.version>5.9.0</jna.version>
<objenesis.version>2.5</objenesis.version>
<clojure.version>1.4.0</clojure.version>
<clj-time.version>0.4.1</clj-time.version>
@@ -245,7 +245,7 @@
<!-- Seemingly unused dependencies! -->
<ivy.version>2.2.0</ivy.version>
- <jline.version>2.12</jline.version>
+ <jline.version>3.21.0</jline.version>
<jansi.version>1.2.1</jansi.version> <!-- Also shipped in vanilla karaf, v1.17.1 in karaf:4.1.6 -->
<sleepycat-je.version>5.0.34</sleepycat-je.version>
<jcommander.version>1.27</jcommander.version>
@@ -417,7 +417,7 @@
<version>${ow2.asm.version.jsonpath}</version>
</dependency>
<dependency>
- <groupId>jline</groupId> <!-- when removing this, replace uses with org.jline -->
+ <groupId>org.jline</groupId> <!-- when removing this, replace uses with org.jline -->
<artifactId>jline</artifactId>
<version>${jline.version}</version>
</dependency>
[brooklyn-server] 04/06: fix typo
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 c0ebf0e3753fa8f85f131dc9b5a77573a0545879
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 17 09:45:29 2021 +0000
fix typo
---
karaf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 945bc67..cfaad5e 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -140,7 +140,7 @@
<version>0.12</version>
<configuration>
<consoleOutput>true</consoleOutput>
- <excludes combine.children="append">q
+ <excludes combine.children="append">
<!-- Exclude sandbox because not part of distribution: not in tgz, and not uploaded to maven-central -->
<exclude>sandbox/**</exclude>
<!-- Exclude release because not part of distribution: not in tgz, and not uploaded to maven-central -->