From ec927881ac01adbbf9ed94bd0bd29ca72f05be7f Mon Sep 17 00:00:00 2001
From: Matthew Gill <matthew.gill@live.co.uk>
Date: Tue, 22 Dec 2020 09:39:43 +0000
Subject: [PATCH 1/3] FISH-663 Add exception type parsing

Exception types are now parsed from MethodModels.

Signed-off-by: Matthew Gill <matthew.gill@live.co.uk>
---
 .../hk2/classmodel/reflect/MethodModel.java   |  6 ++++++
 .../reflect/impl/MethodModelImpl.java         | 19 +++++++++++++++++++
 .../impl/MethodSignatureVisitorImpl.java      | 10 ++++++++++
 .../reflect/impl/ModelClassVisitor.java       | 11 +++++++++++
 .../reflect/test/method/MethodTest.java       |  5 +++++
 .../test/method/SimpleAnnotatedMethod.java    |  2 +-
 6 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java
index 306f817aae..94b351229c 100755
--- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java
+++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java
@@ -47,6 +47,12 @@ public interface MethodModel extends Member, AnnotatedElement {
      */
     String[] getArgumentTypes();
 
+    /**
+     * @return the checked exception types, or an empty array if the method doesn't
+     *         declare any thrown exceptions
+     */
+    String[] getExceptionTypes();
+
     /**
      * Returns the list of parameter
      *
diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java
index b622517aad..ff1634b616 100755
--- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java
+++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java
@@ -26,6 +26,7 @@
 public class MethodModelImpl extends AnnotatedElementImpl implements MethodModel {
 
     private List<Parameter> parameters;
+    private List<ParameterizedType> exceptionTypes;
     private ParameterizedType returnType;
     final ExtensibleType<?> owner;
     private final String signature;
@@ -74,6 +75,24 @@ public String[] getArgumentTypes() {
         return stringTypes;
     }
 
+    @Override
+    public String[] getExceptionTypes() {
+        String[] stringTypes;
+        if (exceptionTypes != null) {
+            stringTypes = new String[exceptionTypes.size()];
+            for (int i = 0; i < exceptionTypes.size(); i++) {
+                stringTypes[i] = exceptionTypes.get(i).getTypeName();
+            }
+        } else {
+            stringTypes = new String[0];
+        }
+        return stringTypes;
+    }
+
+    public void setExceptionTypes(List<ParameterizedType> exceptionTypes) {
+        this.exceptionTypes = exceptionTypes;
+    }
+
     @Override
     public List<Parameter> getParameters() {
         return parameters;
diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java
index a74eebd6e2..4a58a5fc73 100644
--- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java
+++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java
@@ -35,6 +35,7 @@ public class MethodSignatureVisitorImpl extends SignatureVisitor {
     private final MethodModel methodModel;
 
     private final List<Parameter> parameters = new ArrayList<>();
+    private final List<ParameterizedType> exceptionTypes = new ArrayList<>();
     private final ParameterizedType returnType = new ParameterizedTypeImpl();
     private final ArrayDeque<ParameterizedType> parentType = new ArrayDeque<>();
 
@@ -49,6 +50,10 @@ public List<Parameter> getParameters() {
         return parameters;
     }
 
+    public List<ParameterizedType> getExceptionTypes() {
+        return exceptionTypes;
+    }
+
     public ParameterizedType getReturnType() {
         return returnType;
     }
@@ -61,6 +66,11 @@ public SignatureVisitor visitParameterType() {
         return this;
     }
 
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        return this;
+    }
+
     @Override
     public SignatureVisitor visitReturnType() {
         parentType.add(returnType);
diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
index 0d442c7189..e19422ba51 100755
--- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
+++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
@@ -280,6 +280,17 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         org.objectweb.asm.Type type = org.objectweb.asm.Type.getReturnType(desc);
         returnType.setType(type);
 
+        final List<ParameterizedType> exceptionTypes = new ArrayList<>();
+        if (exceptions != null) {
+            for (int i = 0; i < exceptions.length; i++) {
+                final String exception = exceptions[i];
+                final ParameterizedTypeImpl exceptionType = new ParameterizedTypeImpl(exception);
+                exceptionType.setType(org.objectweb.asm.Type.getObjectType(exception));
+                exceptionTypes.add(exceptionType);
+            }
+        }
+        methodModel.setExceptionTypes(exceptionTypes);
+
         org.objectweb.asm.Type[] types = org.objectweb.asm.Type.getArgumentTypes(desc);
         for (int i = 0; i < methodModel.getParameters().size(); i++) {
             ParameterImpl parameter = (ParameterImpl) methodModel.getParameter(i);
diff --git a/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java b/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java
index 58d16d0a9d..8ee0a62bb3 100755
--- a/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java
+++ b/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java
@@ -82,6 +82,11 @@ public void simpleTest() throws IOException, InterruptedException {
                         Assert.assertEquals("yellow", gradientColor2.get(0).getValues().get("name"));
                         Assert.assertEquals("orange", gradientColor2.get(1).getValues().get("name"));
 
+                        // Exception types
+                        final String[] exceptionTypes = mm.getExceptionTypes();
+                        Assert.assertEquals(1, exceptionTypes.length);
+                        Assert.assertEquals(IllegalArgumentException.class.getName(), exceptionTypes[0]);
+
                         // Parameter annotations, type and generic types check
                         Assert.assertEquals(5, mm.getParameters().size());
 
diff --git a/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java b/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java
index b221be5959..ec08f93dda 100755
--- a/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java
+++ b/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java
@@ -44,7 +44,7 @@ public SampleType<Integer, Character, Boolean> setFoo(
             List<String> input,
             SampleType<Double, String, SampleType<Short, Float, Long>> sampleType,
             int count,
-            Object value) {
+            Object value) throws IllegalArgumentException {
         return null;
     }
 }

From 89d6c116ec06e1cb952cd99f9fcf8b0a49c021f5 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Mon, 12 Apr 2021 12:32:38 +0530
Subject: [PATCH 2/3] FISH-1282 Upgrade ASM version to 9.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4d20e815e7..189b531171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
         <jtype.version>0.1.3</jtype.version>
         <javassist.version>3.22.0-GA</javassist.version>
         <junit.version>4.13.1</junit.version>
-        <asm.version>7.3.1</asm.version>
+        <asm.version>9.1</asm.version>
         <woodstox.version>4.1.2</woodstox.version>
         <stax-api.version>1.0-2</stax-api.version>
         <aopalliance.version>1.0</aopalliance.version>

From ec0e91d5d25f0d43782e7a02ca16c652f50f3ba2 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Tue, 13 Apr 2021 18:04:28 +0530
Subject: [PATCH 3/3] FISH-1282 Release HK2 v3.0.1.payara-p1

---
 bom/pom.xml                                                    | 2 +-
 class-model/pom.xml                                            | 2 +-
 examples/caching/pom.xml                                       | 2 +-
 examples/caching/runner/pom.xml                                | 2 +-
 examples/caching/system/pom.xml                                | 2 +-
 examples/configuration/pom.xml                                 | 2 +-
 examples/configuration/webserver/pom.xml                       | 2 +-
 examples/configuration/xml/pom.xml                             | 2 +-
 examples/custom-resolver/pom.xml                               | 2 +-
 examples/events/pom.xml                                        | 2 +-
 examples/events/threaded/pom.xml                               | 2 +-
 examples/operations/pom.xml                                    | 2 +-
 examples/pom.xml                                               | 2 +-
 examples/security-lockdown/alice/pom.xml                       | 2 +-
 examples/security-lockdown/mallory/pom.xml                     | 2 +-
 examples/security-lockdown/pom.xml                             | 2 +-
 examples/security-lockdown/runner/pom.xml                      | 2 +-
 examples/security-lockdown/system/pom.xml                      | 2 +-
 external/aopalliance/pom.xml                                   | 2 +-
 external/pom.xml                                               | 2 +-
 guice-bridge/pom.xml                                           | 2 +-
 hk2-api/pom.xml                                                | 2 +-
 hk2-configuration/hk2-integration/pom.xml                      | 2 +-
 hk2-configuration/manager/pom.xml                              | 2 +-
 hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml         | 2 +-
 hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml         | 2 +-
 hk2-configuration/persistence/hk2-xml/integration-test/pom.xml | 2 +-
 hk2-configuration/persistence/hk2-xml/main/pom.xml             | 2 +-
 hk2-configuration/persistence/hk2-xml/pom.xml                  | 2 +-
 hk2-configuration/persistence/hk2-xml/schema/pom.xml           | 2 +-
 hk2-configuration/persistence/hk2-xml/test1/pom.xml            | 2 +-
 hk2-configuration/persistence/pom.xml                          | 2 +-
 hk2-configuration/persistence/property-file/pom.xml            | 2 +-
 hk2-configuration/pom.xml                                      | 2 +-
 hk2-core/pom.xml                                               | 2 +-
 hk2-extras/pom.xml                                             | 2 +-
 hk2-jmx/pom.xml                                                | 2 +-
 hk2-locator/pom.xml                                            | 2 +-
 hk2-metadata-generator/main/pom.xml                            | 2 +-
 hk2-metadata-generator/pom.xml                                 | 2 +-
 hk2-metadata-generator/test1/pom.xml                           | 2 +-
 hk2-runlevel/pom.xml                                           | 2 +-
 hk2-testing/ant/pom.xml                                        | 2 +-
 hk2-testing/collections/pom.xml                                | 2 +-
 hk2-testing/hk2-junitrunner/pom.xml                            | 2 +-
 hk2-testing/hk2-locator-extras/pom.xml                         | 2 +-
 hk2-testing/hk2-locator-no-proxies/pom.xml                     | 2 +-
 hk2-testing/hk2-locator-no-proxies2/pom.xml                    | 2 +-
 hk2-testing/hk2-mockito/pom.xml                                | 2 +-
 hk2-testing/hk2-runlevel-extras/pom.xml                        | 2 +-
 hk2-testing/hk2-testng/pom.xml                                 | 2 +-
 hk2-testing/interceptor-events/pom.xml                         | 2 +-
 hk2-testing/jersey/jersey-guice/form-param/pom.xml             | 2 +-
 hk2-testing/jersey/jersey-guice/pom.xml                        | 2 +-
 hk2-testing/jersey/pom.xml                                     | 2 +-
 hk2-testing/pom.xml                                            | 2 +-
 hk2-utils/pom.xml                                              | 2 +-
 hk2/pom.xml                                                    | 2 +-
 javadocs/pom.xml                                               | 2 +-
 maven-plugins/consolidatedbundle-maven-plugin/pom.xml          | 2 +-
 maven-plugins/hk2-inhabitant-generator/pom.xml                 | 2 +-
 maven-plugins/osgiversion-maven-plugin/pom.xml                 | 2 +-
 maven-plugins/pom.xml                                          | 2 +-
 osgi/adapter-tests/contract-bundle/pom.xml                     | 2 +-
 osgi/adapter-tests/faux-sdp-bundle/pom.xml                     | 2 +-
 osgi/adapter-tests/no-hk2-bundle/pom.xml                       | 2 +-
 osgi/adapter-tests/osgi-adapter-test/pom.xml                   | 2 +-
 osgi/adapter-tests/pom.xml                                     | 2 +-
 osgi/adapter-tests/sdp-management-bundle/pom.xml               | 2 +-
 osgi/adapter-tests/test-module-startup/pom.xml                 | 2 +-
 osgi/adapter/pom.xml                                           | 2 +-
 osgi/pom.xml                                                   | 2 +-
 pom.xml                                                        | 2 +-
 spring-bridge/pom.xml                                          | 2 +-
 74 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 058560b863..76fc056ed4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-bom</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.1.payara-p1</version>
     <packaging>pom</packaging>
 
     <name>HK2 Bom Pom</name>
diff --git a/class-model/pom.xml b/class-model/pom.xml
index 7652c2f895..de97e95385 100644
--- a/class-model/pom.xml
+++ b/class-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>
diff --git a/examples/caching/pom.xml b/examples/caching/pom.xml
index a92f724969..4e36de3862 100644
--- a/examples/caching/pom.xml
+++ b/examples/caching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/examples/caching/runner/pom.xml b/examples/caching/runner/pom.xml
index e484bb5bc2..fe424edb69 100644
--- a/examples/caching/runner/pom.xml
+++ b/examples/caching/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>caching-aop-example-runner</artifactId>
diff --git a/examples/caching/system/pom.xml b/examples/caching/system/pom.xml
index 378b6699c5..73db91554a 100644
--- a/examples/caching/system/pom.xml
+++ b/examples/caching/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>caching-aop-example-system</artifactId>
diff --git a/examples/configuration/pom.xml b/examples/configuration/pom.xml
index 3a7e1bac2d..11370fccad 100644
--- a/examples/configuration/pom.xml
+++ b/examples/configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/examples/configuration/webserver/pom.xml b/examples/configuration/webserver/pom.xml
index 8491821380..9f5e3d09b4 100644
--- a/examples/configuration/webserver/pom.xml
+++ b/examples/configuration/webserver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>webserver-configuration-example</artifactId>
diff --git a/examples/configuration/xml/pom.xml b/examples/configuration/xml/pom.xml
index ff5b128131..dd5e740bc5 100644
--- a/examples/configuration/xml/pom.xml
+++ b/examples/configuration/xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>xml-configuration-example</artifactId>
diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml
index 2da7117f8e..df0ad1d085 100644
--- a/examples/custom-resolver/pom.xml
+++ b/examples/custom-resolver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>custom-resolver-example</artifactId>
     <name>Custom Resolver Example</name>
diff --git a/examples/events/pom.xml b/examples/events/pom.xml
index 5f74ebc6be..f23100bfde 100644
--- a/examples/events/pom.xml
+++ b/examples/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/examples/events/threaded/pom.xml b/examples/events/threaded/pom.xml
index dd18c6bf19..8bd0fb2287 100644
--- a/examples/events/threaded/pom.xml
+++ b/examples/events/threaded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>event-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>threading-event-example</artifactId>
diff --git a/examples/operations/pom.xml b/examples/operations/pom.xml
index 5881228656..a30201f28a 100644
--- a/examples/operations/pom.xml
+++ b/examples/operations/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>operations-example</artifactId>
     <name>Operations Example</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 23f71f9868..0d4f2409b2 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/examples/security-lockdown/alice/pom.xml b/examples/security-lockdown/alice/pom.xml
index e3ea3012b2..70b0ba6015 100644
--- a/examples/security-lockdown/alice/pom.xml
+++ b/examples/security-lockdown/alice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-alice</artifactId>
diff --git a/examples/security-lockdown/mallory/pom.xml b/examples/security-lockdown/mallory/pom.xml
index 711bf595da..b5ded5adfd 100644
--- a/examples/security-lockdown/mallory/pom.xml
+++ b/examples/security-lockdown/mallory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-mallory</artifactId>
diff --git a/examples/security-lockdown/pom.xml b/examples/security-lockdown/pom.xml
index 13076f9fe0..7d53a02135 100644
--- a/examples/security-lockdown/pom.xml
+++ b/examples/security-lockdown/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/examples/security-lockdown/runner/pom.xml b/examples/security-lockdown/runner/pom.xml
index 20a3e30193..f59e835a1b 100644
--- a/examples/security-lockdown/runner/pom.xml
+++ b/examples/security-lockdown/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-runner</artifactId>
diff --git a/examples/security-lockdown/system/pom.xml b/examples/security-lockdown/system/pom.xml
index 60d1c00232..ac96505d5a 100644
--- a/examples/security-lockdown/system/pom.xml
+++ b/examples/security-lockdown/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-system</artifactId>
diff --git a/external/aopalliance/pom.xml b/external/aopalliance/pom.xml
index 345cb059c9..0737319d26 100644
--- a/external/aopalliance/pom.xml
+++ b/external/aopalliance/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>external</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2.external</groupId>
     <artifactId>aopalliance-repackaged</artifactId>
diff --git a/external/pom.xml b/external/pom.xml
index 71fca13a02..cf6dfd7cbe 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/guice-bridge/pom.xml b/guice-bridge/pom.xml
index 278dfef634..1617666863 100644
--- a/guice-bridge/pom.xml
+++ b/guice-bridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>guice-bridge</artifactId>
diff --git a/hk2-api/pom.xml b/hk2-api/pom.xml
index 5887a74887..03e14d5b4c 100644
--- a/hk2-api/pom.xml
+++ b/hk2-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-api</artifactId>
diff --git a/hk2-configuration/hk2-integration/pom.xml b/hk2-configuration/hk2-integration/pom.xml
index a3d3514ce5..1667e7e74b 100644
--- a/hk2-configuration/hk2-integration/pom.xml
+++ b/hk2-configuration/hk2-integration/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-configuration-integration</artifactId>
diff --git a/hk2-configuration/manager/pom.xml b/hk2-configuration/manager/pom.xml
index 5ebd591580..bbb4a1c281 100644
--- a/hk2-configuration/manager/pom.xml
+++ b/hk2-configuration/manager/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-configuration-hub</artifactId>
diff --git a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml
index 64c7beed95..7bcb2900de 100644
--- a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-json</artifactId>
     
diff --git a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml
index d552132371..1a593697f3 100644
--- a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-pbuf</artifactId>
     
diff --git a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml
index 640818250e..1077c08490 100644
--- a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-integration-test</artifactId>
     
diff --git a/hk2-configuration/persistence/hk2-xml/main/pom.xml b/hk2-configuration/persistence/hk2-xml/main/pom.xml
index 3d443d4b49..6ed6c73de7 100644
--- a/hk2-configuration/persistence/hk2-xml/main/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/main/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml</artifactId>
     
diff --git a/hk2-configuration/persistence/hk2-xml/pom.xml b/hk2-configuration/persistence/hk2-xml/pom.xml
index 33c7dc8c0c..c0dca8d4a4 100644
--- a/hk2-configuration/persistence/hk2-xml/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration-persistence</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/hk2-configuration/persistence/hk2-xml/schema/pom.xml b/hk2-configuration/persistence/hk2-xml/schema/pom.xml
index 0605d678b9..0a3d2e7c2d 100644
--- a/hk2-configuration/persistence/hk2-xml/schema/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-schema</artifactId>
     
diff --git a/hk2-configuration/persistence/hk2-xml/test1/pom.xml b/hk2-configuration/persistence/hk2-xml/test1/pom.xml
index 4baa69e81d..a87a9fcbd2 100644
--- a/hk2-configuration/persistence/hk2-xml/test1/pom.xml
+++ b/hk2-configuration/persistence/hk2-xml/test1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-test</artifactId>
     
diff --git a/hk2-configuration/persistence/pom.xml b/hk2-configuration/persistence/pom.xml
index abb29c9de4..c27e210209 100644
--- a/hk2-configuration/persistence/pom.xml
+++ b/hk2-configuration/persistence/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/hk2-configuration/persistence/property-file/pom.xml b/hk2-configuration/persistence/property-file/pom.xml
index 9f1662f194..285b18a8ea 100644
--- a/hk2-configuration/persistence/property-file/pom.xml
+++ b/hk2-configuration/persistence/property-file/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration-persistence</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-property-file</artifactId>
     
diff --git a/hk2-configuration/pom.xml b/hk2-configuration/pom.xml
index ff420a462e..80cd06b78d 100644
--- a/hk2-configuration/pom.xml
+++ b/hk2-configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/hk2-core/pom.xml b/hk2-core/pom.xml
index 0ff5aedaa1..9bd01ed296 100644
--- a/hk2-core/pom.xml
+++ b/hk2-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-core</artifactId>
     <name>HK2 core module</name>
diff --git a/hk2-extras/pom.xml b/hk2-extras/pom.xml
index c73cec4c92..88bea2ad7a 100644
--- a/hk2-extras/pom.xml
+++ b/hk2-extras/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-extras</artifactId>
diff --git a/hk2-jmx/pom.xml b/hk2-jmx/pom.xml
index 4498f7ad1a..bd4c977c9d 100644
--- a/hk2-jmx/pom.xml
+++ b/hk2-jmx/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-jmx</artifactId>
diff --git a/hk2-locator/pom.xml b/hk2-locator/pom.xml
index 97ff674c65..9d200d275b 100644
--- a/hk2-locator/pom.xml
+++ b/hk2-locator/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-locator</artifactId>
     <name>ServiceLocator Default Implementation</name>
diff --git a/hk2-metadata-generator/main/pom.xml b/hk2-metadata-generator/main/pom.xml
index b304c6109b..999a340d44 100644
--- a/hk2-metadata-generator/main/pom.xml
+++ b/hk2-metadata-generator/main/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-metadata-generator-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>
diff --git a/hk2-metadata-generator/pom.xml b/hk2-metadata-generator/pom.xml
index c631c8a037..dac89c0e75 100644
--- a/hk2-metadata-generator/pom.xml
+++ b/hk2-metadata-generator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
diff --git a/hk2-metadata-generator/test1/pom.xml b/hk2-metadata-generator/test1/pom.xml
index c191d95cb6..4cd9f501da 100644
--- a/hk2-metadata-generator/test1/pom.xml
+++ b/hk2-metadata-generator/test1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-metadata-generator-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-metadata-generator-test1</artifactId>
diff --git a/hk2-runlevel/pom.xml b/hk2-runlevel/pom.xml
index d89f2669ac..1b3fe63510 100644
--- a/hk2-runlevel/pom.xml
+++ b/hk2-runlevel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-runlevel</artifactId>
diff --git a/hk2-testing/ant/pom.xml b/hk2-testing/ant/pom.xml
index a216f52ffc..75b525d20c 100644
--- a/hk2-testing/ant/pom.xml
+++ b/hk2-testing/ant/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     
diff --git a/hk2-testing/collections/pom.xml b/hk2-testing/collections/pom.xml
index a9648392cf..343fc82e43 100644
--- a/hk2-testing/collections/pom.xml
+++ b/hk2-testing/collections/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-testing</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-collections-tests</artifactId>
diff --git a/hk2-testing/hk2-junitrunner/pom.xml b/hk2-testing/hk2-junitrunner/pom.xml
index 7fd08524a6..73432e79b5 100644
--- a/hk2-testing/hk2-junitrunner/pom.xml
+++ b/hk2-testing/hk2-junitrunner/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>hk2-junitrunner</artifactId>
diff --git a/hk2-testing/hk2-locator-extras/pom.xml b/hk2-testing/hk2-locator-extras/pom.xml
index f28bf92465..b5e7a50a38 100644
--- a/hk2-testing/hk2-locator-extras/pom.xml
+++ b/hk2-testing/hk2-locator-extras/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>hk2-locator-extras</artifactId>
diff --git a/hk2-testing/hk2-locator-no-proxies/pom.xml b/hk2-testing/hk2-locator-no-proxies/pom.xml
index 397ae481eb..f659462450 100644
--- a/hk2-testing/hk2-locator-no-proxies/pom.xml
+++ b/hk2-testing/hk2-locator-no-proxies/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>hk2-locator-no-proxies</artifactId>
diff --git a/hk2-testing/hk2-locator-no-proxies2/pom.xml b/hk2-testing/hk2-locator-no-proxies2/pom.xml
index 3c0d1466f4..746019db6f 100644
--- a/hk2-testing/hk2-locator-no-proxies2/pom.xml
+++ b/hk2-testing/hk2-locator-no-proxies2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/hk2-testing/hk2-mockito/pom.xml b/hk2-testing/hk2-mockito/pom.xml
index 1dcf00ff2b..7ac3f67e60 100644
--- a/hk2-testing/hk2-mockito/pom.xml
+++ b/hk2-testing/hk2-mockito/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-testing</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-mockito</artifactId>
     <name>HK2 Mockito</name>
diff --git a/hk2-testing/hk2-runlevel-extras/pom.xml b/hk2-testing/hk2-runlevel-extras/pom.xml
index 7ec2ef41df..783b0c69f2 100644
--- a/hk2-testing/hk2-runlevel-extras/pom.xml
+++ b/hk2-testing/hk2-runlevel-extras/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>hk2-runlevel-extras</artifactId>
diff --git a/hk2-testing/hk2-testng/pom.xml b/hk2-testing/hk2-testng/pom.xml
index c64d315bf8..85d972af60 100644
--- a/hk2-testing/hk2-testng/pom.xml
+++ b/hk2-testing/hk2-testng/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>hk2-testng</artifactId>
diff --git a/hk2-testing/interceptor-events/pom.xml b/hk2-testing/interceptor-events/pom.xml
index eda731571b..98f12ebfae 100644
--- a/hk2-testing/interceptor-events/pom.xml
+++ b/hk2-testing/interceptor-events/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-testing</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>interceptor-events</artifactId>
diff --git a/hk2-testing/jersey/jersey-guice/form-param/pom.xml b/hk2-testing/jersey/jersey-guice/form-param/pom.xml
index 40a3b3f864..1f80c6893d 100644
--- a/hk2-testing/jersey/jersey-guice/form-param/pom.xml
+++ b/hk2-testing/jersey/jersey-guice/form-param/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
diff --git a/hk2-testing/jersey/jersey-guice/pom.xml b/hk2-testing/jersey/jersey-guice/pom.xml
index e436aa78a7..60786da484 100644
--- a/hk2-testing/jersey/jersey-guice/pom.xml
+++ b/hk2-testing/jersey/jersey-guice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/hk2-testing/jersey/pom.xml b/hk2-testing/jersey/pom.xml
index c0580e4605..f010d721a1 100644
--- a/hk2-testing/jersey/pom.xml
+++ b/hk2-testing/jersey/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/hk2-testing/pom.xml b/hk2-testing/pom.xml
index e601abc923..4b25755d74 100644
--- a/hk2-testing/pom.xml
+++ b/hk2-testing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/hk2-utils/pom.xml b/hk2-utils/pom.xml
index 510d62aa99..f494a4b54b 100644
--- a/hk2-utils/pom.xml
+++ b/hk2-utils/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-utils</artifactId>
diff --git a/hk2/pom.xml b/hk2/pom.xml
index f84f7b4b6a..489c1c60c9 100644
--- a/hk2/pom.xml
+++ b/hk2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hk2</artifactId>
diff --git a/javadocs/pom.xml b/javadocs/pom.xml
index c7c5decee6..745336975c 100644
--- a/javadocs/pom.xml
+++ b/javadocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-javadocs</artifactId>
     <name>HK2 Javadocs</name>
diff --git a/maven-plugins/consolidatedbundle-maven-plugin/pom.xml b/maven-plugins/consolidatedbundle-maven-plugin/pom.xml
index dcaca147b1..7a75a514a3 100644
--- a/maven-plugins/consolidatedbundle-maven-plugin/pom.xml
+++ b/maven-plugins/consolidatedbundle-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>maven-plugins</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>consolidatedbundle-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
diff --git a/maven-plugins/hk2-inhabitant-generator/pom.xml b/maven-plugins/hk2-inhabitant-generator/pom.xml
index de79988c9c..b793d855b1 100644
--- a/maven-plugins/hk2-inhabitant-generator/pom.xml
+++ b/maven-plugins/hk2-inhabitant-generator/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>maven-plugins</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-inhabitant-generator</artifactId>
     <packaging>maven-plugin</packaging>
diff --git a/maven-plugins/osgiversion-maven-plugin/pom.xml b/maven-plugins/osgiversion-maven-plugin/pom.xml
index 395516797d..5c415e7869 100644
--- a/maven-plugins/osgiversion-maven-plugin/pom.xml
+++ b/maven-plugins/osgiversion-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>maven-plugins</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>osgiversion-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 9eada4f4a6..0476556a06 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>maven-plugins</artifactId>
     <packaging>pom</packaging>
diff --git a/osgi/adapter-tests/contract-bundle/pom.xml b/osgi/adapter-tests/contract-bundle/pom.xml
index 4c92dcff54..d8bbb8899b 100644
--- a/osgi/adapter-tests/contract-bundle/pom.xml
+++ b/osgi/adapter-tests/contract-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>contract-bundle</artifactId>
diff --git a/osgi/adapter-tests/faux-sdp-bundle/pom.xml b/osgi/adapter-tests/faux-sdp-bundle/pom.xml
index 38ef1a1f83..8734a1c1cb 100644
--- a/osgi/adapter-tests/faux-sdp-bundle/pom.xml
+++ b/osgi/adapter-tests/faux-sdp-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>faux-sdp-bundle</artifactId>
diff --git a/osgi/adapter-tests/no-hk2-bundle/pom.xml b/osgi/adapter-tests/no-hk2-bundle/pom.xml
index 542d7b58c1..06e7815a33 100644
--- a/osgi/adapter-tests/no-hk2-bundle/pom.xml
+++ b/osgi/adapter-tests/no-hk2-bundle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>no-hk2-bundle</artifactId>
diff --git a/osgi/adapter-tests/osgi-adapter-test/pom.xml b/osgi/adapter-tests/osgi-adapter-test/pom.xml
index 946479b890..3d42c66c31 100644
--- a/osgi/adapter-tests/osgi-adapter-test/pom.xml
+++ b/osgi/adapter-tests/osgi-adapter-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>osgi-adapter-test</artifactId>
diff --git a/osgi/adapter-tests/pom.xml b/osgi/adapter-tests/pom.xml
index fd37ece47d..51fccdc0c5 100644
--- a/osgi/adapter-tests/pom.xml
+++ b/osgi/adapter-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>
diff --git a/osgi/adapter-tests/sdp-management-bundle/pom.xml b/osgi/adapter-tests/sdp-management-bundle/pom.xml
index deae2cf852..90440c2e9b 100644
--- a/osgi/adapter-tests/sdp-management-bundle/pom.xml
+++ b/osgi/adapter-tests/sdp-management-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>sdp-management-bundle</artifactId>
diff --git a/osgi/adapter-tests/test-module-startup/pom.xml b/osgi/adapter-tests/test-module-startup/pom.xml
index a3036bd6ac..4467d51b59 100644
--- a/osgi/adapter-tests/test-module-startup/pom.xml
+++ b/osgi/adapter-tests/test-module-startup/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi-adapter-tests-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>test-module-startup</artifactId>
diff --git a/osgi/adapter/pom.xml b/osgi/adapter/pom.xml
index 0197e100eb..0fb835c3d9 100644
--- a/osgi/adapter/pom.xml
+++ b/osgi/adapter/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>osgi</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>osgi-adapter</artifactId>
     <name>HK2 OSGi Adapter</name>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 150ce34109..20be8e7d88 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>osgi</artifactId>
diff --git a/pom.xml b/pom.xml
index 189b531171..02f5e1b729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-parent</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.1.payara-p1</version>
     <packaging>pom</packaging>
 
     <name>GlassFish HK2</name>
diff --git a/spring-bridge/pom.xml b/spring-bridge/pom.xml
index 06ae6c37bd..6c4c50acbc 100644
--- a/spring-bridge/pom.xml
+++ b/spring-bridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>spring-bridge</artifactId>