From 261f2f5bb1a9c1eada3255f3a5c70a1b84d8af28 Mon Sep 17 00:00:00 2001
From: mertcaliskan <mert.caliskan@payara.fish>
Date: Sun, 2 Dec 2018 23:01:48 +0300
Subject: [PATCH 1/2] 
 PAYARA-3333-Create-maven-properties-for-org.apache.felix-dependencies

---
 nucleus/pom.xml | 52 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index cb2916d0e9a..4be2a410b81 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -316,6 +316,18 @@
         
         <opentracing.version>0.31.0</opentracing.version>
 
+        <org.apache.felix.main.version>5.6.10</org.apache.felix.main.version>
+        <org.apache.felix.webconsole.version>4.3.4</org.apache.felix.webconsole.version>
+        <org.apache.felix.eventadmin.version>1.4.10</org.apache.felix.eventadmin.version>
+        <org.apache.felix.shell.version>1.4.3</org.apache.felix.shell.version>
+        <org.apache.felix.gogo.runtime.version>1.0.10</org.apache.felix.gogo.runtime.version>
+        <org.apache.felix.gogo.shell.version>1.0.0</org.apache.felix.gogo.shell.version>
+        <org.apache.felix.gogo.command.version>1.0.2</org.apache.felix.gogo.command.version>
+        <org.apache.felix.fileinstall.version>3.6.4.payara-p1</org.apache.felix.fileinstall.version>
+        <org.apache.felix.configadmin.version>1.8.16</org.apache.felix.configadmin.version>
+        <org.apache.felix.scr.version>2.0.14</org.apache.felix.scr.version>
+        <org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version>
+
         <!-- Java Business Integration (JBI) is a specification for an approach to implementing a service-oriented architecture (SOA).  -->
         <jbi.version>1.0</jbi.version>
         <glassfish-management-api.version>3.2.1-b002.payara-p1</glassfish-management-api.version>
@@ -1060,66 +1072,66 @@ Parent is ${project.parent}</echo>
                 <version>5.0.0</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId> <!-- OSGi Companion Code for org.osgi.dto Version 1.0.0. -->
+                <artifactId>org.osgi.dto</artifactId>
+                <version>1.0.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.main</artifactId>
-                <version>5.6.10</version>
+                <version>${org.apache.felix.main.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.webconsole</artifactId>
-                <version>4.3.4</version>
+                <version>${org.apache.felix.webconsole.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.eventadmin</artifactId>
-                <version>1.4.10</version>
+                <version>${org.apache.felix.eventadmin.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.shell</artifactId>
-                <version>1.4.3</version>
+                <version>${org.apache.felix.shell.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.gogo.runtime</artifactId>
-                <version>1.0.10</version>
+                <version>${org.apache.felix.gogo.runtime.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>org.apache.felix.gogo.shell</artifactId>
-               <version>1.0.0</version>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.gogo.shell</artifactId>
+                <version>${org.apache.felix.gogo.shell.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>org.apache.felix.gogo.command</artifactId>
-               <version>1.0.2</version>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.gogo.command</artifactId>
+                <version>${org.apache.felix.gogo.command.version}</version>
             </dependency>
             <dependency> <!-- A utility to automatically install bundles from a directory.-->
                <groupId>org.apache.felix</groupId>
                <artifactId>org.apache.felix.fileinstall</artifactId>
-               <version>3.6.4.payara-p1</version>
+                <version>${org.apache.felix.fileinstall.version}</version>
             </dependency>
             <dependency>
                <groupId>org.apache.felix</groupId> <!-- Implementation of the OSGi Configuration Admin Service Specification 1.5  -->
                <artifactId>org.apache.felix.configadmin</artifactId>
-               <version>1.8.16</version>
+                <version>${org.apache.felix.configadmin.version}</version>
             </dependency>
             <dependency>
                <groupId>org.apache.felix</groupId> <!-- Implementation of the Declarative Services specification 1.3 -->
                <artifactId>org.apache.felix.scr</artifactId>
-               <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId> <!-- OSGi Companion Code for org.osgi.dto Version 1.0.0. -->
-                <artifactId>org.osgi.dto</artifactId>
-                <version>1.0.0</version>
+               <version>${org.apache.felix.scr.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId> <!-- Bundle repository service. -->
                 <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>2.0.10</version>
+                <version>${org.apache.felix.bundlerepository.version}</version>
             </dependency>
 
 

From cbea325ddf300b84a3ff2d5842dd2de697120945 Mon Sep 17 00:00:00 2001
From: mertcaliskan <mert.caliskan@payara.fish>
Date: Mon, 3 Dec 2018 18:45:22 +0300
Subject: [PATCH 2/2] PAYARA-3334-Upgrade-org.apache.felix.main-to-6.0.1

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

diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index 4be2a410b81..0763327c4b1 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -316,7 +316,7 @@
         
         <opentracing.version>0.31.0</opentracing.version>
 
-        <org.apache.felix.main.version>5.6.10</org.apache.felix.main.version>
+        <org.apache.felix.main.version>6.0.1</org.apache.felix.main.version>
         <org.apache.felix.webconsole.version>4.3.4</org.apache.felix.webconsole.version>
         <org.apache.felix.eventadmin.version>1.4.10</org.apache.felix.eventadmin.version>
         <org.apache.felix.shell.version>1.4.3</org.apache.felix.shell.version>