Skip to content

Commit

Permalink
PHOENIX-6077 PHOENIX-5946 breaks mvn verify
Browse files Browse the repository at this point in the history 
make sure IT is run by maven
replace commomns-lang with commons-lang3 like in the rest of Phoenix
POM cleanups
(unrelated) add ASL2 header to to rebuild_hbase.sh
  • Loading branch information
@stoty
stoty committed Aug 15, 2020
1 parent 56b5c01 commit aac2633
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 83 deletions.
15 changes: 15 additions & 0 deletions dev/rebuild_hbase.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
#!/usr/bin/env bash
# Licensed 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.

# Rebuilds HBase with -Dhadoop.profile=3.0 locally, to work around PHOENIX-5993
# Intended mainly for CI jobs, but can simplify manual rebuilds as well.

# The name of the Apache Hbase source file
HBASE_SOURCE_NAME="hbase-$1-src.tar.gz"
# The relative path on the ASF mirrors for the Hbase source file
Expand Down
101 changes: 21 additions & 80 deletions phoenix-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,11 @@
<artifactId>phoenix-tools</artifactId>

<dependencies>
<!-- Depend on all other internal projects -->
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
Expand All @@ -36,51 +26,42 @@
<artifactId>hbase-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>

<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-it</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>config</directory>
<excludes>
<exclude>**/*.sql</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<directory>${project.basedir}/config</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -92,54 +73,14 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>
javax.activation:activation
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
javax.xml.bind:jaxb-api
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
org.glassfish.jaxb:jax-runtime
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
org.apache.hbase:hbase-it
</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<workingDirectory>${java.io.tmpdir}</workingDirectory>
<forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<exclude>*/RESULTS/**</exclude>
<exclude>README.md</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 2 additions & 2 deletions phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.apache.phoenix.schema;

import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
Expand All @@ -24,7 +24,7 @@

import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;

public class SchemaExtractionToolIT extends BaseTest {
public class SchemaExtractionToolIT extends ParallelStatsEnabledIT {

@BeforeClass
public static void setup() throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.hbase.HBaseConfiguration;
Expand Down

0 comments on commit aac2633

Please sign in to comment.