http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/dev-support/checkcompatibility.py ---------------------------------------------------------------------- diff --git a/dev-support/checkcompatibility.py b/dev-support/checkcompatibility.py index 0f90207..1e04065 100755 --- a/dev-support/checkcompatibility.py +++ b/dev-support/checkcompatibility.py @@ -28,8 +28,8 @@ # $ ./checkcompatibility.py ${SOURCE_GIT_REVISION} ${GIT_BRANCH_OR_TAG} # or with some options: # $ ./dev-support/checkcompatibility.py \ -# --annotation org.apache.hadoop.hbase.classification.InterfaceAudience.Public \ -# --annotation org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate \ +# --annotation org.apache.yetus.audience.InterfaceAudience.Public \ +# --annotation org.apache.yetus.audience.InterfaceAudience.LimitedPrivate \ # --include-file "hbase-*" \ # --known_problems_path ~/known_problems.json \ # rel/1.0.0 branch-1.2
http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index 6576147..9143311 100644 --- a/hbase-annotations/pom.xml +++ b/hbase-annotations/pom.xml @@ -29,38 +29,5 @@ <artifactId>hbase-annotations</artifactId> <name>Apache HBase - Annotations</name> - <description>Copy of Hadoop's annotations for HBase</description> - - <profiles> - <profile> - <id>build-with-jdk7</id> - <activation> - <jdk>1.7</jdk> - </activation> - <dependencies> - <dependency> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - <version>1.7</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </profile> - <profile> - <id>build-with-jdk8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <dependencies> - <dependency> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - <version>1.8</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </profile> - </profiles> + <description>Annotations for tests</description> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceAudience.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceAudience.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceAudience.java deleted file mode 100644 index 8a34a64..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceAudience.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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.hadoop.hbase.classification; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * Annotation to inform users of a package, class or method's intended audience. - * Currently the audience can be {@link Public}, {@link LimitedPrivate} or - * {@link Private}. <br> - * All public classes must have InterfaceAudience annotation. <br> - * <ul> - * <li>Public classes that are not marked with this annotation must be - * considered by default as {@link Private}.</li> - * - * <li>External applications must only use classes that are marked - * {@link Public}. Avoid using non public classes as these classes - * could be removed or change in incompatible ways.</li> - * - * <li>Hadoop projects must only use classes that are marked - * {@link LimitedPrivate} or {@link Public}</li> - * - * <li> Methods may have a different annotation that it is more restrictive - * compared to the audience classification of the class. Example: A class - * might be {@link Public}, but a method may be {@link LimitedPrivate} - * </li></ul> - */ -@InterfaceAudience.Public -public final class InterfaceAudience { - /** - * Intended for use by any project or application. - */ - @Documented - @Retention(RetentionPolicy.RUNTIME) - public @interface Public {} - - /** - * Intended only for the project(s) specified in the annotation. - * For example, "Common", "HDFS", "MapReduce", "ZooKeeper", "HBase". - */ - @Documented - @Retention(RetentionPolicy.RUNTIME) - public @interface LimitedPrivate { - String[] value(); - } - - /** - * Intended for use only within Hadoop itself. - */ - @Documented - @Retention(RetentionPolicy.RUNTIME) - public @interface Private {} - - private InterfaceAudience() {} // Audience can't exist on its own -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceStability.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceStability.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceStability.java deleted file mode 100644 index fbe71d1..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/InterfaceStability.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.hadoop.hbase.classification; - -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. Currently the stability can be - * {@link Stable}, {@link Evolving} or {@link Unstable}. <br> - * - * <ul><li>All classes that are annotated with - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.Public} or - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate} - * must have InterfaceStability annotation. </li> - * <li>Classes that are - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate} - * are to be considered unstable unless a different InterfaceStability annotation - * states otherwise.</li> - * <li>Incompatible changes must not be made to classes marked as stable.</li> - * </ul> - */ -@InterfaceAudience.Public -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 {} -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java deleted file mode 100644 index 221f730..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.hadoop.hbase.classification.tools; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import com.sun.javadoc.DocErrorReporter; -import com.sun.javadoc.LanguageVersion; -import com.sun.javadoc.RootDoc; -import com.sun.tools.doclets.standard.Standard; - -/** - * A <a href="http://java.sun.com/javase/6/docs/jdk/api/javadoc/doclet/";>Doclet</a> - * for excluding elements that are annotated with - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.Private} or - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate}. - * It delegates to the Standard Doclet, and takes the same options. - */ -@InterfaceAudience.Private -public final class ExcludePrivateAnnotationsStandardDoclet { - - private ExcludePrivateAnnotationsStandardDoclet() {} - - public static LanguageVersion languageVersion() { - return LanguageVersion.JAVA_1_5; - } - - public static boolean start(RootDoc root) { - System.out.println( - ExcludePrivateAnnotationsStandardDoclet.class.getSimpleName()); - return Standard.start(RootDocProcessor.process(root)); - } - - public static int optionLength(String option) { - Integer length = StabilityOptions.optionLength(option); - if (length != null) { - return length; - } - return Standard.optionLength(option); - } - - public static boolean validOptions(String[][] options, - DocErrorReporter reporter) { - StabilityOptions.validOptions(options, reporter); - String[][] filteredOptions = StabilityOptions.filterOptions(options); - return Standard.validOptions(filteredOptions, reporter); - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/IncludePublicAnnotationsStandardDoclet.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/IncludePublicAnnotationsStandardDoclet.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/IncludePublicAnnotationsStandardDoclet.java deleted file mode 100644 index 5f1079e..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/IncludePublicAnnotationsStandardDoclet.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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.hadoop.hbase.classification.tools; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; - -import com.sun.javadoc.DocErrorReporter; -import com.sun.javadoc.LanguageVersion; -import com.sun.javadoc.RootDoc; -import com.sun.tools.doclets.standard.Standard; - -/** - * A <a href="http://java.sun.com/javase/6/docs/jdk/api/javadoc/doclet/";>Doclet</a> - * that only includes class-level elements that are annotated with - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.Public}. - * Class-level elements with no annotation are excluded. - * In addition, all elements that are annotated with - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.Private} or - * {@link org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate} - * are also excluded. - * It delegates to the Standard Doclet, and takes the same options. - */ -@InterfaceAudience.Private -public final class IncludePublicAnnotationsStandardDoclet { - - private IncludePublicAnnotationsStandardDoclet() {} - - public static LanguageVersion languageVersion() { - return LanguageVersion.JAVA_1_5; - } - - public static boolean start(RootDoc root) { - System.out.println( - IncludePublicAnnotationsStandardDoclet.class.getSimpleName()); - RootDocProcessor.treatUnannotatedClassesAsPrivate = true; - return Standard.start(RootDocProcessor.process(root)); - } - - public static int optionLength(String option) { - Integer length = StabilityOptions.optionLength(option); - if (length != null) { - return length; - } - return Standard.optionLength(option); - } - - public static boolean validOptions(String[][] options, - DocErrorReporter reporter) { - StabilityOptions.validOptions(options, reporter); - String[][] filteredOptions = StabilityOptions.filterOptions(options); - return Standard.validOptions(filteredOptions, reporter); - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/RootDocProcessor.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/RootDocProcessor.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/RootDocProcessor.java deleted file mode 100644 index e9fd6f9..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/RootDocProcessor.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * 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.hadoop.hbase.classification.tools; - -import com.sun.javadoc.AnnotationDesc; -import com.sun.javadoc.AnnotationTypeDoc; -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.ConstructorDoc; -import com.sun.javadoc.Doc; -import com.sun.javadoc.FieldDoc; -import com.sun.javadoc.MethodDoc; -import com.sun.javadoc.PackageDoc; -import com.sun.javadoc.ProgramElementDoc; -import com.sun.javadoc.RootDoc; - -import java.lang.reflect.Array; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; - -/** - * Process the {@link RootDoc} by substituting with (nested) proxy objects that - * exclude elements with Private or LimitedPrivate annotations. - * <p> - * Based on code from http://www.sixlegs.com/blog/java/exclude-javadoc-tag.html. - */ -final class RootDocProcessor { - - static String stability = StabilityOptions.UNSTABLE_OPTION; - static boolean treatUnannotatedClassesAsPrivate = false; - - private RootDocProcessor() {} - - public static RootDoc process(RootDoc root) { - return (RootDoc) process(root, RootDoc.class); - } - - private static Object process(Object obj, Class<?> type) { - if (obj == null) { - return null; - } - Class<?> cls = obj.getClass(); - if (cls.getName().startsWith("com.sun.")) { - return getProxy(obj); - } else if (obj instanceof Object[]) { - Class<?> componentType = type.isArray() ? type.getComponentType() - : cls.getComponentType(); - Object[] array = (Object[]) obj; - Object[] newArray = (Object[]) Array.newInstance(componentType, - array.length); - for (int i = 0; i < array.length; ++i) { - newArray[i] = process(array[i], componentType); - } - return newArray; - } - return obj; - } - - private static Map<Object, Object> proxies = new WeakHashMap<>(); - - private static Object getProxy(Object obj) { - Object proxy = proxies.get(obj); - if (proxy == null) { - proxy = Proxy.newProxyInstance(obj.getClass().getClassLoader(), - obj.getClass().getInterfaces(), new ExcludeHandler(obj)); - proxies.put(obj, proxy); - } - return proxy; - } - - private static class ExcludeHandler implements InvocationHandler { - private Object target; - - public ExcludeHandler(Object target) { - this.target = target; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - String methodName = method.getName(); - if (target instanceof Doc) { - if (methodName.equals("isIncluded")) { - Doc doc = (Doc) target; - return !exclude(doc) && doc.isIncluded(); - } - if (target instanceof RootDoc) { - switch (methodName) { - case "classes": - return filter(((RootDoc) target).classes(), ClassDoc.class); - case "specifiedClasses": - return filter(((RootDoc) target).specifiedClasses(), ClassDoc.class); - case "specifiedPackages": - return filter(((RootDoc) target).specifiedPackages(), PackageDoc.class); - } - } else if (target instanceof ClassDoc) { - if (isFiltered(args)) { - switch (methodName) { - case "methods": - return filter(((ClassDoc) target).methods(true), MethodDoc.class); - case "fields": - return filter(((ClassDoc) target).fields(true), FieldDoc.class); - case "innerClasses": - return filter(((ClassDoc) target).innerClasses(true), ClassDoc.class); - case "constructors": - return filter(((ClassDoc) target).constructors(true), ConstructorDoc.class); - } - } - } else if (target instanceof PackageDoc) { - switch (methodName) { - case "allClasses": - if (isFiltered(args)) { - return filter(((PackageDoc) target).allClasses(true), ClassDoc.class); - } else { - return filter(((PackageDoc) target).allClasses(), ClassDoc.class); - } - case "annotationTypes": - return filter(((PackageDoc) target).annotationTypes(), AnnotationTypeDoc.class); - case "enums": - return filter(((PackageDoc) target).enums(), ClassDoc.class); - case "errors": - return filter(((PackageDoc) target).errors(), ClassDoc.class); - case "exceptions": - return filter(((PackageDoc) target).exceptions(), ClassDoc.class); - case "interfaces": - return filter(((PackageDoc) target).interfaces(), ClassDoc.class); - case "ordinaryClasses": - return filter(((PackageDoc) target).ordinaryClasses(), ClassDoc.class); - } - } - } - - if (args != null) { - if (methodName.equals("compareTo") || methodName.equals("equals") - || methodName.equals("overrides") || methodName.equals("subclassOf")) { - args[0] = unwrap(args[0]); - } - } - try { - return process(method.invoke(target, args), method.getReturnType()); - } catch (InvocationTargetException e) { - throw e.getTargetException(); - } - } - - private static boolean exclude(Doc doc) { - AnnotationDesc[] annotations = null; - if (doc instanceof ProgramElementDoc) { - annotations = ((ProgramElementDoc) doc).annotations(); - } else if (doc instanceof PackageDoc) { - annotations = ((PackageDoc) doc).annotations(); - } - if (annotations != null) { - for (AnnotationDesc annotation : annotations) { - String qualifiedTypeName = annotation.annotationType().qualifiedTypeName(); - if (qualifiedTypeName.equals(InterfaceAudience.Private.class.getCanonicalName()) - || qualifiedTypeName - .equals(InterfaceAudience.LimitedPrivate.class.getCanonicalName())) { - return true; - } - if (stability.equals(StabilityOptions.EVOLVING_OPTION)) { - if (qualifiedTypeName.equals(InterfaceStability.Unstable.class.getCanonicalName())) { - return true; - } - } - if (stability.equals(StabilityOptions.STABLE_OPTION)) { - if (qualifiedTypeName.equals(InterfaceStability.Unstable.class.getCanonicalName()) - || qualifiedTypeName.equals(InterfaceStability.Evolving.class.getCanonicalName())) { - return true; - } - } - } - for (AnnotationDesc annotation : annotations) { - String qualifiedTypeName = annotation.annotationType().qualifiedTypeName(); - if (qualifiedTypeName.equals(InterfaceAudience.Public.class.getCanonicalName())) { - return false; - } - } - } - if (treatUnannotatedClassesAsPrivate) { - return doc.isClass() || doc.isInterface() || doc.isAnnotationType(); - } - return false; - } - - private static Object[] filter(Doc[] array, Class<?> componentType) { - if (array == null || array.length == 0) { - return array; - } - List<Object> list = new ArrayList<>(array.length); - for (Doc entry : array) { - if (!exclude(entry)) { - list.add(process(entry, componentType)); - } - } - return list.toArray((Object[]) Array.newInstance(componentType, list.size())); - } - - private Object unwrap(Object proxy) { - if (proxy instanceof Proxy) { - return ((ExcludeHandler) Proxy.getInvocationHandler(proxy)).target; - } - return proxy; - } - - private boolean isFiltered(Object[] args) { - return args != null && Boolean.TRUE.equals(args[0]); - } - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/StabilityOptions.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/StabilityOptions.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/StabilityOptions.java deleted file mode 100644 index 1c6b4f2..0000000 --- a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/classification/tools/StabilityOptions.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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.hadoop.hbase.classification.tools; - -import com.sun.javadoc.DocErrorReporter; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -final class StabilityOptions { - - private StabilityOptions() {} - - public static final String STABLE_OPTION = "-stable"; - public static final String EVOLVING_OPTION = "-evolving"; - public static final String UNSTABLE_OPTION = "-unstable"; - - public static Integer optionLength(String option) { - String opt = option.toLowerCase(Locale.ROOT); - if (opt.equals(UNSTABLE_OPTION)) return 1; - if (opt.equals(EVOLVING_OPTION)) return 1; - if (opt.equals(STABLE_OPTION)) return 1; - return null; - } - - public static void validOptions(String[][] options, DocErrorReporter reporter) { - for (String[] option : options) { - String opt = option[0].toLowerCase(Locale.ROOT); - switch (opt) { - case UNSTABLE_OPTION: - RootDocProcessor.stability = UNSTABLE_OPTION; - break; - case EVOLVING_OPTION: - RootDocProcessor.stability = EVOLVING_OPTION; - break; - case STABLE_OPTION: - RootDocProcessor.stability = STABLE_OPTION; - break; - default: - RootDocProcessor.stability = UNSTABLE_OPTION; - break; - } - } - } - - public static String[][] filterOptions(String[][] options) { - List<String[]> optionsList = new ArrayList<>(); - for (String[] option : options) { - if (!option[0].equalsIgnoreCase(UNSTABLE_OPTION) - && !option[0].equalsIgnoreCase(EVOLVING_OPTION) - && !option[0].equalsIgnoreCase(STABLE_OPTION)) { - optionsList.add(option); - } - } - String[][] filteredOptions = new String[optionsList.size()][]; - int i = 0; - for (String[] option : optionsList) { - filteredOptions[i++] = option; - } - return filteredOptions; - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-archetypes/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml index 526a4cb..85d835e 100644 --- a/hbase-archetypes/pom.xml +++ b/hbase-archetypes/pom.xml @@ -22,10 +22,10 @@ --> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>hbase</artifactId> + <artifactId>hbase-build-configuration</artifactId> <groupId>org.apache.hbase</groupId> <version>2.0.0-alpha3-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../hbase-build-configuration</relativePath> </parent> <artifactId>hbase-archetypes</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 5935d78..d867717 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -21,10 +21,10 @@ --> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>hbase</artifactId> + <artifactId>hbase-build-configuration</artifactId> <groupId>org.apache.hbase</groupId> <version>2.0.0-alpha3-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../hbase-build-configuration</relativePath> </parent> <artifactId>hbase-assembly</artifactId> <name>Apache HBase - Assembly</name> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-assembly/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index a2ca40e..c82d5f2 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -34,6 +34,7 @@ <include>org.apache.hbase:hbase-annotations</include> <include>org.apache.hbase:hbase-archetypes</include> <include>org.apache.hbase:hbase-assembly</include> + <include>org.apache.hbase:hbase-build-configuration</include> <include>org.apache.hbase:hbase-checkstyle</include> <include>org.apache.hbase:hbase-client</include> <include>org.apache.hbase:hbase-common</include> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index 2085497..3cf13aa 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -21,10 +21,10 @@ --> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>hbase</artifactId> + <artifactId>hbase-build-configuration</artifactId> <groupId>org.apache.hbase</groupId> <version>2.0.0-alpha3-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../hbase-build-configuration</relativePath> </parent> <artifactId>hbase-backup</artifactId> <name>Apache HBase - Backup</name> @@ -86,16 +86,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-annotations</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java index 9dc6382..ff1e13f 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.util.BackupSet; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * The administrative API for HBase Backup. Construct an instance and call {@link #close()} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java index 22e69a3..68e5c11 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hbase.backup.impl.IncrementalTableBackupClient; import org.apache.hadoop.hbase.backup.impl.TableBackupClient; import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Private public class BackupClientFactory { http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupCopyJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupCopyJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupCopyJob.java index 007e4c1..3385f1d 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupCopyJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupCopyJob.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.backup.impl.BackupManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * Backup copy job is a part of a backup process. The concrete implementation is responsible for http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java index 9dd8531..03e2e65 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand; import org.apache.hadoop.hbase.backup.impl.BackupCommands; import org.apache.hadoop.hbase.backup.impl.BackupManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.util.ToolRunner; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java index ed554ad..c6aa5f0 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.master.cleaner.BaseHFileCleanerDelegate; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java index 432fd37..0df712e 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos.BackupInfo.Builder; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupMergeJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupMergeJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupMergeJob.java index 136782f..dc2e85b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupMergeJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupMergeJob.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.backup; import java.io.IOException; import org.apache.hadoop.conf.Configurable; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * Backup merge operation job interface. Concrete implementation is provided by backup provider, see http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java index 595e862..98d507d 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.coprocessor.ObserverContext; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRequest.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRequest.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRequest.java index 8659868..003c0e7 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRequest.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRequest.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.backup; import java.util.List; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * POJO class for backup request http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java index f511cc4..4603019 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.backup; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * BackupRestoreConstants holds a bunch of HBase Backup and Restore constants http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreFactory.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreFactory.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreFactory.java index d72c884..9612ebe 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreFactory.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreFactory.java @@ -21,7 +21,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupCopyJob; import org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupMergeJob; import org.apache.hadoop.hbase.backup.mapreduce.MapReduceRestoreJob; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.util.ReflectionUtils; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupTableInfo.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupTableInfo.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupTableInfo.java index a5390a6..5f221a5 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupTableInfo.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupTableInfo.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.backup; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java index 1c43e88..f5f879a 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java @@ -30,7 +30,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupManifest; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * View to an on-disk Backup Image FileSytem Provides the set of methods necessary to interact with @@ -143,4 +143,4 @@ public class HBackupFileSystem { backupManifestMap.put(tableName, manifest); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java index 1becb75..3f62338 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.backup; import org.apache.commons.logging.Log; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.log4j.Level; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java index b081533..b99246b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java @@ -49,7 +49,7 @@ import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.util.AbstractHBaseTool; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreJob.java index 86fb963..ca57e59 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreJob.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * Restore operation job interface Concrete implementation is provided by backup provider, see http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java index de3ad5a..5a0a7d4 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.backup; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * POJO class for restore request http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java index 6cef0e3..8a60e67 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java @@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.RestoreRequest; import org.apache.hadoop.hbase.backup.util.BackupSet; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java index c87b557..2dfd46e 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java @@ -58,7 +58,7 @@ import org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.util.BackupSet; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupException.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupException.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupException.java index 2c7d35f..0147c29 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupException.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupException.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.backup.impl; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.backup.BackupInfo; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * Backup exception http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java index 8fe5eaf..7ac94d8 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java @@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.backup.impl.BackupManifest.BackupImage; import org.apache.hadoop.hbase.backup.master.BackupLogCleaner; import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; import org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.procedure.ProcedureManagerHost; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java index 7e3201e..4e6f6ff 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 8dc9718..aaa50b1 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Delete; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java index e323e96..481e30f 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.backup.BackupRestoreFactory; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java index 6330899..d9258c5 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable.WALItem; import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.util.FSUtils; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java index 4064948..4efe04b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java @@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.backup.BackupRequest; import org.apache.hadoop.hbase.backup.BackupRestoreFactory; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.mapreduce.WALPlayer; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java index 845da56..f2237af 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.backup.RestoreRequest; import org.apache.hadoop.hbase.backup.impl.BackupManifest.BackupImage; import org.apache.hadoop.hbase.backup.util.BackupUtils; import org.apache.hadoop.hbase.backup.util.RestoreTool; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/TableBackupClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/TableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/TableBackupClient.java index 6eec460..aa0ec5f 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/TableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/TableBackupClient.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.impl.BackupManifest.BackupImage; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupCopyJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupCopyJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupCopyJob.java index 016d1a4..29e71e7 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupCopyJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupCopyJob.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.snapshot.ExportSnapshot; import org.apache.hadoop.mapreduce.Cluster; import org.apache.hadoop.mapreduce.Counters; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java index 373f143..dafc88b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.impl.BackupManifest; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.util.Pair; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java index 49e8c75..97ece3d 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.RegionLocator; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java index adc5aa8..bed61ed 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.RestoreJob; import org.apache.hadoop.hbase.backup.util.BackupUtils; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles; import org.apache.hadoop.util.Tool; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java index b5b887c..08a7eba 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.master.HMaster; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.java index 88c3455..62b2df7 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.impl.BackupManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java index 8fc644c..2467913 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.java index 65a1fa3..d62dbee 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.DaemonThreadFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.errorhandling.ForeignException; /** @@ -136,4 +136,4 @@ public class LogRollBackupSubprocedurePool implements Closeable, Abortable { public boolean isAborted() { return this.aborted; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollRegionServerProcedureManager.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollRegionServerProcedureManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollRegionServerProcedureManager.java index 9d5a858..5ab7fac 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollRegionServerProcedureManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollRegionServerProcedureManager.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.procedure.ProcedureMember; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java index 098efa1..47bb12b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupSet.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; /** * Backup set is a named group of HBase tables, which are managed together by Backup/Restore http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java index 74bfb6c..631183d 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.RestoreRequest; import org.apache.hadoop.hbase.backup.impl.BackupManifest; import org.apache.hadoop.hbase.backup.impl.BackupManifest.BackupImage; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreTool.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreTool.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreTool.java index ab56aaa..c2f1939 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreTool.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreTool.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupRestoreFactory; import org.apache.hadoop.hbase.backup.HBackupFileSystem; import org.apache.hadoop.hbase.backup.RestoreJob; -import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.Connection; http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java index 40a01b9..4670c49 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java @@ -94,4 +94,4 @@ public class TestBackupBoundaryTests extends TestBackupBase { List<TableName> tables = toList(table1.getNameAsString(), "tabledne"); fullTableBackup(tables); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java index 208e081..85fba4b 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java @@ -67,4 +67,4 @@ public class TestBackupDeleteRestore extends TestBackupBase { assertEquals(numRows, numRowsAfterRestore); hba.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java index dfbe106..6c1890b 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java @@ -138,4 +138,4 @@ public class TestBackupHFileCleaner { assertFalse("Cleaner should not allow to delete this file as there is a hfile reference " + "for it.", found); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRepair.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRepair.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRepair.java index 686d34b..4b1d84f 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRepair.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRepair.java @@ -88,4 +88,4 @@ public class TestBackupRepair extends TestBackupBase { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupShowHistory.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupShowHistory.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupShowHistory.java index 4e922a2..57c1533 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupShowHistory.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupShowHistory.java @@ -145,4 +145,4 @@ public class TestBackupShowHistory extends TestBackupBase { LOG.info("show_history"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackup.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackup.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackup.java index 124d19f..919668e 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackup.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackup.java @@ -56,4 +56,4 @@ public class TestFullBackup extends TestBackupBase { LOG.info("backup complete"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSet.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSet.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSet.java index 4dc894b..c115971 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSet.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSet.java @@ -100,4 +100,4 @@ public class TestFullBackupSet extends TestBackupBase { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.java index 6b007f9..2ca1365 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.java @@ -125,4 +125,4 @@ public class TestFullBackupSetRestoreSet extends TestBackupBase { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.java index d18de88..32f40e2 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.java @@ -76,4 +76,4 @@ public class TestFullBackupWithFailures extends TestBackupBase { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java index 36a9ee2..d8594c5 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java @@ -132,4 +132,4 @@ public class TestRemoteBackup extends TestBackupBase { hAdmin.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java index 0386c27..f7dcb9f 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java @@ -56,4 +56,4 @@ public class TestRemoteRestore extends TestBackupBase { hba.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.java index c61b018..da23c35 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.java @@ -77,4 +77,4 @@ public class TestRestoreBoundaryTests extends TestBackupBase { TEST_UTIL.deleteTable(table3_restore); hba.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.java index 6443421..2a0c4b4 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.java @@ -52,4 +52,4 @@ public class TestSystemTableSnapshot extends TestBackupBase { hba.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-build-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml new file mode 100644 index 0000000..562528d --- /dev/null +++ b/hbase-build-configuration/pom.xml @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <!-- + /** + * 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. + */ + --> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>hbase</artifactId> + <groupId>org.apache.hbase</groupId> + <version>2.0.0-alpha3-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>hbase-build-configuration</artifactId> + <name>Apache HBase - Build Configuration</name> + <description>Configure the build-support artifacts for maven build</description> + + <packaging>pom</packaging> + <build> + <plugins> + <plugin> + <!--Make it so assembly:single does nothing in here--> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.yetus</groupId> + <artifactId>audience-annotations</artifactId> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/hbase/blob/d576e5a3/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 5c5f075..fc94683 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -22,10 +22,10 @@ --> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>hbase</artifactId> + <artifactId>hbase-build-configuration</artifactId> <groupId>org.apache.hbase</groupId> <version>2.0.0-alpha3-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../hbase-build-configuration</relativePath> </parent> <artifactId>hbase-client</artifactId> @@ -95,16 +95,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-annotations</artifactId> <type>test-jar</type> <scope>test</scope> </dependency>
