update dependencies,

update build plugins, update src level to 17, fix javadoc build issues Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 14, 2022 · d4616ff · d4616ff
1 parent c90ef53
commit d4616ff
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 70 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -80,13 +80,14 @@
 
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.3.0</spotbugs.version>
-        <activation.version>2.1.0-RC1</activation.version>
-        <xml.bind-api.version>4.0.0-RC1</xml.bind-api.version>
+        <spotbugs.version>4.5.3.0</spotbugs.version>
+        <activation.version>2.1.0</activation.version>
+        <xml.bind-api.version>4.0.0-RC3</xml.bind-api.version>
         <junit.version>4.13.2</junit.version>
 
         <config.dir>${project.basedir}/etc/config</config.dir>
         <legal.doc.source>${project.basedir}</legal.doc.source>
+        <maven.compiler.release>11</maven.compiler.release>
 
     </properties>
 
@@ -134,11 +135,11 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.10.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -147,15 +148,15 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
@@ -166,16 +167,27 @@
                     <groupId>org.glassfish.copyright</groupId>
                     <artifactId>glassfish-copyright-maven-plugin</artifactId>
                     <version>2.4</version>
+                    <configuration>
+                        <templateFile>${copyright.template}</templateFile>
+                        <excludeFile>${copyright.exclude}</excludeFile>
+                        <!-- skip files not under SCM-->
+                        <scmOnly>${copyright.scmonly}</scmOnly>
+                        <!-- for use with repair -->
+                        <update>${copyright.update}</update>
+                        <!-- check that year is correct -->
+                        <ignoreYear>${copyright.ignoreyear}</ignoreYear>
+                        <quiet>false</quiet>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.1</version>
+                    <version>5.1.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -185,7 +197,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>3.0.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -242,34 +254,22 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>9</release>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
+                        <arg>-Xdoclint:all,-missing</arg>
                     </compilerArgs>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>base-compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <release>8</release>
-                            <excludes>
-                                <exclude>module-info.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <release>11</release>
                     <notimestamp>true</notimestamp>
+                    <quiet>true</quiet>
+                    <doclint>all,-missing</doclint>
+                    <failOnWarnings>true</failOnWarnings>
                 </configuration>
             </plugin>
             <plugin>
@@ -281,29 +281,6 @@
                     <fork>true</fork>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.glassfish.copyright</groupId>
-                <artifactId>glassfish-copyright-maven-plugin</artifactId>
-                <configuration>
-                    <templateFile>${copyright.template}</templateFile>
-                    <excludeFile>${copyright.exclude}</excludeFile>
-                    <!-- skip files not under SCM-->
-                    <scmOnly>${copyright.scmonly}</scmOnly>
-                    <!-- for use with repair -->
-                    <update>${copyright.update}</update>
-                    <!-- check that year is correct -->
-                    <ignoreYear>${copyright.ignoreyear}</ignoreYear>
-                    <quiet>false</quiet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>

diff --git a/src/main/java/org/jvnet/staxex/Base64EncoderStream.java b/src/main/java/org/jvnet/staxex/Base64EncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -43,7 +43,6 @@ public Base64EncoderStream(OutputStream out) {
 
     /**
      * Create a BASE64 encoder that encodes the specified input stream
-     * @param out
      */
     public Base64EncoderStream(XMLStreamWriter outWriter, OutputStream out) {
         super(out);

diff --git a/src/main/java/org/jvnet/staxex/StreamingDataHandler.java b/src/main/java/org/jvnet/staxex/StreamingDataHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -58,7 +58,7 @@ public StreamingDataHandler(DataSource dataSource) {
      * <p>
      * This is used as a signal from the caller that there will
      * be no further {@link #getInputStream()} invocation nor
-     * {@link #readOnce()} invocation on this object (which would
+     * {@code readOnce()} invocation on this object (which would
      * result in {@link IOException}.)
      *
      * <p>
@@ -68,7 +68,7 @@ public StreamingDataHandler(DataSource dataSource) {
      *
      * <p>
      * Note that it is legal to call {@link #getInputStream()}
-     * multiple times and then call {@link #readOnce()} afterward.
+     * multiple times and then call {@code readOnce()} afterward.
      * Streams created such a way can be read in any order &mdash;
      * there's no requirement that streams created earlier must be read
      * first.
@@ -118,7 +118,6 @@ public StreamingDataHandler(DataSource dataSource) {
      * behave in undefined fashion. For a simliar reason,
      * calling this method multiple times will cause
      * undefined behavior.  
-     * @param dst
      * @throws IOException for errors
      */
     public abstract void moveTo(File dst) throws IOException;

diff --git a/src/main/java/org/jvnet/staxex/XMLStreamReaderEx.java b/src/main/java/org/jvnet/staxex/XMLStreamReaderEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -168,8 +168,7 @@ public interface XMLStreamReaderEx extends XMLStreamReader {
      * {@code getElementText().trim()}.
      *
      * @throws XMLStreamException for errors
-     * @return 
-     * @see #getElementText() 
+     * @see #getElementText()
      */
     String getElementTextTrim() throws XMLStreamException;
 }
diff --git a/src/main/java/org/jvnet/staxex/util/DOMStreamReader.java b/src/main/java/org/jvnet/staxex/util/DOMStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -317,7 +317,6 @@ public int getAttributeCount() {
 
     /**
      * Return an attribute's local name.Handle the case of DOM level 1 nodes.
-     * @return 
      */
     @Override
     public String getAttributeLocalName(int index) {
@@ -417,7 +416,6 @@ public int getEventType() {
 
     /**
      * Return an element's local name.Handle the case of DOM level 1 nodes.
-     * @return 
      */
     @Override
     public String getLocalName() {
@@ -502,8 +500,6 @@ public String getNamespaceURI() {
      * This method is not particularly fast, but shouldn't be called very 
      * often.If we start to use it more, we should keep track of the 
  NS declarations using a NamespaceContext implementation instead.
-     * @param prefix
-     * @return 
      */
     @Override
     public String getNamespaceURI(String prefix) {

diff --git a/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java b/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -68,7 +68,6 @@ public XMLStreamReaderToXMLStreamWriter() {
      * <p>
      * The {@link XMLStreamWriter} never receives a start/end document event.
      * Those need to be written separately by the caller.
-     * @throws javax.xml.stream.XMLStreamException
      */
     public void bridge(XMLStreamReader in, XMLStreamWriter out) throws XMLStreamException {
         bridge(in, out, null);
@@ -216,7 +215,6 @@ protected void handleStartElement() throws XMLStreamException {
      *
      * <p>
      * Used from {@link #handleStartElement()}.
-     * @throws javax.xml.stream.XMLStreamException
      */
     protected void handleAttribute(int i) throws XMLStreamException {
         String nsUri = in.getAttributeNamespace(i);

diff --git a/src/test/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriterTest.java b/src/test/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -33,7 +33,6 @@ public XMLStreamReaderToXMLStreamWriterTest() {
      * namespace prefixes to the XMLStreamWriter because some writers used by us
      * cannot handle the null prefix
      *
-     * @throws XMLStreamException
      */
     @Test
     public void testNullNamespacePrefix() throws XMLStreamException {