storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [09/14] storm git commit: STORM-2937: Overwrite storm-kafka-client 1.x-branch into 1.0.x-branch: update storm-kafka-client pom.xml & base pom.xml
Date Thu, 08 Feb 2018 09:05:10 GMT
STORM-2937: Overwrite storm-kafka-client 1.x-branch into 1.0.x-branch: update storm-kafka-client
pom.xml & base pom.xml

Changes necessary for minimally using storm-kafka-client from 1.x-branch in 1.0.x-branch --
some compilation failures still exist.

Also added InterfaceStability.java which is another needed change.


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

Branch: refs/heads/1.0.x-branch
Commit: 1312d69a0ffb01335d1b8842b8c2ba7b8268e3e6
Parents: e16fa19
Author: Erik Weathers <erikdw@gmail.com>
Authored: Tue Feb 6 17:44:49 2018 -0800
Committer: Erik Weathers <erikdw@gmail.com>
Committed: Wed Feb 7 18:42:56 2018 -0800

----------------------------------------------------------------------
 external/storm-kafka-client/pom.xml             |  4 +-
 pom.xml                                         |  3 +-
 .../storm/annotation/InterfaceStability.java    | 54 ++++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/1312d69a/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index 51bb797..c9e1fc1 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -49,7 +49,7 @@
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
             <version>${project.version}</version>
-            <scope>${provided.scope}</scope>
+            <scope>provided</scope>
         </dependency>
         <!--kafka libraries-->
         <dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/1312d69a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f51295..1a0acd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,8 @@
         <storm.kafka.artifact.id>kafka_2.10</storm.kafka.artifact.id>
 
         <!-- kafka version used by new storm-kafka-client spout code -->
-        <storm.kafka.client.version>0.9.0.1</storm.kafka.client.version>
+        <storm.kafka.client.version>0.10.1.0</storm.kafka.client.version>
+
 
         <!-- Java and clojure build lifecycle test properties are defined here to avoid
having to create a default profile -->
         <java.unit.test.exclude>org.apache.storm.testing.IntegrationTest</java.unit.test.exclude>

http://git-wip-us.apache.org/repos/asf/storm/blob/1312d69a/storm-core/src/jvm/org/apache/storm/annotation/InterfaceStability.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/annotation/InterfaceStability.java b/storm-core/src/jvm/org/apache/storm/annotation/InterfaceStability.java
new file mode 100644
index 0000000..6fcbac2
--- /dev/null
+++ b/storm-core/src/jvm/org/apache/storm/annotation/InterfaceStability.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.storm.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Annotation to inform users of how much to rely on a particular package,
+ * class or method not changing over time.
+ * </ul>
+ */
+@InterfaceStability.Evolving
+public class InterfaceStability {
+    /**
+     * Can evolve while retaining compatibility for minor release boundaries.;
+     * can break compatibility only at major release (ie. at m.0).
+     */
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface Stable {};
+
+    /**
+     * Evolving, but can break compatibility at minor release (i.e. m.x)
+     */
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface Evolving {};
+
+    /**
+     * No guarantee is provided as to reliability or stability across any
+     * level of release granularity.
+     */
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface Unstable {};
+}


Mime
View raw message