You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2019/12/11 08:38:07 UTC
[brooklyn-server] branch master updated (0a01c97 -> ab2e156)
This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from 0a01c97 Merge pull request #1072 from tbouron/feature/jenkins
add c841259 bump yaml software version
add 636eb86 explicitly specify exclusions
add e35fca5 support strings for templates
new 53e99f4 use new jackson, not the pre-release artifact
new 8610d81 Merge branch 'master' into pom-jackson-bump
new ab2e156 This closes #1067
The 3 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:
.../catalog/internal/BasicBrooklynCatalog.java | 25 ++++-
.../core/catalog/internal/CatalogTemplateTest.java | 119 +++++++++++++++++++++
pom.xml | 4 +-
utils/rest-swagger/pom.xml | 18 ++++
4 files changed, 161 insertions(+), 5 deletions(-)
create mode 100644 core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogTemplateTest.java
[brooklyn-server] 03/03: This closes #1067
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit ab2e156d460e148edfcce39b585d27a179b6245a
Merge: 0a01c97 8610d81
Author: Aled Sage <al...@gmail.com>
AuthorDate: Wed Dec 11 08:36:38 2019 +0000
This closes #1067
.../catalog/internal/BasicBrooklynCatalog.java | 25 ++++-
.../core/catalog/internal/CatalogTemplateTest.java | 119 +++++++++++++++++++++
pom.xml | 4 +-
utils/rest-swagger/pom.xml | 18 ++++
4 files changed, 161 insertions(+), 5 deletions(-)
[brooklyn-server] 01/03: use new jackson,
not the pre-release artifact
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 53e99f4fa55043c2a98a13918a2b3011fe79f837
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 6 11:00:42 2019 +0000
use new jackson, not the pre-release artifact
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1dc20b9..9de96d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>
<kxml2.servicemix.version>2.3.0_3</kxml2.servicemix.version>
<!-- double-check downstream projects before changing jackson version -->
- <fasterxml.jackson.version>2.10.0.pr2</fasterxml.jackson.version> <!-- 2.9.9 matches cxf-jackson (from cxf-jaxrs), but 2.10 has better yaml support -->
+ <fasterxml.jackson.version>2.10.1</fasterxml.jackson.version> <!-- 2.9.9 matches cxf-jackson (from cxf-jaxrs), but 2.10 has better yaml support -->
<cxf.version>3.2.8</cxf.version>
<httpcomponents.httpclient.version>4.5.6</httpcomponents.httpclient.version> <!-- To match cxf-http-async -->
<httpcomponents.httpcore.version>4.4.9</httpcomponents.httpcore.version> <!-- To match cxf-http-async -->
[brooklyn-server] 02/03: Merge branch 'master' into pom-jackson-bump
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 8610d81f1cc537f3703b92f92527ecb575380593
Merge: 53e99f4 0a01c97
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 6 11:02:59 2019 +0000
Merge branch 'master' into pom-jackson-bump
Dockerfile | 3 +
Jenkinsfile | 86 ++++++++++++++++++++++
api/pom.xml | 1 +
.../test/policy/failover/ElectPrimaryTest.java | 3 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 3 +-
parent/pom.xml | 13 +---
pom.xml | 8 +-
rest/rest-resources/pom.xml | 12 +++
.../base/SoftwareProcessStopsDuringStartTest.java | 3 +-
utils/common/pom.xml | 1 +
10 files changed, 117 insertions(+), 16 deletions(-)