Index: appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java
===================================================================
--- appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java	(revision 64384)
+++ appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -367,5 +367,25 @@
             //do nothing
         }
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
     }
 }
Index: appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java
===================================================================
--- appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java	(revision 64384)
+++ appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -332,6 +332,26 @@
         public void setDeploymentOrder(String value) {
             //do nothing
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
     class MyConnectorConnectionPool extends FakeConfigBean implements ConnectorConnectionPool {
 
@@ -696,5 +716,25 @@
             //do nothing
         }
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
     }
 }
Index: appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java
===================================================================
--- appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java	(revision 64384)
+++ appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -336,6 +336,26 @@
         public void setDeploymentOrder(String value) {
             //do nothing
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 
     class MyJMSConnectionFactoryConnectionPool extends FakeConfigBean implements ConnectorConnectionPool {
@@ -733,6 +753,26 @@
         public void setDeploymentOrder(String value) {
             //do nothing
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 }
 
Index: appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java
===================================================================
--- appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java	(revision 64384)
+++ appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -374,5 +374,25 @@
             //do nothing
         }
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
     }
 }
Index: appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java
===================================================================
--- appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java	(revision 64384)
+++ appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -559,5 +559,25 @@
             //do nothing
         }
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
     }
 }
Index: appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
===================================================================
--- appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java	(revision 64384)
+++ appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -491,6 +491,26 @@
         public void setDeploymentOrder(String value) {
             //do nothing
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 
     class MyJdbcConnectionPool extends FakeConfigBean implements JdbcConnectionPool {
@@ -970,5 +990,25 @@
         public void setDeploymentOrder(String value) {
             //do nothing
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 }
Index: appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java
===================================================================
--- appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java	(revision 64384)
+++ appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -234,4 +234,24 @@
      public Property getProperty (String str){
         return null;
     }
+
+    @Override
+    public Property addProperty(Property prprt) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Property lookupProperty(String string) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Property removeProperty(String string) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Property removeProperty(Property prprt) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
Index: appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java
===================================================================
--- appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java	(revision 64384)
+++ appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java	(working copy)
@@ -126,6 +126,10 @@
     public String getImplementation() {
         return bean.getBeanClass().getName();
     }
+    @Override
+    public Type getImplementationType() {
+        return bean.getBeanClass().getGenericSuperclass();
+    }
 
     @Override
     public Class<?> getImplementationClass() {
Index: nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DummyNetworkListener.java
===================================================================
--- nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DummyNetworkListener.java	(revision 64384)
+++ nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DummyNetworkListener.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2007-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -254,5 +254,35 @@
 
         return defaultValue;
     }
+
+    @Override
+    public Property addProperty(Property prprt) {
+        if (properties.add(prprt)) {
+            return prprt;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Property lookupProperty(String string) {
+        return getProperty(name);
+    }
+
+    @Override
+    public Property removeProperty(String string) {
+        final Property prop = getProperty(name);
+        if(prop == null){
+            return null;
+        }
+        return removeProperty(prop);
+    }
+
+    @Override
+    public Property removeProperty(Property prprt) {
+        if (properties.remove(prprt)) {
+            return prprt;
+        }
+        return null;
+    }
 }
-
Index: nucleus/deployment/admin/src/test/java/org/glassfish/deployment/admin/ListComponentsCommandTest.java
===================================================================
--- nucleus/deployment/admin/src/test/java/org/glassfish/deployment/admin/ListComponentsCommandTest.java	(revision 64384)
+++ nucleus/deployment/admin/src/test/java/org/glassfish/deployment/admin/ListComponentsCommandTest.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -186,11 +186,31 @@
             this.engineList = engines;
         }
 
-       public List<Property> getProperty() {return null;}
-  public void setResources(Resources res){}
+        public List<Property> getProperty() {return null;}
+        public void setResources(Resources res){}
         public Resources getResources(){return null;}
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
 
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+
     }
         //mock-up Application object
     public class ApplicationTest extends RandomConfig implements Application {
@@ -274,6 +294,26 @@
         public <T extends ApplicationExtension> List<T> getExtensionsByType(Class<T> type) {
             return null;
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 
             //mock-up Engine object
@@ -314,5 +354,25 @@
         public <T extends ApplicationConfig> T newApplicationConfig(Class<T> configType) throws TransactionFailure {
             return null;
         }
+
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 }
Index: nucleus/deployment/common/src/test/java/org/glassfish/deployment/versioning/VersioningUtilsTest.java
===================================================================
--- nucleus/deployment/common/src/test/java/org/glassfish/deployment/versioning/VersioningUtilsTest.java	(revision 64384)
+++ nucleus/deployment/common/src/test/java/org/glassfish/deployment/versioning/VersioningUtilsTest.java	(working copy)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -690,10 +690,12 @@
             throw new UnsupportedOperationException("Not supported yet.");
         }
  
+        @Override
         public String getDeploymentOrder() {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
         public void setDeploymentOrder(String value) throws PropertyVetoException{
             throw new UnsupportedOperationException("Not supported yet.");
         }
@@ -820,5 +822,24 @@
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public Property addProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property lookupProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(String string) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Property removeProperty(Property prprt) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
     }
 }
Index: nucleus/pom.xml
===================================================================
--- nucleus/pom.xml	(revision 64384)
+++ nucleus/pom.xml	(working copy)
@@ -147,8 +147,8 @@
         <servlet-api.version>3.1.0</servlet-api.version>
         <grizzly.version>2.3.23</grizzly.version>
         <saaj-api.version>1.3.4</saaj-api.version>
-        <hk2.version>2.5.0-b07</hk2.version>
-        <hk2.plugin.version>2.5.0-b07</hk2.plugin.version>
+        <hk2.version>2.5.0-b31</hk2.version>
+        <hk2.plugin.version>2.5.0-b31</hk2.plugin.version>
         <jboss.logging.version>3.1.3.GA</jboss.logging.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
         <hibernate-validator.version>5.2.4.Final</hibernate-validator.version>