You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/08/20 17:14:16 UTC
git commit: Squashed commit of the following:
Updated Branches:
refs/heads/master 436d656c7 -> b16e33261
Squashed commit of the following:
commit 9d9787274ba4834af51c0b23ecf440f80724aac0
Author: Kevin Minder <ke...@hortonworks.com>
Date: Tue Aug 20 10:57:04 2013 -0400
KNOX-81: Minor pom.xml formatting change.
commit 88575c7e3cf87a6efeed21f43caa6ff082c5e913
Author: Kevin Minder <ke...@hortonworks.com>
Date: Tue Aug 20 10:54:36 2013 -0400
KNOX-81: Add -incubating to release artifacts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/b16e3326
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/b16e3326
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/b16e3326
Branch: refs/heads/master
Commit: b16e33261f0563dbbb880e5ad22107851d593c7a
Parents: 436d656
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Aug 20 11:05:19 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Aug 20 11:05:19 2013 -0400
----------------------------------------------------------------------
build.xml | 5 ++++-
hsso-release/pom.xml | 2 +-
pom.xml | 28 ++++++++++++++--------------
3 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b16e3326/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 36ca544..58da8b0 100644
--- a/build.xml
+++ b/build.xml
@@ -23,12 +23,15 @@
<property name="gateway-name" value="Apache Knox (Incubator)"/>
<property name="gateway-project" value="knox"/>
- <property name="gateway-artifact" value="knox"/>
+ <property name="gateway-artifact" value="knox-incubator"/>
<property name="gateway-version" value="0.3.0-SNAPSHOT"/>
<property name="release-manager" value="kminder"/>
<property name="gateway-home" value="${gateway-artifact}-${gateway-version}"/>
+ <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}" />
+
<condition property="isUnix">
<os family="unix"/>
</condition>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b16e3326/hsso-release/pom.xml
----------------------------------------------------------------------
diff --git a/hsso-release/pom.xml b/hsso-release/pom.xml
index 2c1700f..880fd32 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-${gateway-version}</finalName>
+ <finalName>hsso-incubating-${gateway-version}</finalName>
<outputDirectory>../target/${gateway-version}</outputDirectory>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b16e3326/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 95212b7..abc7217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,9 +57,9 @@
<module>gateway-shell</module>
<module>gateway-shell-launcher</module>
<module>gateway-release</module>
- <module>hsso-release</module>
<module>gateway-test</module>
<module>gateway-demo</module>
+ <module>hsso-release</module>
</modules>
<properties>
@@ -67,7 +67,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<gateway-name>Apache Knox (Incubator)</gateway-name>
<gateway-project>knox</gateway-project>
- <gateway-artifact>knox</gateway-artifact>
+ <gateway-artifact>knox-incubating</gateway-artifact>
<gateway-version>0.3.0-SNAPSHOT</gateway-version>
<gateway-group>org.apache.hadoop</gateway-group>
</properties>
@@ -458,18 +458,18 @@
<version>4.2.3</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-jaspi</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-locator</artifactId>
- <version>1.1</version>
- </dependency>
- -->
+ <!--
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-locator</artifactId>
+ <version>1.1</version>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.hadoop</groupId>