You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/10/23 12:39:13 UTC

[1/2] knox git commit: KNOX-1537 - Cleanup gateway-group no value errors

Repository: knox
Updated Branches:
  refs/heads/master 87d7291bd -> ff03a0090


http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-shell-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-shell-release/src/assembly.xml b/gateway-shell-release/src/assembly.xml
index 43e57f5..2445bfa 100644
--- a/gateway-shell-release/src/assembly.xml
+++ b/gateway-shell-release/src/assembly.xml
@@ -68,14 +68,14 @@
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>knoxshell.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:gateway-shell-release</include>
+                <include>org.apache.knox:gateway-shell-release</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>samples</outputDirectory>
             <outputFileNameMapping>hadoop-examples.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:hadoop-examples</include>
+                <include>org.apache.knox:hadoop-examples</include>
             </includes>
         </dependencySet>
     </dependencySets>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-shell/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml
index a930e0f..eb5146a 100644
--- a/gateway-shell/pom.xml
+++ b/gateway-shell/pom.xml
@@ -32,7 +32,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-spi/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml
index 5a6b4de..4571c80 100644
--- a/gateway-spi/pom.xml
+++ b/gateway-spi/pom.xml
@@ -31,19 +31,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-test-release-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/pom.xml b/gateway-test-release-utils/pom.xml
index a518d58..d13ed0c 100644
--- a/gateway-test-release-utils/pom.xml
+++ b/gateway-test-release-utils/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.knox</groupId>
             <artifactId>gateway-release</artifactId>
-            <version>${gateway-version}</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.directory.server</groupId>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-test-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml
index 965507a..087d45c 100644
--- a/gateway-test-release/pom.xml
+++ b/gateway-test-release/pom.xml
@@ -214,7 +214,7 @@
         <dependency>
             <groupId>org.apache.knox</groupId>
             <artifactId>gateway-release</artifactId>
-            <version>${gateway-version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-release-utils</artifactId>
-            <version>${gateway-version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -264,7 +264,7 @@
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
                     <systemPropertyVariables>
-                        <gateway-version>${gateway-version}</gateway-version>
+                        <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-test-release/webhdfs-kerb-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release/webhdfs-kerb-test/pom.xml b/gateway-test-release/webhdfs-kerb-test/pom.xml
index b7c2d55..219bee8 100644
--- a/gateway-test-release/webhdfs-kerb-test/pom.xml
+++ b/gateway-test-release/webhdfs-kerb-test/pom.xml
@@ -51,7 +51,7 @@
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
                     <systemPropertyVariables>
-                        <gateway-version>${gateway-version}</gateway-version>
+                        <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-test-release/webhdfs-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release/webhdfs-test/pom.xml b/gateway-test-release/webhdfs-test/pom.xml
index f369d29..6664013 100644
--- a/gateway-test-release/webhdfs-test/pom.xml
+++ b/gateway-test-release/webhdfs-test/pom.xml
@@ -58,7 +58,7 @@
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
                     <systemPropertyVariables>
-                        <gateway-version>${gateway-version}</gateway-version>
+                        <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index 9280495..8e671fc 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -31,93 +31,93 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-demo-ldap</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-pseudo</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-authc-anon</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-authz-acls</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-preauth</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-shiro</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server-xforwarded-filter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-remoteconfig</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-release</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-vault</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-release-utils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
             <scope>test</scope>
         </dependency>
@@ -307,7 +307,7 @@
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
                     <systemPropertyVariables>
-                        <gateway-version>${gateway-version}</gateway-version>
+                        <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-util-common/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-common/pom.xml b/gateway-util-common/pom.xml
index 04c9325..8fae295 100644
--- a/gateway-util-common/pom.xml
+++ b/gateway-util-common/pom.xml
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
 
@@ -78,7 +78,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-util-configinjector/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/pom.xml b/gateway-util-configinjector/pom.xml
index c692a0b..8bc5652 100755
--- a/gateway-util-configinjector/pom.xml
+++ b/gateway-util-configinjector/pom.xml
@@ -36,7 +36,7 @@
             <artifactId>commons-beanutils</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-util-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-launcher/pom.xml b/gateway-util-launcher/pom.xml
index 3809e05..0105ffd 100644
--- a/gateway-util-launcher/pom.xml
+++ b/gateway-util-launcher/pom.xml
@@ -30,7 +30,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-util-urltemplate/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/pom.xml b/gateway-util-urltemplate/pom.xml
index 46a5b7c..69a1940 100644
--- a/gateway-util-urltemplate/pom.xml
+++ b/gateway-util-urltemplate/pom.xml
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
 
@@ -40,7 +40,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/knox-cli-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/knox-cli-launcher/pom.xml b/knox-cli-launcher/pom.xml
index 6c433a8..bd3b34c 100644
--- a/knox-cli-launcher/pom.xml
+++ b/knox-cli-launcher/pom.xml
@@ -32,7 +32,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index abbd3e2..8ebba5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
     </mailingLists>
 
     <modules>
+        <module>build-tools</module>
         <module>gateway-test-utils</module>
         <module>gateway-util-common</module>
         <module>gateway-util-configinjector</module>
@@ -124,7 +125,6 @@
         <module>gateway-shell-release</module>
         <module>gateway-test-release-utils</module>
         <module>gateway-service-nifi</module>
-        <module>build-tools</module>
     </modules>
 
     <properties>
@@ -132,12 +132,6 @@
              This is also used by forbiddenapis to ensure correct signatures are loaded. -->
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        
-        <gateway-name>Apache Knox</gateway-name>
-        <gateway-project>knox</gateway-project>
-        <gateway-artifact>knox</gateway-artifact>
-        <gateway-version>1.2.0-SNAPSHOT</gateway-version>
-        <gateway-group>org.apache.knox</gateway-group>
 
         <!-- Dependencies sorted alphabetically -->
         <apacheds.version>2.0.0-M24</apacheds.version>
@@ -228,8 +222,8 @@
                                     <goal>single</goal>
                                 </goals>
                                 <configuration>
-                                    <finalName>${gateway-artifact}-${gateway-version}</finalName>
-                                    <outputDirectory>target/${gateway-version}</outputDirectory>
+                                    <finalName>knox-${project.version}</finalName>
+                                    <outputDirectory>target/${project.version}</outputDirectory>
                                     <descriptors>
                                         <descriptor>src/assembly.xml</descriptor>
                                     </descriptors>
@@ -331,7 +325,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <revisionOnScmFailure>${gateway-version}</revisionOnScmFailure>
+                    <revisionOnScmFailure>${project.version}</revisionOnScmFailure>
                 </configuration>
             </plugin>
             <plugin>
@@ -352,7 +346,7 @@
                         org.apache.knox.test.category.SlowTests,org.apache.knox.test.category.ManualTests,org.apache.knox.test.category.VerifyTest,org.apache.knox.test.category.ReleaseTest
                     </excludedGroups>
                     <systemPropertyVariables>
-                        <gateway-version>${gateway-version}</gateway-version>
+                        <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -426,7 +420,7 @@
                     <dependency>
                         <groupId>org.apache.knox</groupId>
                         <artifactId>build-tools</artifactId>
-                        <version>${project.version}</version>
+                        <version>1.0.0</version>
                     </dependency>
                     <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
                     <dependency>
@@ -492,7 +486,7 @@
                     <dependency>
                         <groupId>org.apache.knox</groupId>
                         <artifactId>build-tools</artifactId>
-                        <version>${project.version}</version>
+                        <version>1.0.0</version>
                     </dependency>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
@@ -567,304 +561,304 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-util-common</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-util-configinjector</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-util-launcher</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-util-urltemplate</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-i18n</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-i18n-logging-sl4j</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-i18n-logging-log4j</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-spi</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-jwt</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-pac4j</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-webappsec</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-preauth</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-hadoopauth</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-authc-anon</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-shiro</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-security-authz-acls</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-common</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-concat</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-pseudo</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-hadoop-groups</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-regex</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-identity-assertion-switchcase</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite-func-inbound-query-param</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-rewrite-step-encrypt-uri</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-jersey</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-provider-ha</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-tgs</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-vault</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-knoxssout</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-knoxsso</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-knoxtoken</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-health</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-admin</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-remoteconfig</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-test</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-as</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-hbase</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-hive</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-webhdfs</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-rm</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-storm</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-definitions</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-service-nifi</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-server</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-server-launcher</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-server-xforwarded-filter</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>knox-cli-launcher</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-shell</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-shell-launcher</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-adapter</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>hadoop-examples</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-discovery-ambari</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-release</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-applications</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-shell-release</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-shell-samples</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
@@ -1395,14 +1389,14 @@
             </dependency>
 
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-demo-ldap</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-demo-ldap-launcher</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
             </dependency>
             
             <dependency>
@@ -1513,9 +1507,9 @@
             <!-- ********** ********** ********** ********** ********** ********** -->
 
             <dependency>
-                <groupId>${gateway-group}</groupId>
+                <groupId>org.apache.knox</groupId>
                 <artifactId>gateway-test-utils</artifactId>
-                <version>${gateway-version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
 


[2/2] knox git commit: KNOX-1537 - Cleanup gateway-group no value errors

Posted by kr...@apache.org.
KNOX-1537 - Cleanup gateway-group no value errors

Signed-off-by: Kevin Risden <kr...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/ff03a009
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/ff03a009
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/ff03a009

Branch: refs/heads/master
Commit: ff03a00902ff73cf7a707e4331130bbb759e5760
Parents: 87d7291
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Oct 22 14:12:42 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Oct 22 17:03:05 2018 -0400

----------------------------------------------------------------------
 build-tools/pom.xml                             |   5 +-
 gateway-adapter/pom.xml                         |   8 +-
 gateway-demo-ldap-launcher/pom.xml              |   2 +-
 gateway-demo-ldap/pom.xml                       |   2 +-
 gateway-discovery-ambari/pom.xml                |  10 +-
 gateway-i18n-logging-log4j/pom.xml              |   4 +-
 gateway-i18n-logging-sl4j/pom.xml               |   4 +-
 gateway-i18n/pom.xml                            |   2 +-
 gateway-provider-ha/pom.xml                     |  12 +-
 .../pom.xml                                     |  12 +-
 .../pom.xml                                     |   8 +-
 .../pom.xml                                     |   8 +-
 .../pom.xml                                     |  10 +-
 .../pom.xml                                     |   6 +-
 .../pom.xml                                     |   6 +-
 gateway-provider-jersey/pom.xml                 |   6 +-
 .../pom.xml                                     |  10 +-
 .../pom.xml                                     |  10 +-
 .../pom.xml                                     |  14 +-
 .../pom.xml                                     |  16 +-
 .../pom.xml                                     |  16 +-
 gateway-provider-rewrite/pom.xml                |  12 +-
 gateway-provider-security-authc-anon/pom.xml    |   4 +-
 gateway-provider-security-authz-acls/pom.xml    |   6 +-
 gateway-provider-security-hadoopauth/pom.xml    |   8 +-
 gateway-provider-security-jwt/pom.xml           |   6 +-
 gateway-provider-security-pac4j/pom.xml         |   8 +-
 gateway-provider-security-preauth/pom.xml       |   6 +-
 gateway-provider-security-shiro/pom.xml         |   8 +-
 gateway-provider-security-webappsec/pom.xml     |   6 +-
 gateway-release/pom.xml                         | 108 ++++----
 gateway-release/src/assembly.xml                |  28 +-
 gateway-server-launcher/pom.xml                 |   2 +-
 gateway-server-xforwarded-filter/pom.xml        |   2 +-
 gateway-server/pom.xml                          |  16 +-
 .../src/main/resources/build.properties         |   2 +-
 gateway-service-admin/pom.xml                   |   8 +-
 gateway-service-as/pom.xml                      |   4 +-
 gateway-service-hbase/pom.xml                   |   6 +-
 gateway-service-health/pom.xml                  |  10 +-
 gateway-service-hive/pom.xml                    |  10 +-
 gateway-service-knoxsso/pom.xml                 |  10 +-
 gateway-service-knoxssout/pom.xml               |  10 +-
 gateway-service-knoxtoken/pom.xml               |  10 +-
 gateway-service-nifi/pom.xml                    |   6 +-
 gateway-service-remoteconfig/pom.xml            |   6 +-
 gateway-service-rm/pom.xml                      |  12 +-
 gateway-service-storm/pom.xml                   |   6 +-
 gateway-service-test/pom.xml                    |   6 +-
 gateway-service-tgs/pom.xml                     |   4 +-
 gateway-service-vault/pom.xml                   |   6 +-
 gateway-service-webhdfs/pom.xml                 |  14 +-
 gateway-shell-launcher/pom.xml                  |   2 +-
 gateway-shell-release/pom.xml                   |  26 +-
 gateway-shell-release/src/assembly.xml          |   4 +-
 gateway-shell/pom.xml                           |   2 +-
 gateway-spi/pom.xml                             |   8 +-
 gateway-test-release-utils/pom.xml              |   2 +-
 gateway-test-release/pom.xml                    |   6 +-
 gateway-test-release/webhdfs-kerb-test/pom.xml  |   2 +-
 gateway-test-release/webhdfs-test/pom.xml       |   2 +-
 gateway-test/pom.xml                            |  38 +--
 gateway-util-common/pom.xml                     |   4 +-
 gateway-util-configinjector/pom.xml             |   2 +-
 gateway-util-launcher/pom.xml                   |   2 +-
 gateway-util-urltemplate/pom.xml                |   4 +-
 knox-cli-launcher/pom.xml                       |   2 +-
 pom.xml                                         | 272 +++++++++----------
 68 files changed, 447 insertions(+), 452 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index fb8f312..b91e281 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -23,11 +23,12 @@
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>21</version>
+        <relativePath></relativePath>
     </parent>
     
     <groupId>org.apache.knox</groupId>
     <artifactId>build-tools</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <name>build-tools</name>
     <description>The Apache Knox Project Build Tools</description>
@@ -55,4 +56,4 @@
             <archive>https://mail-archives.apache.org/mod_mbox/knox-dev/</archive>
         </mailingList>
     </mailingLists>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-adapter/pom.xml b/gateway-adapter/pom.xml
index f562a68..8379642 100644
--- a/gateway-adapter/pom.xml
+++ b/gateway-adapter/pom.xml
@@ -31,19 +31,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-demo-ldap-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-demo-ldap-launcher/pom.xml b/gateway-demo-ldap-launcher/pom.xml
index 9c75df9..e7a85de 100644
--- a/gateway-demo-ldap-launcher/pom.xml
+++ b/gateway-demo-ldap-launcher/pom.xml
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-demo-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-demo-ldap/pom.xml b/gateway-demo-ldap/pom.xml
index 704ee20..38a9645 100644
--- a/gateway-demo-ldap/pom.xml
+++ b/gateway-demo-ldap/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-discovery-ambari/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/pom.xml b/gateway-discovery-ambari/pom.xml
index d2a8080..3d972cb 100644
--- a/gateway-discovery-ambari/pom.xml
+++ b/gateway-discovery-ambari/pom.xml
@@ -31,19 +31,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
 
@@ -66,7 +66,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-i18n-logging-log4j/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-i18n-logging-log4j/pom.xml b/gateway-i18n-logging-log4j/pom.xml
index b0cf44c..9097c87 100644
--- a/gateway-i18n-logging-log4j/pom.xml
+++ b/gateway-i18n-logging-log4j/pom.xml
@@ -36,12 +36,12 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-i18n-logging-sl4j/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-i18n-logging-sl4j/pom.xml b/gateway-i18n-logging-sl4j/pom.xml
index 3c6e58a..aa11444 100644
--- a/gateway-i18n-logging-sl4j/pom.xml
+++ b/gateway-i18n-logging-sl4j/pom.xml
@@ -36,12 +36,12 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-i18n/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-i18n/pom.xml b/gateway-i18n/pom.xml
index 4887637..33903cc 100644
--- a/gateway-i18n/pom.xml
+++ b/gateway-i18n/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-ha/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/pom.xml b/gateway-provider-ha/pom.xml
index 625861f..e55d38e 100644
--- a/gateway-provider-ha/pom.xml
+++ b/gateway-provider-ha/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
         
@@ -124,7 +124,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-common/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml
index f5610d3..3e8b33b 100644
--- a/gateway-provider-identity-assertion-common/pom.xml
+++ b/gateway-provider-identity-assertion-common/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
 
@@ -84,7 +84,7 @@
 
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-concat/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-concat/pom.xml b/gateway-provider-identity-assertion-concat/pom.xml
index acb06d4..6577f80 100644
--- a/gateway-provider-identity-assertion-concat/pom.xml
+++ b/gateway-provider-identity-assertion-concat/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
 
@@ -53,7 +53,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-hadoop-groups/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/pom.xml b/gateway-provider-identity-assertion-hadoop-groups/pom.xml
index ad98a29..8d6c213 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/pom.xml
+++ b/gateway-provider-identity-assertion-hadoop-groups/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
 
@@ -63,7 +63,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-pseudo/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/pom.xml b/gateway-provider-identity-assertion-pseudo/pom.xml
index 887b61e..3313f5d 100644
--- a/gateway-provider-identity-assertion-pseudo/pom.xml
+++ b/gateway-provider-identity-assertion-pseudo/pom.xml
@@ -30,19 +30,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 
@@ -62,7 +62,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-regex/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-regex/pom.xml b/gateway-provider-identity-assertion-regex/pom.xml
index e892a59..dba6374 100644
--- a/gateway-provider-identity-assertion-regex/pom.xml
+++ b/gateway-provider-identity-assertion-regex/pom.xml
@@ -30,11 +30,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
 
@@ -49,7 +49,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-identity-assertion-switchcase/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-switchcase/pom.xml b/gateway-provider-identity-assertion-switchcase/pom.xml
index ff0b5f4..e925ce4 100644
--- a/gateway-provider-identity-assertion-switchcase/pom.xml
+++ b/gateway-provider-identity-assertion-switchcase/pom.xml
@@ -30,11 +30,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
 
@@ -44,7 +44,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-jersey/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-jersey/pom.xml b/gateway-provider-jersey/pom.xml
index c3f6369..49089e9 100644
--- a/gateway-provider-jersey/pom.xml
+++ b/gateway-provider-jersey/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
 
@@ -63,13 +63,13 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite-func-hostmap-static/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/pom.xml b/gateway-provider-rewrite-func-hostmap-static/pom.xml
index f0044fd..af74af5 100644
--- a/gateway-provider-rewrite-func-hostmap-static/pom.xml
+++ b/gateway-provider-rewrite-func-hostmap-static/pom.xml
@@ -31,19 +31,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
 
@@ -74,7 +74,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite-func-inbound-query-param/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-inbound-query-param/pom.xml b/gateway-provider-rewrite-func-inbound-query-param/pom.xml
index 363dba5..5684c21 100644
--- a/gateway-provider-rewrite-func-inbound-query-param/pom.xml
+++ b/gateway-provider-rewrite-func-inbound-query-param/pom.xml
@@ -28,19 +28,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
 
@@ -71,7 +71,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite-func-service-registry/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml
index 1f15dad..4f38f85 100644
--- a/gateway-provider-rewrite-func-service-registry/pom.xml
+++ b/gateway-provider-rewrite-func-service-registry/pom.xml
@@ -31,27 +31,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n-logging-log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
 
@@ -74,7 +74,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite-step-encrypt-uri/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-encrypt-uri/pom.xml b/gateway-provider-rewrite-step-encrypt-uri/pom.xml
index 3fd95a0..0d70f4c 100644
--- a/gateway-provider-rewrite-step-encrypt-uri/pom.xml
+++ b/gateway-provider-rewrite-step-encrypt-uri/pom.xml
@@ -31,27 +31,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n-logging-log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 
@@ -70,7 +70,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
@@ -81,7 +81,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite-step-secure-query/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/pom.xml b/gateway-provider-rewrite-step-secure-query/pom.xml
index dc575bb..a4c6ba4 100644
--- a/gateway-provider-rewrite-step-secure-query/pom.xml
+++ b/gateway-provider-rewrite-step-secure-query/pom.xml
@@ -31,27 +31,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n-logging-log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 
@@ -70,13 +70,13 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-rewrite/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index 926a5d6..200e43a 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n-logging-log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
 
@@ -122,7 +122,7 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-authc-anon/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authc-anon/pom.xml b/gateway-provider-security-authc-anon/pom.xml
index 3972b18..de6cfea 100755
--- a/gateway-provider-security-authc-anon/pom.xml
+++ b/gateway-provider-security-authc-anon/pom.xml
@@ -30,11 +30,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-authz-acls/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/pom.xml b/gateway-provider-security-authz-acls/pom.xml
index 53386b0..84f8040 100644
--- a/gateway-provider-security-authz-acls/pom.xml
+++ b/gateway-provider-security-authz-acls/pom.xml
@@ -29,15 +29,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-hadoopauth/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-hadoopauth/pom.xml b/gateway-provider-security-hadoopauth/pom.xml
index 3353b68..5191576 100755
--- a/gateway-provider-security-hadoopauth/pom.xml
+++ b/gateway-provider-security-hadoopauth/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         
@@ -80,7 +80,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-jwt/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/pom.xml b/gateway-provider-security-jwt/pom.xml
index 974209c..6616ea6 100644
--- a/gateway-provider-security-jwt/pom.xml
+++ b/gateway-provider-security-jwt/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-pac4j/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/pom.xml b/gateway-provider-security-pac4j/pom.xml
index e2de91e..f03b68c 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -37,19 +37,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-preauth/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/pom.xml b/gateway-provider-security-preauth/pom.xml
index aae1d89..a4f0012 100644
--- a/gateway-provider-security-preauth/pom.xml
+++ b/gateway-provider-security-preauth/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/pom.xml b/gateway-provider-security-shiro/pom.xml
index b80c045..5a2976e 100644
--- a/gateway-provider-security-shiro/pom.xml
+++ b/gateway-provider-security-shiro/pom.xml
@@ -30,19 +30,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-provider-security-webappsec/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/pom.xml b/gateway-provider-security-webappsec/pom.xml
index d5623af..574edd4 100644
--- a/gateway-provider-security-webappsec/pom.xml
+++ b/gateway-provider-security-webappsec/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 1b92937..da02ebf 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -43,8 +43,8 @@
                                 <phase>package</phase>
                                 <goals><goal>single</goal></goals>
                                 <configuration>
-                                    <finalName>${gateway-artifact}-${gateway-version}</finalName>
-                                    <outputDirectory>../target/${gateway-version}</outputDirectory>
+                                    <finalName>knox-${project.version}</finalName>
+                                    <outputDirectory>../target/${project.version}</outputDirectory>
                                     <appendAssemblyId>false</appendAssemblyId>
                                     <descriptors>
                                         <descriptor>src/assembly.xml</descriptor>
@@ -63,13 +63,13 @@
                                 <configuration>
                                     <tasks>
                                         <checksum algorithm="MD5" fileext=".md5">
-                                            <fileset dir="../target/${gateway-version}">
+                                            <fileset dir="../target/${project.version}">
                                                 <include name="*.zip" />
                                                 <include name="*.tar.gz" />
                                             </fileset>
                                         </checksum>
                                         <checksum algorithm="SHA1" fileext=".sha1">
-                                            <fileset dir="../target/${gateway-version}">
+                                            <fileset dir="../target/${project.version}">
                                                 <include name="*.zip" />
                                                 <include name="*.tar.gz" />
                                             </fileset>
@@ -105,7 +105,7 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>${gateway-group}</groupId>
+                                            <groupId>org.apache.knox</groupId>
                                             <artifactId>gateway-service-definitions</artifactId>
                                             <type>jar</type>
                                             <overWrite>true</overWrite>
@@ -113,7 +113,7 @@
                                             <includes>services/**/*</includes>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>${gateway-group}</groupId>
+                                            <groupId>org.apache.knox</groupId>
                                             <artifactId>gateway-applications</artifactId>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
@@ -121,7 +121,7 @@
                                             <includes>applications/**/*</includes>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>${gateway-group}</groupId>
+                                            <groupId>org.apache.knox</groupId>
                                             <artifactId>gateway-shell-samples</artifactId>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
@@ -141,195 +141,195 @@
     <dependencies>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>knox-cli-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-server-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-admin</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-test</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-as</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-hbase</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-hive</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-webhdfs</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-rm</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-storm</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-tgs</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-knoxsso</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-knoxssout</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-knoxtoken</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-health</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-service-nifi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite-step-encrypt-uri</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite-func-inbound-query-param</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-shiro</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-jwt</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-pac4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-webappsec</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-preauth</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-hadoopauth</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-authc-anon</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-security-authz-acls</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-concat</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-pseudo</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-hadoop-groups</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-regex</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-identity-assertion-switchcase</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>hadoop-examples</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell-launcher</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-demo-ldap</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-demo-ldap-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-applications</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell-samples</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-discovery-ambari</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-adapter</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index af6237f..dce4fed 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -91,58 +91,58 @@
             -->
             <scope>runtime</scope>
             <excludes>
-                <exclude>${gateway-group}:gateway-*</exclude>
-                <exclude>${gateway-group}:hadoop-examples</exclude>
+                <exclude>org.apache.knox:gateway-*</exclude>
+                <exclude>org.apache.knox:hadoop-examples</exclude>
                 <exclude>org.apache.kerby:*</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>${gateway-group}:gateway-*</include>
-                <!-- include>${gateway-group}:gateway-release-*</include -->
+                <include>org.apache.knox:gateway-*</include>
+                <!-- include>org.apache.knox:gateway-release-*</include -->
             </includes>
             <excludes>
-                <exclude>${gateway-group}:gateway-util-launcher</exclude>
-                <exclude>${gateway-group}:gateway-server-launcher</exclude>
-                <exclude>${gateway-group}:gateway-shell-launcher</exclude>
-                <exclude>${gateway-group}:gateway-demo-ldap-launcher</exclude>
-                <exclude>${gateway-group}:gateway-applications</exclude>
+                <exclude>org.apache.knox:gateway-util-launcher</exclude>
+                <exclude>org.apache.knox:gateway-server-launcher</exclude>
+                <exclude>org.apache.knox:gateway-shell-launcher</exclude>
+                <exclude>org.apache.knox:gateway-demo-ldap-launcher</exclude>
+                <exclude>org.apache.knox:gateway-applications</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>knoxcli.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:knox-cli-launcher</include>
+                <include>org.apache.knox:knox-cli-launcher</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>gateway.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:gateway-server-launcher</include>
+                <include>org.apache.knox:gateway-server-launcher</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shell.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:gateway-shell-launcher</include>
+                <include>org.apache.knox:gateway-shell-launcher</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>ldap.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:gateway-demo-ldap-launcher</include>
+                <include>org.apache.knox:gateway-demo-ldap-launcher</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>samples</outputDirectory>
             <outputFileNameMapping>hadoop-examples.jar</outputFileNameMapping>
             <includes>
-                <include>${gateway-group}:hadoop-examples</include>
+                <include>org.apache.knox:hadoop-examples</include>
             </includes>
         </dependencySet>
     </dependencySets>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-server-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-server-launcher/pom.xml b/gateway-server-launcher/pom.xml
index a0da119..b7d97a6 100644
--- a/gateway-server-launcher/pom.xml
+++ b/gateway-server-launcher/pom.xml
@@ -32,7 +32,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-server-xforwarded-filter/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-server-xforwarded-filter/pom.xml b/gateway-server-xforwarded-filter/pom.xml
index 9e1c8a2..421e06b 100644
--- a/gateway-server-xforwarded-filter/pom.xml
+++ b/gateway-server-xforwarded-filter/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-server/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
index 2f5b597..1e04a25 100644
--- a/gateway-server/pom.xml
+++ b/gateway-server/pom.xml
@@ -63,27 +63,27 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n-logging-log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-urltemplate</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 
@@ -345,13 +345,13 @@
         <!-- ********** ********** ********** ********** ********** ********** -->
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-demo-ldap</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-server/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/resources/build.properties b/gateway-server/src/main/resources/build.properties
index a380579..88b7f7d 100644
--- a/gateway-server/src/main/resources/build.properties
+++ b/gateway-server/src/main/resources/build.properties
@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-build.version=${gateway-version}
+build.version=${project.version}
 build.hash=${buildNumber}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-admin/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-admin/pom.xml b/gateway-service-admin/pom.xml
index 4e9d5be..cef6c8d 100644
--- a/gateway-service-admin/pom.xml
+++ b/gateway-service-admin/pom.xml
@@ -30,19 +30,19 @@
     
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-as/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-as/pom.xml b/gateway-service-as/pom.xml
index 3f0491d..ad31042 100644
--- a/gateway-service-as/pom.xml
+++ b/gateway-service-as/pom.xml
@@ -31,11 +31,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-hbase/pom.xml b/gateway-service-hbase/pom.xml
index 5015474..557953c 100644
--- a/gateway-service-hbase/pom.xml
+++ b/gateway-service-hbase/pom.xml
@@ -31,11 +31,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 
@@ -45,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-health/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-health/pom.xml b/gateway-service-health/pom.xml
index 5edabf9..7c3214a 100644
--- a/gateway-service-health/pom.xml
+++ b/gateway-service-health/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-hive/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-hive/pom.xml b/gateway-service-hive/pom.xml
index 5171891..85de33f 100644
--- a/gateway-service-hive/pom.xml
+++ b/gateway-service-hive/pom.xml
@@ -31,19 +31,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
 
@@ -58,7 +58,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-knoxsso/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-knoxsso/pom.xml b/gateway-service-knoxsso/pom.xml
index bc4473a..735b4bb 100644
--- a/gateway-service-knoxsso/pom.xml
+++ b/gateway-service-knoxsso/pom.xml
@@ -30,23 +30,23 @@
     
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-knoxssout/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-knoxssout/pom.xml b/gateway-service-knoxssout/pom.xml
index c6ebc43..52be492 100644
--- a/gateway-service-knoxssout/pom.xml
+++ b/gateway-service-knoxssout/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-knoxtoken/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-knoxtoken/pom.xml b/gateway-service-knoxtoken/pom.xml
index 9b29ccc..010ccc1 100644
--- a/gateway-service-knoxtoken/pom.xml
+++ b/gateway-service-knoxtoken/pom.xml
@@ -30,23 +30,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-nifi/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-nifi/pom.xml b/gateway-service-nifi/pom.xml
index dc96450..337255a 100644
--- a/gateway-service-nifi/pom.xml
+++ b/gateway-service-nifi/pom.xml
@@ -31,15 +31,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-remoteconfig/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-remoteconfig/pom.xml b/gateway-service-remoteconfig/pom.xml
index b740010..96808f9 100644
--- a/gateway-service-remoteconfig/pom.xml
+++ b/gateway-service-remoteconfig/pom.xml
@@ -31,11 +31,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
 
@@ -62,7 +62,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-rm/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-rm/pom.xml b/gateway-service-rm/pom.xml
index 58a12b1..0213081 100644
--- a/gateway-service-rm/pom.xml
+++ b/gateway-service-rm/pom.xml
@@ -29,23 +29,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
 
@@ -69,7 +69,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-storm/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-storm/pom.xml b/gateway-service-storm/pom.xml
index 0b54592..2baa31d 100644
--- a/gateway-service-storm/pom.xml
+++ b/gateway-service-storm/pom.xml
@@ -31,11 +31,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
@@ -43,7 +43,7 @@
             <artifactId>httpclient</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-test/pom.xml b/gateway-service-test/pom.xml
index 4c9ee3c..b90e897 100644
--- a/gateway-service-test/pom.xml
+++ b/gateway-service-test/pom.xml
@@ -30,15 +30,15 @@
     
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-tgs/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-tgs/pom.xml b/gateway-service-tgs/pom.xml
index 2a441f3..c012b79 100644
--- a/gateway-service-tgs/pom.xml
+++ b/gateway-service-tgs/pom.xml
@@ -31,11 +31,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-vault/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-vault/pom.xml b/gateway-service-vault/pom.xml
index e24a891..1448949 100644
--- a/gateway-service-vault/pom.xml
+++ b/gateway-service-vault/pom.xml
@@ -30,15 +30,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-jersey</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-service-webhdfs/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/pom.xml b/gateway-service-webhdfs/pom.xml
index 19bf97b..d525a2d 100644
--- a/gateway-service-webhdfs/pom.xml
+++ b/gateway-service-webhdfs/pom.xml
@@ -31,27 +31,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-i18n</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-rewrite</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-provider-ha</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-configinjector</artifactId>
         </dependency>
 
@@ -75,7 +75,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-test-utils</artifactId>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-shell-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell-launcher/pom.xml b/gateway-shell-launcher/pom.xml
index 7d76a68..30834b3 100644
--- a/gateway-shell-launcher/pom.xml
+++ b/gateway-shell-launcher/pom.xml
@@ -32,7 +32,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-util-launcher</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/knox/blob/ff03a009/gateway-shell-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell-release/pom.xml b/gateway-shell-release/pom.xml
index 18cbcba..19544fe 100644
--- a/gateway-shell-release/pom.xml
+++ b/gateway-shell-release/pom.xml
@@ -67,8 +67,8 @@
                                 <phase>package</phase>
                                 <goals><goal>single</goal></goals>
                                 <configuration>
-                                    <finalName>knoxshell-${gateway-version}</finalName>
-                                    <outputDirectory>../target/${gateway-version}</outputDirectory>
+                                    <finalName>knoxshell-${project.version}</finalName>
+                                    <outputDirectory>../target/${project.version}</outputDirectory>
                                     <appendAssemblyId>false</appendAssemblyId>
                                     <descriptors>
                                         <descriptor>src/assembly.xml</descriptor>
@@ -87,15 +87,15 @@
                                 <configuration>
                                     <tasks>
                                         <checksum algorithm="MD5" fileext=".md5">
-                                            <fileset dir="../target/${gateway-version}">
-                                                <include name="knoxshell-${gateway-version}.zip" />
-                                                <include name="knoxshell-${gateway-version}.tar.gz" />
+                                            <fileset dir="../target/${project.version}">
+                                                <include name="knoxshell-${project.version}.zip" />
+                                                <include name="knoxshell-${project.version}.tar.gz" />
                                             </fileset>
                                         </checksum>
                                         <checksum algorithm="SHA1" fileext=".sha1">
-                                            <fileset dir="../target/${gateway-version}">
-                                                <include name="knoxshell-${gateway-version}.zip" />
-                                                <include name="knoxshell-${gateway-version}.tar.gz" />
+                                            <fileset dir="../target/${project.version}">
+                                                <include name="knoxshell-${project.version}.zip" />
+                                                <include name="knoxshell-${project.version}.tar.gz" />
                                             </fileset>
                                         </checksum>
                                     </tasks>
@@ -129,7 +129,7 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>${gateway-group}</groupId>
+                                            <groupId>org.apache.knox</groupId>
                                             <artifactId>gateway-shell-samples</artifactId>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
@@ -148,19 +148,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell-launcher</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>gateway-shell-samples</artifactId>
         </dependency>
         <dependency>
-            <groupId>${gateway-group}</groupId>
+            <groupId>org.apache.knox</groupId>
             <artifactId>hadoop-examples</artifactId>
         </dependency>
         <dependency>