helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zzh...@apache.org
Subject git commit: [HELIX-264] fix zkclient#close() bug, port fix to 0.6.1.5-release, fix ivy file :wqnames
Date Sat, 16 Nov 2013 08:57:54 GMT
Updated Branches:
  refs/heads/helix-0.6.1.5-release 4f7242717 -> aa0a40bae


[HELIX-264] fix zkclient#close() bug, port fix to 0.6.1.5-release, fix ivy file :wqnames


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

Branch: refs/heads/helix-0.6.1.5-release
Commit: aa0a40baed9cff9d2f2efa079586025f034cd182
Parents: 4f72427
Author: zzhang <zzhang5@uci.edu>
Authored: Sat Nov 16 00:57:28 2013 -0800
Committer: zzhang <zzhang5@uci.edu>
Committed: Sat Nov 16 00:57:28 2013 -0800

----------------------------------------------------------------------
 ...x-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy | 47 -------------
 ...x-admin-webapp-0.6.2-incubating-SNAPSHOT.ivy | 47 +++++++++++++
 .../helix-core-0.6.1-incubating-SNAPSHOT.ivy    | 69 --------------------
 .../helix-core-0.6.2-incubating-SNAPSHOT.ivy    | 69 ++++++++++++++++++++
 4 files changed, 116 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/aa0a40ba/helix-admin-webapp/helix-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/helix-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy b/helix-admin-webapp/helix-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy
deleted file mode 100644
index 00e2f03..0000000
--- a/helix-admin-webapp/helix-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<ivy-module version="1.0">
-	<info organisation="org.apache.helix"
-		module="helix-admin-webapp"
-		revision="0.6.1-incubating-SNAPSHOT"
-		status="integration"
-		publication="20120315141623"
-	/>
-	<configurations>
-		<conf name="default" visibility="public" description="runtime dependencies and master
artifact can be used with this conf" extends="runtime,master"/>
-		<conf name="master" visibility="public" description="contains only the artifact published
by this module itself, with no transitive dependencies"/>
-		<conf name="compile" visibility="public" description="this is the default scope, used
if none is specified. Compile dependencies are available in all classpaths."/>
-		<conf name="provided" visibility="public" description="this is much like compile, but
indicates you expect the JDK or a container to provide it. It is only available on the compilation
classpath, and is not transitive."/>
-		<conf name="runtime" visibility="public" description="this scope indicates that the
dependency is not required for compilation, but is for execution. It is in the runtime and
test classpaths, but not the compile classpath." extends="compile"/>
-		<conf name="test" visibility="private" description="this scope indicates that the dependency
is not required for normal use of the application, and is only available for the test compilation
and execution phases."/>
-		<conf name="system" visibility="public" description="this scope is similar to provided
except that you have to provide the JAR which contains it explicitly. The artifact is always
available and is not looked up in a repository."/>
-	</configurations>
-	<publications>
-		<artifact name="helix-admin-webapp" type="jar" ext="jar" conf="master"/>
-	</publications>
-	<dependencies>
-		<dependency org="org.apache.helix" name="helix-core" rev="0.6.1-incubating-SNAPSHOT"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-	</dependencies>
-</ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/aa0a40ba/helix-admin-webapp/helix-admin-webapp-0.6.2-incubating-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/helix-admin-webapp-0.6.2-incubating-SNAPSHOT.ivy b/helix-admin-webapp/helix-admin-webapp-0.6.2-incubating-SNAPSHOT.ivy
new file mode 100644
index 0000000..6ffdbab
--- /dev/null
+++ b/helix-admin-webapp/helix-admin-webapp-0.6.2-incubating-SNAPSHOT.ivy
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<ivy-module version="1.0">
+	<info organisation="org.apache.helix"
+		module="helix-admin-webapp"
+		revision="0.6.2-incubating-SNAPSHOT"
+		status="integration"
+		publication="20120315141623"
+	/>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master
artifact can be used with this conf" extends="runtime,master"/>
+		<conf name="master" visibility="public" description="contains only the artifact published
by this module itself, with no transitive dependencies"/>
+		<conf name="compile" visibility="public" description="this is the default scope, used
if none is specified. Compile dependencies are available in all classpaths."/>
+		<conf name="provided" visibility="public" description="this is much like compile, but
indicates you expect the JDK or a container to provide it. It is only available on the compilation
classpath, and is not transitive."/>
+		<conf name="runtime" visibility="public" description="this scope indicates that the
dependency is not required for compilation, but is for execution. It is in the runtime and
test classpaths, but not the compile classpath." extends="compile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency
is not required for normal use of the application, and is only available for the test compilation
and execution phases."/>
+		<conf name="system" visibility="public" description="this scope is similar to provided
except that you have to provide the JAR which contains it explicitly. The artifact is always
available and is not looked up in a repository."/>
+	</configurations>
+	<publications>
+		<artifact name="helix-admin-webapp" type="jar" ext="jar" conf="master"/>
+	</publications>
+	<dependencies>
+		<dependency org="org.apache.helix" name="helix-core" rev="0.6.2-incubating-SNAPSHOT"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+	</dependencies>
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/aa0a40ba/helix-core/helix-core-0.6.1-incubating-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.1-incubating-SNAPSHOT.ivy b/helix-core/helix-core-0.6.1-incubating-SNAPSHOT.ivy
deleted file mode 100644
index ecfbe6e..0000000
--- a/helix-core/helix-core-0.6.1-incubating-SNAPSHOT.ivy
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
-	<info organisation="org.apache.helix"
-		module="helix-core"
-		revision="0.6.1-incubating-SNAPSHOT"
-		status="release"
-		publication="2011111505113547"
-	>
-	<description homepage="http://maven.apache.org" />	
-	</info>
-	
-	<configurations>
-		<conf name="default" visibility="public" description="runtime dependencies and master
artifact can be used with this conf" extends="runtime,master"/>
-		<conf name="master" visibility="public" description="contains only the artifact published
by this module itself, with no transitive dependencies"/>
-		<conf name="compile" visibility="public" description="this is the default scope, used
if none is specified. Compile dependencies are available in all classpaths."/>
-		<conf name="provided" visibility="public" description="this is much like compile, but
indicates you expect the JDK or a container to provide it. It is only available on the compilation
classpath, and is not transitive."/>
-		<conf name="runtime" visibility="public" description="this scope indicates that the
dependency is not required for compilation, but is for execution. It is in the runtime and
test classpaths, but not the compile classpath." extends="compile"/>
-		<conf name="test" visibility="private" description="this scope indicates that the dependency
is not required for normal use of the application, and is only available for the test compilation
and execution phases." extends="runtime"/>
-		<conf name="system" visibility="public" description="this scope is similar to provided
except that you have to provide the JAR which contains it explicitly. The artifact is always
available and is not looked up in a repository."/>
-		<conf name="sources" visibility="public" description="this configuration contains the
source artifact of this module, if any."/>
-		<conf name="javadoc" visibility="public" description="this configuration contains the
javadoc artifact of this module, if any."/>
-		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
-	</configurations>
-	
-	<publications>
-		<artifact name="helix-core" type="jar" ext="jar" conf="master"/>
-    <artifact name="helix-core" type="jar" ext="jar" conf="sources" m:classifier="sources"/>
-	</publications>
-	
-	<dependencies>
-    <dependency org="log4j" name="log4j" rev="1.2.15" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>

-    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="org.apache.camel" name="camel-josql" rev="2.5.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="org.apache.camel" name="camel-core" rev="2.5.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="net.sf.josql" name="gentlyweb-utils" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="net.sf.josql" name="josql" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-    <dependency org="net.sf" name="jsqlparser" rev="0.7.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-
-	</dependencies>
-</ivy-module>
-

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/aa0a40ba/helix-core/helix-core-0.6.2-incubating-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.2-incubating-SNAPSHOT.ivy b/helix-core/helix-core-0.6.2-incubating-SNAPSHOT.ivy
new file mode 100644
index 0000000..4df7d07
--- /dev/null
+++ b/helix-core/helix-core-0.6.2-incubating-SNAPSHOT.ivy
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
+	<info organisation="org.apache.helix"
+		module="helix-core"
+		revision="0.6.2-incubating-SNAPSHOT"
+		status="release"
+		publication="2011111505113547"
+	>
+	<description homepage="http://maven.apache.org" />	
+	</info>
+	
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master
artifact can be used with this conf" extends="runtime,master"/>
+		<conf name="master" visibility="public" description="contains only the artifact published
by this module itself, with no transitive dependencies"/>
+		<conf name="compile" visibility="public" description="this is the default scope, used
if none is specified. Compile dependencies are available in all classpaths."/>
+		<conf name="provided" visibility="public" description="this is much like compile, but
indicates you expect the JDK or a container to provide it. It is only available on the compilation
classpath, and is not transitive."/>
+		<conf name="runtime" visibility="public" description="this scope indicates that the
dependency is not required for compilation, but is for execution. It is in the runtime and
test classpaths, but not the compile classpath." extends="compile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency
is not required for normal use of the application, and is only available for the test compilation
and execution phases." extends="runtime"/>
+		<conf name="system" visibility="public" description="this scope is similar to provided
except that you have to provide the JAR which contains it explicitly. The artifact is always
available and is not looked up in a repository."/>
+		<conf name="sources" visibility="public" description="this configuration contains the
source artifact of this module, if any."/>
+		<conf name="javadoc" visibility="public" description="this configuration contains the
javadoc artifact of this module, if any."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+	</configurations>
+	
+	<publications>
+		<artifact name="helix-core" type="jar" ext="jar" conf="master"/>
+    <artifact name="helix-core" type="jar" ext="jar" conf="sources" m:classifier="sources"/>
+	</publications>
+	
+	<dependencies>
+    <dependency org="log4j" name="log4j" rev="1.2.15" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>

+    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="org.apache.camel" name="camel-josql" rev="2.5.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="org.apache.camel" name="camel-core" rev="2.5.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="net.sf.josql" name="gentlyweb-utils" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="net.sf.josql" name="josql" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+    <dependency org="net.sf" name="jsqlparser" rev="0.7.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+
+	</dependencies>
+</ivy-module>
+


Mime
View raw message