Repository: hbase Updated Branches: refs/heads/branch-1.1 e391bb047 -> 43b0a6612
bump version for next dev cycle Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/43b0a661 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/43b0a661 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/43b0a661 Branch: refs/heads/branch-1.1 Commit: 43b0a661283ad64c7b04074a053683e51d5ecbc7 Parents: e391bb0 Author: Nick Dimiduk <[email protected]> Authored: Mon Aug 21 21:02:36 2017 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Mon Aug 21 21:02:36 2017 -0700 ---------------------------------------------------------------------- hbase-annotations/pom.xml | 2 +- hbase-assembly/pom.xml | 2 +- hbase-checkstyle/pom.xml | 8 +++--- hbase-client/pom.xml | 7 +++--- hbase-common/pom.xml | 21 ++++++++-------- hbase-examples/pom.xml | 6 ++--- hbase-hadoop-compat/pom.xml | 4 +-- hbase-hadoop2-compat/pom.xml | 6 ++--- hbase-it/pom.xml | 6 ++--- hbase-prefix-tree/pom.xml | 4 +-- hbase-procedure/pom.xml | 2 +- hbase-protocol/pom.xml | 4 +-- hbase-resource-bundle/pom.xml | 2 +- hbase-rest/pom.xml | 33 ++++++++++-------------- hbase-server/pom.xml | 36 +++++++++++++-------------- hbase-shaded/hbase-shaded-client/pom.xml | 6 ++--- hbase-shaded/hbase-shaded-server/pom.xml | 6 ++--- hbase-shaded/pom.xml | 2 +- hbase-shell/pom.xml | 6 ++--- hbase-testing-util/pom.xml | 2 +- hbase-thrift/pom.xml | 28 ++++++++++----------- pom.xml | 24 +++++++++--------- 22 files changed, 101 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index aeda0df..0aa992a 100644 --- a/hbase-annotations/pom.xml +++ b/hbase-annotations/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index c128fa9..024fcaf 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-assembly</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml index 435cd32..87b2308 100644 --- a/hbase-checkstyle/pom.xml +++ b/hbase-checkstyle/pom.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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 @@ -24,14 +22,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.hbase</groupId> <artifactId>hbase-checkstyle</artifactId> -<version>1.1.12</version> +<version>1.1.13-SNAPSHOT</version> <name>Apache HBase - Checkstyle</name> <description>Module to hold Checkstyle properties for HBase.</description> <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index ef5d746..0dc9b4d 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -1,6 +1,5 @@ <?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";> +<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 @@ -24,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -93,7 +92,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index b1acec6..7b7d211 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -76,12 +76,11 @@ <phase>process-resources</phase> <configuration> <target> - <replace file="${project.build.outputDirectory}/hbase-default.xml" - token="@@@VERSION@@@" value="${project.version}" /> - <mkdir dir="${project.build.directory}/nativelib"/> + <replace file="${project.build.outputDirectory}/hbase-default.xml" token="@@@VERSION@@@" value="${project.version}" /> + <mkdir dir="${project.build.directory}/nativelib" /> <exec executable="tar" dir="${project.build.directory}/nativelib" failonerror="false"> - <arg value="xf"/> - <arg value="hadoop-snappy-nativelibs.tar"/> + <arg value="xf" /> + <arg value="hadoop-snappy-nativelibs.tar" /> </exec> </target> </configuration> @@ -95,10 +94,10 @@ <phase>generate-sources</phase> <configuration> <target> - <property name="generated.sources" location="${project.build.directory}/generated-sources"/> + <property name="generated.sources" location="${project.build.directory}/generated-sources" /> <exec executable="bash"> - <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}/java"/> + <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}/java" /> </exec> </target> </configuration> @@ -184,7 +183,7 @@ </goals> </pluginExecutionFilter> <action> - <execute/> + <execute /> </action> </pluginExecution> <pluginExecution> @@ -197,7 +196,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -210,7 +209,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 1a61cdb..af814d8 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-examples</artifactId> @@ -82,7 +82,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -95,7 +95,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-hadoop-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index 4db2f75..ae199f3 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -95,7 +95,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index adb3fac..577cc5f 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -115,7 +115,7 @@ limitations under the License. </goals> </pluginExecutionFilter> <action> - <execute/> + <execute /> </action> </pluginExecution> <pluginExecution> @@ -128,7 +128,7 @@ limitations under the License. </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index ef1390e..2a9eb62 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -138,7 +138,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -151,7 +151,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-prefix-tree/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index cadf894..87de9f0 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -92,7 +92,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-procedure/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 98def05..938f822 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index d0782ae..8a5fe6a 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -94,7 +94,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-resource-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-resource-bundle/pom.xml b/hbase-resource-bundle/pom.xml index 491a867..1cd12b1 100644 --- a/hbase-resource-bundle/pom.xml +++ b/hbase-resource-bundle/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index d58d14b..cb39eb3 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -1,7 +1,5 @@ <?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";> +<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 @@ -25,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-rest</artifactId> @@ -84,26 +82,21 @@ <phase>generate-sources</phase> <configuration> <target> - <property name="build.webapps" location="${project.build.directory}/hbase-webapps"/> - <property name="src.webapps" - location="${basedir}/src/main/resources/hbase-webapps"/> - <property name="generated.sources" - location="${project.build.directory}/generated-sources"/> - <mkdir dir="${build.webapps}"/> + <property name="build.webapps" location="${project.build.directory}/hbase-webapps" /> + <property name="src.webapps" location="${basedir}/src/main/resources/hbase-webapps" /> + <property name="generated.sources" location="${project.build.directory}/generated-sources" /> + <mkdir dir="${build.webapps}" /> <copy todir="${build.webapps}"> <fileset dir="${src.webapps}"> - <exclude name="**/*.jsp"/> - <exclude name="**/.*"/> - <exclude name="**/*~"/> + <exclude name="**/*.jsp" /> + <exclude name="**/.*" /> + <exclude name="**/*~" /> </fileset> </copy> <!--The compile.classpath is passed in by maven --> - <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" - classpathref="maven.compile.classpath"/> - <mkdir dir="${build.webapps}/rest/WEB-INF"/> - <jspcompiler uriroot="${src.webapps}/rest" outputdir="${generated.sources}/java" - package="org.apache.hadoop.hbase.generated.rest" - webxml="${build.webapps}/rest/WEB-INF/web.xml"/> + <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath" /> + <mkdir dir="${build.webapps}/rest/WEB-INF" /> + <jspcompiler uriroot="${src.webapps}/rest" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.rest" webxml="${build.webapps}/rest/WEB-INF/web.xml" /> </target> </configuration> <goals> @@ -168,7 +161,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 9025545..78c4f49 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-server</artifactId> @@ -153,23 +153,23 @@ <phase>generate-sources</phase> <configuration> <target> - <property name="build.webapps" location="${project.build.directory}/hbase-webapps"/> - <property name="src.webapps" location="${basedir}/src/main/resources/hbase-webapps"/> - <property name="generated.sources" location="${project.build.directory}/generated-sources"/> - <mkdir dir="${build.webapps}"/> + <property name="build.webapps" location="${project.build.directory}/hbase-webapps" /> + <property name="src.webapps" location="${basedir}/src/main/resources/hbase-webapps" /> + <property name="generated.sources" location="${project.build.directory}/generated-sources" /> + <mkdir dir="${build.webapps}" /> <copy todir="${build.webapps}"> <fileset dir="${src.webapps}"> - <exclude name="**/*.jsp"/> - <exclude name="**/.*"/> - <exclude name="**/*~"/> + <exclude name="**/*.jsp" /> + <exclude name="**/.*" /> + <exclude name="**/*~" /> </fileset> </copy> <!--The compile.classpath is passed in by maven --> - <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/> - <mkdir dir="${build.webapps}/master/WEB-INF"/> - <jspcompiler uriroot="${src.webapps}/master" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.master" webxml="${build.webapps}/master/WEB-INF/web.xml"/> - <mkdir dir="${build.webapps}/regionserver/WEB-INF"/> - <jspcompiler uriroot="${src.webapps}/regionserver" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.regionserver" webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/> + <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath" /> + <mkdir dir="${build.webapps}/master/WEB-INF" /> + <jspcompiler uriroot="${src.webapps}/master" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.master" webxml="${build.webapps}/master/WEB-INF/web.xml" /> + <mkdir dir="${build.webapps}/regionserver/WEB-INF" /> + <jspcompiler uriroot="${src.webapps}/regionserver" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.regionserver" webxml="${build.webapps}/regionserver/WEB-INF/web.xml" /> </target> </configuration> <goals> @@ -315,7 +315,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -328,7 +328,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> @@ -650,12 +650,12 @@ <goals><goal>run</goal></goals> <configuration> <target> - <mkdir dir="${project.build.directory}/native"/> + <mkdir dir="${project.build.directory}/native" /> <exec executable="cmake" dir="${project.build.directory}/native" failonerror="true"> - <arg line="${basedir}/src/main/native -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/> + <arg line="${basedir}/src/main/native -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}" /> </exec> <exec executable="make" dir="${project.build.directory}/native" failonerror="true"> - <arg line="VERBOSE=1"/> + <arg line="VERBOSE=1" /> </exec> </target> </configuration> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-shaded/hbase-shaded-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index f6727c3a..8fc6d61 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -1,6 +1,4 @@ -<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";> +<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 @@ -24,7 +22,7 @@ <parent> <artifactId>hbase-shaded</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-shaded-client</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-shaded/hbase-shaded-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-server/pom.xml b/hbase-shaded/hbase-shaded-server/pom.xml index e9f65a4..8071427 100644 --- a/hbase-shaded/hbase-shaded-server/pom.xml +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -1,6 +1,4 @@ -<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";> +<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 @@ -24,7 +22,7 @@ <parent> <artifactId>hbase-shaded</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-shaded-server</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 56dca2c..6f7e3af 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-shaded</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-shell/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 369423d..5dc8838 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-shell</artifactId> @@ -168,7 +168,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -181,7 +181,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-testing-util/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index be1a048..2a79f07 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-testing-util</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index b87b14f..2afe3c5 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>hbase</artifactId> <groupId>org.apache.hbase</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>hbase-thrift</artifactId> @@ -105,21 +105,21 @@ <phase>generate-sources</phase> <configuration> <target> - <property name="build.webapps" location="${project.build.directory}/hbase-webapps"/> - <property name="src.webapps" location="${basedir}/src/main/resources/hbase-webapps"/> - <property name="generated.sources" location="${project.build.directory}/generated-sources"/> - <mkdir dir="${build.webapps}"/> + <property name="build.webapps" location="${project.build.directory}/hbase-webapps" /> + <property name="src.webapps" location="${basedir}/src/main/resources/hbase-webapps" /> + <property name="generated.sources" location="${project.build.directory}/generated-sources" /> + <mkdir dir="${build.webapps}" /> <copy todir="${build.webapps}"> <fileset dir="${src.webapps}"> - <exclude name="**/*.jsp"/> - <exclude name="**/.*"/> - <exclude name="**/*~"/> + <exclude name="**/*.jsp" /> + <exclude name="**/.*" /> + <exclude name="**/*~" /> </fileset> </copy> <!--The compile.classpath is passed in by maven --> - <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/> - <mkdir dir="${build.webapps}/thrift/WEB-INF"/> - <jspcompiler uriroot="${src.webapps}/thrift" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.thrift" webxml="${build.webapps}/thrift/WEB-INF/web.xml"/> + <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath" /> + <mkdir dir="${build.webapps}/thrift/WEB-INF" /> + <jspcompiler uriroot="${src.webapps}/thrift" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.thrift" webxml="${build.webapps}/thrift/WEB-INF/web.xml" /> </target> </configuration> <goals> @@ -174,7 +174,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -187,7 +187,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -200,7 +200,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/hbase/blob/43b0a661/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 30cff0e..ffb0748 100644 --- a/pom.xml +++ b/pom.xml @@ -33,13 +33,13 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>12</version> - <relativePath/> + <relativePath /> <!-- no parent resolution --> </parent> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> <packaging>pom</packaging> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> <name>Apache HBase</name> <description> Apache HBase is the Hadoop database. Use it when you need @@ -664,7 +664,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1137,9 +1137,9 @@ <configuration> <backend>pdf</backend> <attributes> - <pagenums/> - <toc/> - <idprefix/> + <pagenums /> + <toc /> + <idprefix /> <idseparator>-</idseparator> </attributes> </configuration> @@ -1305,7 +1305,7 @@ <surefire.testFailureIgnore>false</surefire.testFailureIgnore> <test.output.tofile>true</test.output.tofile> <surefire.timeout>900</surefire.timeout> - <test.exclude.pattern></test.exclude.pattern> + <test.exclude.pattern /> <!-- default Xmx value is 2800m. Use -Dsurefire.Xmx=xxg to run tests with different JVM Xmx value --> <surefire.Xmx>2800m</surefire.Xmx> <surefire.cygwinXmx>2800m</surefire.cygwinXmx> @@ -2391,7 +2391,7 @@ <surefire.firstPartForkCount>1</surefire.firstPartForkCount> <surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipSecondPart>true</surefire.skipSecondPart> - <surefire.firstPartGroups/> + <surefire.firstPartGroups /> </properties> </profile> <profile> @@ -2405,7 +2405,7 @@ <surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipSecondPart>true</surefire.skipSecondPart> <surefire.firstPartGroups>org.apache.hadoop.hbase.testclassification.SmallTests</surefire.firstPartGroups> - <surefire.secondPartGroups/> + <surefire.secondPartGroups /> </properties> </profile> <profile> @@ -2418,7 +2418,7 @@ <surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipSecondPart>true</surefire.skipSecondPart> <surefire.firstPartGroups>org.apache.hadoop.hbase.testclassification.MediumTests</surefire.firstPartGroups> - <surefire.secondPartGroups/> + <surefire.secondPartGroups /> </properties> </profile> <profile> @@ -2431,7 +2431,7 @@ <surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipSecondPart>true</surefire.skipSecondPart> <surefire.firstPartGroups>org.apache.hadoop.hbase.testclassification.LargeTests</surefire.firstPartGroups> - <surefire.secondPartGroups/> + <surefire.secondPartGroups /> </properties> </profile> <profile> @@ -2475,7 +2475,7 @@ <surefire.provider>surefire-junit4</surefire.provider> <surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipSecondPart>true</surefire.skipSecondPart> - <surefire.firstPartGroups/> + <surefire.firstPartGroups /> </properties> </profile> <!-- Profile for running clover. You need to have a clover license under ~/.clover.license for ${clover.version}
