Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java

@@ -57,7 +57,6 @@ public class PropertiesConfigurationManager implements ConfigurationManager, Dum
         this(null);
     }
 
-    @ManagedAttribute("A file or URL of properties")
     public void setFile(String resource) throws IOException
     {
         _properties = resource;
@@ -65,6 +64,7 @@ public class PropertiesConfigurationManager implements ConfigurationManager, Dum
         loadProperties(_properties);
     }
 
+    @ManagedAttribute("A file or URL of properties")
     public String getFile()
     {
         return _properties;

pom.xml

@@ -48,6 +48,7 @@
     <guava.version>31.0.1-jre</guava.version>
     <guice.version>5.1.0</guice.version>
     <hamcrest.version>2.2</hamcrest.version>
+    <hawtio.version>2.14.5</hawtio.version>
     <hazelcast.version>4.2.4</hazelcast.version>
     <infinispan.protostream.version>4.3.5.Final</infinispan.protostream.version>
     <infinispan.version>11.0.14.Final</infinispan.version>

tests/test-webapps/test-owb-cdi-webapp/pom.xml

@@ -13,7 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.cdi.owb</bundle-symbolic-name>
-    <openwebbeans.version>2.0.25</openwebbeans.version>
+    <openwebbeans.version>2.0.26</openwebbeans.version>
   </properties>
 
   <build>