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 '2.0'
Date Wed, 19 Jun 2019 19:41:36 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 7e2b9010d4c612c7c71a12b0e4ce5740bcb36e90
Merge: a4d1518 a2d64c9
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Wed Jun 19 15:41:21 2019 -0400

    Merge branch '2.0'

 assemble/pom.xml                                   |  22 ++--
 assemble/src/main/assemblies/component.xml         |   6 +-
 pom.xml                                            | 138 +++++++++++----------
 .../org/apache/accumulo/tracer/TraceServer.java    |   6 +-
 test/pom.xml                                       |   2 +-
 5 files changed, 91 insertions(+), 83 deletions(-)

diff --cc pom.xml
index 12c649e,e3483ac..be8f2fe
--- a/pom.xml
+++ b/pom.xml
@@@ -129,16 -129,13 +129,16 @@@
      <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
      <jackson.version>2.9.9</jackson.version>
      <javax.el.version>3.0.1-b06</javax.el.version>
-     <jaxb.version>2.3.0</jaxb.version>
-     <jersey.version>2.27</jersey.version>
-     <jetty.version>9.4.17.v20190418</jetty.version>
+     <jaxb.version>2.3.0.1</jaxb.version>
+     <jersey.version>2.28</jersey.version>
+     <jetty.version>9.4.19.v20190610</jetty.version>
 -    <maven.compiler.source>1.8</maven.compiler.source>
 -    <maven.compiler.target>1.8</maven.compiler.target>
 +    <maven.compiler.release>11</maven.compiler.release>
 +    <maven.compiler.source>11</maven.compiler.source>
 +    <maven.compiler.target>11</maven.compiler.target>
      <!-- surefire/failsafe plugin option -->
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 +    <!-- temporary until other Java 11 issues are resolved -->
 +    <modernizer.skip>true</modernizer.skip>
      <powermock.version>2.0.2</powermock.version>
      <!-- surefire/failsafe plugin option -->
      <reuseForks>false</reuseForks>
@@@ -947,13 -951,13 +954,6 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-enforcer-plugin</artifactId>
-           <configuration>
-             <rules>
-               <requireJavaVersion>
-                 <version>[${maven.compiler.target},)</version>
-               </requireJavaVersion>
-             </rules>
-           </configuration>
 -          <dependencies>
 -            <dependency>
 -              <groupId>org.codehaus.mojo</groupId>
 -              <artifactId>animal-sniffer-enforcer-rule</artifactId>
 -              <version>1.18</version>
 -            </dependency>
 -          </dependencies>
          </plugin>
          <plugin>
            <!-- Allows us to get the apache-ds bundle artifacts -->
@@@ -1116,7 -1114,36 +1118,18 @@@
                <goal>enforce</goal>
              </goals>
              <phase>validate</phase>
+             <configuration>
+               <rules>
+                 <requireMavenVersion>
+                   <!-- org.apache.felix:maven-bundle-plugin declares that it needs 3.5.0
-->
+                   <version>[3.5.0,)</version>
+                 </requireMavenVersion>
+                 <requireJavaVersion>
+                   <version>[${maven.compiler.target},)</version>
+                 </requireJavaVersion>
+               </rules>
+             </configuration>
            </execution>
 -          <execution>
 -            <id>enforce-java-signatures</id>
 -            <goals>
 -              <goal>enforce</goal>
 -            </goals>
 -            <phase>process-test-classes</phase>
 -            <configuration>
 -              <rules>
 -                <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
 -                  <signature>
 -                    <groupId>org.codehaus.mojo.signature</groupId>
 -                    <artifactId>java18</artifactId>
 -                    <version>1.0</version>
 -                  </signature>
 -                </checkSignatureRule>
 -              </rules>
 -            </configuration>
 -          </execution>
          </executions>
        </plugin>
        <plugin>
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index cc68f4a,fd6b02a..d029b53
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -233,12 -233,12 +233,8 @@@ public class TraceServer implements Wat
     * misconfigurations that aren't likely to change on retry).
     *
     * @return a working Connection that can be reused
--   * @throws ClassNotFoundException
--   *           if TRACE_TOKEN_TYPE is set to a class that we can't load.
--   * @throws InstantiationException
++   * @throws ReflectiveOperationException
     *           if we fail to create an instance of TRACE_TOKEN_TYPE.
--   * @throws IllegalAccessException
--   *           if the class pointed to by TRACE_TOKEN_TYPE is private.
     * @throws AccumuloSecurityException
     *           if the trace user has the wrong permissions
     */


Mime
View raw message