knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject git commit: KNOX-289: Remove incubting/incubator from source and build.
Date Mon, 03 Mar 2014 23:12:11 GMT
Repository: knox
Updated Branches:
  refs/heads/master 3b4a5e8d4 -> 210c94e74


KNOX-289: Remove incubting/incubator from source and build.


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

Branch: refs/heads/master
Commit: 210c94e742fb64570094ee9cb96a00a963315462
Parents: 3b4a5e8
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Mon Mar 3 10:16:50 2014 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Mon Mar 3 18:11:44 2014 -0500

----------------------------------------------------------------------
 DISCLAIMER                       | 15 --------
 README                           |  8 ++--
 build.xml                        | 70 +++++++++++++++++------------------
 gateway-release/src/assembly.xml |  1 -
 hsso-release/pom.xml             |  2 +-
 pom.xml                          |  8 ++--
 src/vote.txt                     |  4 +-
 7 files changed, 46 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 9054bca..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Knox is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC. 
-
-Incubation is required of all newly accepted projects until a further review 
-indicates that the infrastructure, communications, and decision making process 
-have stabilized in a manner consistent with other successful ASF projects. 
-
-While incubation status is not necessarily a reflection of the completeness 
-or stability of the code, it does indicate that the project has yet to be 
-fully endorsed by the ASF.
-
-For more information about the incubation status of the Apache Knox project you
-can go to the following page:
-
-http://incubator.apache.org/projects/knox.html

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/README
----------------------------------------------------------------------
diff --git a/README b/README
index b27cc8d..488fa7c 100644
--- a/README
+++ b/README
@@ -65,17 +65,17 @@ Please see the ISSUES file.
 Installation
 ------------------------------------------------------------------------------
 Please see the Apache Knox Gateway User's Guide for details.
-http://knox.incubator.apache.org/books/knox-incubating-0-3-0/knox-incubating-0-3-0.html#Getting+Started
+http://knox.apache.org/books/knox-0-4-0/knox-0-4-0.html#Getting+Started
 
 ------------------------------------------------------------------------------
 Examples
 ------------------------------------------------------------------------------
 Please see the Apache Knox Gateway User's Guide for detailed examples.
-http://knox.incubator.apache.org/books/knox-incubating-0-3-0/knox-incubating-0-3-0.html#Basic+Usage
-http://knox.incubator.apache.org/books/knox-incubating-0-3-0/knox-incubating-0-3-0.html#Service+Details
+http://knox.apache.org/books/knox-0-4-0/knox-0-4-0.html#Basic+Usage
+http://knox.apache.org/books/knox-0-4-0/knox-0-4-0.html#Service+Details
 
 ------------------------------------------------------------------------------
 Troubleshooting & Filing bugs
 ------------------------------------------------------------------------------
 Please see the Apache Knox Gateway User's Guide for detailed information.
-http://knox.incubator.apache.org/books/knox-incubating-0-3-0/knox-incubating-0-3-0.html#Troubleshooting
+http://knox.apache.org/books/knox-0-4-0/knox-0-4-0.html#Troubleshooting

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1ca816a..b843554 100644
--- a/build.xml
+++ b/build.xml
@@ -21,9 +21,9 @@
         Release build file for the Apache Knox Gateway
     </description>
 
-    <property name="gateway-name" value="Apache Knox (Incubator)"/>
+    <property name="gateway-name" value="Apache Knox"/>
     <property name="gateway-project" value="knox"/>
-    <property name="gateway-artifact" value="knox-incubating"/>
+    <property name="gateway-artifact" value="knox"/>
     <property name="gateway-version" value="0.4.0-SNAPSHOT"/>
     <property name="release-manager" value="kminder"/>
 
@@ -34,8 +34,8 @@
     <property name="install.dir" value="install"/>
     <property name="candidate.dir" value="candidate"/>
 
-    <property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/incubator/${gateway-project}"
/>
-    <property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/incubator/${gateway-project}"
/>
+    <property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/${gateway-project}"
/>
+    <property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/${gateway-project}"
/>
 
     <condition property="isUnix">
         <os family="unix"/>
@@ -142,18 +142,18 @@
     <target name="download-candidate">
         <mkdir dir="${candidate.dir}"/>
         <get dest="${candidate.dir}">
-            <url url="${build-url}/knox-incubating-${gateway-version}.zip"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.zip.md5"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.zip.sha"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip.md5"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip.sha"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz.md5"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz.sha"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.rpm"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.rpm.md5"/>
-            <url url="${build-url}/knox-incubating-${gateway-version}.rpm.sha"/>
+            <url url="${build-url}/knox-${gateway-version}.zip"/>
+            <url url="${build-url}/knox-${gateway-version}.zip.md5"/>
+            <url url="${build-url}/knox-${gateway-version}.zip.sha"/>
+            <url url="${build-url}/knox-${gateway-version}-src.zip"/>
+            <url url="${build-url}/knox-${gateway-version}-src.zip.md5"/>
+            <url url="${build-url}/knox-${gateway-version}-src.zip.sha"/>
+            <url url="${build-url}/knox-${gateway-version}.tar.gz"/>
+            <url url="${build-url}/knox-${gateway-version}.tar.gz.md5"/>
+            <url url="${build-url}/knox-${gateway-version}.tar.gz.sha"/>
+            <url url="${build-url}/knox-${gateway-version}.rpm"/>
+            <url url="${build-url}/knox-${gateway-version}.rpm.md5"/>
+            <url url="${build-url}/knox-${gateway-version}.rpm.sha"/>
             <url url="${build-url}/CHANGES"/>
         </get>
     </target>
@@ -161,24 +161,24 @@
     <target name="download-stage">
         <mkdir dir="${install.dir}"/>
         <get dest="${install.dir}">
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.zip"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.zip.md5"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.zip.sha"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.zip.asc"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}-src.zip"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}-src.zip.md5"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}-src.zip.sha"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}-src.zip.asc"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.tar.gz"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.tar.gz.md5"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.tar.gz.sha"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.tar.gz.asc"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.rpm"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.rpm.md5"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.rpm.sha"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/knox-incubating-${gateway-version}.rpm.asc"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/CHANGES"/>
-            <url url="${svn.staging.path}/knox-incubating-${gateway-version}/KEYS"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.md5"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.sha"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.asc"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.md5"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.sha"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.asc"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.md5"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.sha"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.asc"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.md5"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.sha"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.rpm.asc"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/CHANGES"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/KEYS"/>
         </get>
     </target>
 
@@ -292,7 +292,7 @@
         <exec executable="svn">
             <arg value="move"/>
             <arg value="${svn.staging.path}/${gateway-artifact}-${gateway-version}"/>
-            <arg value="${svn.release.path}/${gateway-version}-incubating"/>
+            <arg value="${svn.release.path}/${gateway-version}"/>
             <arg value="-m"/>
             <arg value="Releasing Apache Knox Gateway version ${gateway-version}." />
         </exec>

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index 56d58d2..9a46f39 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -51,7 +51,6 @@
             <outputDirectory></outputDirectory>
             <includes>
                 <include>CHANGES</include>
-                <include>DISCLAIMER</include>
                 <include>ISSUES</include>
                 <include>LICENSE</include>
                 <include>NOTICE</include>

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/hsso-release/pom.xml
----------------------------------------------------------------------
diff --git a/hsso-release/pom.xml b/hsso-release/pom.xml
index 14c046b..8102e3c 100644
--- a/hsso-release/pom.xml
+++ b/hsso-release/pom.xml
@@ -52,7 +52,7 @@
                                 <phase>package</phase>
                                 <goals><goal>single</goal></goals>
                                 <configuration>
-                                    <finalName>hsso-incubating-${gateway-version}</finalName>
+                                    <finalName>hsso-${gateway-version}</finalName>
                                     <outputDirectory>../target/${gateway-version}</outputDirectory>
                                     <appendAssemblyId>false</appendAssemblyId>
                                     <descriptors>

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d544b6b..205dd63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <name>gateway</name>
     <description>The Apache Knox Project</description>
-    <url>http://knox.incubator.apache.org/</url>
+    <url>http://knox.apache.org/</url>
 
     <modules>
         <module>gateway-test-utils</module>
@@ -72,9 +72,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <internal.maven.repo>file:///tmp/knoxtemprepo</internal.maven.repo>
-        <gateway-name>Apache Knox (Incubator)</gateway-name>
+        <gateway-name>Apache Knox</gateway-name>
         <gateway-project>knox</gateway-project>
-        <gateway-artifact>knox-incubating</gateway-artifact>
+        <gateway-artifact>knox</gateway-artifact>
         <gateway-version>0.4.0-SNAPSHOT</gateway-version>
         <gateway-group>org.apache.hadoop</gateway-group>
         <hadoop-version>2.2.0</hadoop-version>
@@ -95,7 +95,7 @@
     </organization>
 
     <scm>
-        <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-knox.git</connection>
+        <connection>scm:git:git://git-wip-us.apache.org/repos/asf/knox.git</connection>
     </scm>
 
     <distributionManagement>

http://git-wip-us.apache.org/repos/asf/knox/blob/210c94e7/src/vote.txt
----------------------------------------------------------------------
diff --git a/src/vote.txt b/src/vote.txt
index ea9792c..ff09793 100644
--- a/src/vote.txt
+++ b/src/vote.txt
@@ -1,5 +1,5 @@
 From: ${release-manager}@apache.org
-To: dev@${gateway-project}.incubator.apache.org
+To: dev@${gateway-project}.apache.org
 Subject: [VOTE] Release ${gateway-name} ${gateway-version}
 
 A candidate for the ${gateway-name} ${gateway-version} release is available at:
@@ -8,7 +8,7 @@ http://people.apache.org/~${release-manager}/${gateway-project}/${gateway-versio
 
 The release candidate is a zip archive of the sources in:
 
-https://git-wip-us.apache.org/repos/asf/incubator-knox.git
+https://git-wip-us.apache.org/repos/asf/knox.git
 Branch v${gateway-version} (git checkout -b v{gateway-version})
 
 The SHA1 checksum of the archive is ${checksum}.


Mime
View raw message