accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch 'pom-update-626'
Date Mon, 10 Sep 2018 01:16:09 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 92ee8bebe37ec67aec28802f43960b0e9bb7f4be
Merge: de462d2 bc260dc
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Sun Sep 9 20:51:38 2018 -0400

    Merge branch 'pom-update-626'

 contrib/README.spotbugs                            | 24 -------
 .../impl/SeekableByteArrayInputStream.java         |  2 +-
 pom.xml                                            | 84 ++++------------------
 .../apache/accumulo/tserver/CompactionQueue.java   |  2 +-
 4 files changed, 17 insertions(+), 95 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/SeekableByteArrayInputStream.java
index e2b00d2,e9407e1..982556f
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/SeekableByteArrayInputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/SeekableByteArrayInputStream.java
@@@ -29,9 -29,9 +29,9 @@@ import java.io.InputStream
  public class SeekableByteArrayInputStream extends InputStream {
  
    // making this volatile for the following case
 -  // * thread 1 creates and initalizes byte array
 +  // * thread 1 creates and initializes byte array
    // * thread 2 reads from bye array
-   // Findbugs complains about this because thread2 may not see any changes to the byte array
after
+   // spotbugs complains about this because thread2 may not see any changes to the byte array
after
    // thread 1 set the volatile,
    // however the expectation is that the byte array is static. In the case of it being static,
    // volatile ensures that
diff --cc pom.xml
index 43d6787,44d6ada..ccf4eb7
--- a/pom.xml
+++ b/pom.xml
@@@ -124,26 -127,22 +124,26 @@@
      <failsafe.groups />
      <!-- surefire/failsafe plugin option -->
      <forkCount>1</forkCount>
 -    <hadoop.version>2.6.4</hadoop.version>
 +    <hadoop.version>3.0.2</hadoop.version>
 +    <hk2.version>2.5.0-b62</hk2.version>
      <htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
      <htrace.version>3.1.0-incubating</htrace.version>
 -    <httpclient.version>3.1</httpclient.version>
 +    <httpclient.version>4.5.6</httpclient.version>
      <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
 -    <!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
 -    <jetty.version>9.2.17.v20160517</jetty.version>
 -    <maven.compiler.source>1.7</maven.compiler.source>
 -    <maven.compiler.target>1.7</maven.compiler.target>
 -    <maven.plugin-version>3.0.5</maven.plugin-version>
 +    <jackson.version>2.9.6</jackson.version>
 +    <javax.el.version>2.2.4</javax.el.version>
 +    <jersey.version>2.27</jersey.version>
 +    <jetty.version>9.4.11.v20180605</jetty.version>
 +    <maven.compiler.source>1.8</maven.compiler.source>
 +    <maven.compiler.target>1.8</maven.compiler.target>
 +    <maven.plugin-version>3.2.5</maven.plugin-version>
      <!-- surefire/failsafe plugin option -->
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-     <powermock.version>1.6.6</powermock.version>
+     <powermock.version>1.7.4</powermock.version>
      <!-- surefire/failsafe plugin option -->
      <reuseForks>false</reuseForks>
 +    <servlet.api.version>3.1.0</servlet.api.version>
-     <slf4j.version>1.7.21</slf4j.version>
+     <slf4j.version>1.7.25</slf4j.version>
      <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
      <surefire.excludedGroups />
      <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
@@@ -204,7 -162,8 +204,7 @@@
        <dependency>
          <groupId>com.google.auto.service</groupId>
          <artifactId>auto-service</artifactId>
-         <version>1.0-rc2</version>
 -        <!-- rc4 and higher require Java 8 -->
 -        <version>1.0-rc3</version>
++        <version>1.0-rc4</version>
        </dependency>
        <dependency>
          <groupId>com.google.code.gson</groupId>
@@@ -982,11 -743,8 +946,8 @@@
            <configuration>
              <rules>
                <requireJavaVersion>
 -                <version>[1.8,)</version>
 +                <version>[${maven.compiler.target},)</version>
                </requireJavaVersion>
-               <requireMavenVersion>
-                 <version>[3.0.5,)</version>
-               </requireMavenVersion>
              </rules>
            </configuration>
            <dependencies>
@@@ -1063,52 -821,6 +1024,54 @@@
      </pluginManagement>
      <plugins>
        <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-dependency-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <id>analyze</id>
 +            <goals>
 +              <goal>analyze-only</goal>
 +            </goals>
 +            <configuration>
 +              <failOnWarning>true</failOnWarning>
 +              <ignoredUsedUndeclaredDependencies>
 +                <!-- used/undeclared child jars brought in by parents below -->
 +                <usedUndeclaredDependency>org.apache.curator:curator-client:jar:${curator.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.apache.hadoop:hadoop-hdfs:*:${hadoop.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.apache.hadoop:hadoop-mapreduce-client-core:jar:${hadoop.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.apache.httpcomponents:httpcore:jar:*</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.glassfish.jersey.ext:jersey-mvc:jar:${jersey.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.glassfish.jersey.core:jersey-server:jar:${jersey.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.glassfish.jersey.core:jersey-common:jar:${jersey.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.powermock:powermock-core:jar:${powermock.version}</usedUndeclaredDependency>
 +                <usedUndeclaredDependency>org.powermock:powermock-reflect:jar:${powermock.version}</usedUndeclaredDependency>
 +              </ignoredUsedUndeclaredDependencies>
 +              <ignoredUnusedDeclaredDependencies>
++                <!-- auto-service isn't detected as use since the annotation has retention
of source -->
++                <unusedDeclaredDependency>com.google.auto.service:auto-service:jar:1.0-rc4</unusedDeclaredDependency>
 +                <!-- unused/declared implementation jars or parent jars that bring in
children -->
 +                <unusedDeclaredDependency>org.apache.hadoop:hadoop-client:jar:${hadoop.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.apache.hadoop:hadoop-minicluster:jar:${hadoop.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.apache.httpcomponents:httpclient:jar:${httpclient.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.glassfish.jersey.containers:jersey-container-jetty-http:jar:${jersey.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.glassfish.jersey.ext:jersey-bean-validation:jar:${jersey.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.glassfish.jersey.inject:jersey-hk2:jar:${jersey.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:jar:${jersey.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.powermock:powermock-api-easymock:jar:${powermock.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.slf4j:slf4j-log4j12:jar:${slf4j.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>org.apache.httpcomponents:httpclient:jar:${httpclient.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>junit:junit:jar:4.12</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>javax.servlet:javax.servlet-api:jar:${servlet.api.version}</unusedDeclaredDependency>
 +                <unusedDeclaredDependency>javax.el:javax.el-api:jar:${javax.el.version}</unusedDeclaredDependency>
 +              </ignoredUnusedDeclaredDependencies>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +      <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>build-helper-maven-plugin</artifactId>
          <executions>


Mime
View raw message