[brooklyn-server] branch master updated: suppress recently added warning log in known non-warning case

[heneveld]

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


The following commit(s) were added to refs/heads/master by this push:
     new 3ce38482b1 suppress recently added warning log in known non-warning 
case
     new f96704ab09 Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/brooklyn-server
3ce38482b1 is described below

commit 3ce38482b156e6de881f69d4ee5d8551a461d1bc
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Tue Jul 12 14:50:31 2022 +0100

    suppress recently added warning log in known non-warning case
---
 .../apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
 
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index acd86db3cf..ce10b25a80 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -1606,7 +1606,10 @@ public class BasicBrooklynCatalog implements 
BrooklynCatalog {
 
                     itemSpecInstantiated = internalCreateSpecLegacy(mgmt, 
itemToAttempt, MutableSet.<String>of(), true);
 
-                    log.warn("Instantiation of this blueprint was only 
possible with legacy plan-to-spec converter, will likely not be supported in 
future versions:\n"+candidateYaml);
+                    if (!candidateYaml.contains("services:")) {
+                        // 'services:' blueprints still need legacy 
plan-to-spec converter
+                        log.warn("Instantiation of this blueprint was only 
possible with legacy plan-to-spec converter, will likely not be supported in 
future versions:\n" + candidateYaml);
+                    }
                 }
 
                 if (itemSpecInstantiated!=null) {