From c9ae9aa32875df1806998eb1de369e0b35a0aafb Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Wed, 26 Apr 2023 16:43:37 +0200
Subject: [PATCH] update dependencies, plugins

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .gitignore     |  4 +-
 .travis.yml    | 29 ---------------
 policy/pom.xml | 99 ++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 78 insertions(+), 54 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.gitignore b/.gitignore
index eca7db8..3916ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/policy/target/
\ No newline at end of file
+.idea
+/policy/target/
+*.iml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8876eb7..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019, 2021 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
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-language: java
-
-jdk:
-  - oraclejdk11
-  - openjdk-ea
-
-cache:
-  directories:
-    - .autoconf
-    - $HOME/.m2
-
-install:
-  - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/lukasj/c176740acd96e255a84851277b9d9d14/raw/dca8d8be04acc614f0dd03dbee1891829250d857/jakarta-settings.xml
-
-script:
-  - cd policy
-  - mvn -B -V -U -C -Pstaging,oss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true
-
-git:
-  depth: false
\ No newline at end of file
diff --git a/policy/pom.xml b/policy/pom.xml
index 9740cc4..418356e 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2023 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
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
         <relativePath/>
     </parent>
 
@@ -81,10 +81,10 @@
         <spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.0.0</spotbugs.version>
+        <spotbugs.version>4.7.3.4</spotbugs.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <istack.version>3.0.11</istack.version>
+        <istack.version>3.0.12</istack.version>
         <legal.doc.source>${project.basedir}/..</legal.doc.source>
     </properties>
 
@@ -93,6 +93,12 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>2.3.3</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>com.sun.activation</groupId>-->
+<!--                    <artifactId>*</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
@@ -100,6 +106,12 @@
             <version>5.4.0</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+            <version>4.2</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <!-- javac requires this to be on the compile-classpath -->
             <groupId>jakarta.activation</groupId>
@@ -110,7 +122,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -121,12 +133,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.sun.istack</groupId>
@@ -136,17 +148,17 @@
                 <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.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.2</version>
+                    <version>5.1.8</version>
                     <configuration>
                         <instructions>
                             <_noextraheaders>true</_noextraheaders>
@@ -161,12 +173,12 @@
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
                     <artifactId>glassfish-copyright-maven-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -176,17 +188,51 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>3.0.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M4</version>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>2.15.0</version>
+                    <configuration>
+                        <!-- stick with javax namespace only -->
+                        <ruleSet>
+                            <rules>
+                                <rule>
+                                    <groupId>com.sun.istack</groupId>
+                                    <ignoreVersions>
+                                        <ignoreVersion>
+                                            <type>regex</type>
+                                            <version>[4-9].*</version>
+                                        </ignoreVersion>
+                                    </ignoreVersions>
+                                </rule>
+                                <rule>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <ignoreVersions>
+                                        <ignoreVersion>
+                                            <type>regex</type>
+                                            <version>2.[4-9]+.*</version>
+                                        </ignoreVersion>
+                                        <ignoreVersion>
+                                            <type>regex</type>
+                                            <version>[3-9].*</version>
+                                        </ignoreVersion>
+                                    </ignoreVersions>
+                                </rule>
+                            </rules>
+                        </ruleSet>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -221,11 +267,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
-                    <compilerArguments>
-                        <Xlint:all/>
-                    </compilerArguments>
+                    <release>11</release>
+                    <createMissingPackageInfoClass>false</createMissingPackageInfoClass>
+                    <compilerArgs combine.children="append">
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
                 </configuration>
                 <executions>
                     <execution>
@@ -235,8 +281,6 @@
                         </goals>
                         <configuration>
                             <release>8</release>
-                            <source>1.8</source>
-                            <target>1.8</target>
                             <excludes>
                                 <exclude>module-info.java</exclude>
                             </excludes>
@@ -277,6 +321,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
@@ -330,7 +381,6 @@
                 <configuration>
                     <skip>${spotbugs.skip}</skip>
                     <threshold>${spotbugs.threshold}</threshold>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                     <excludeFilterFile>
                         ${spotbugs.exclude}
                     </excludeFilterFile>
@@ -384,6 +434,7 @@
                     </archive>
                     <release>11</release>
                     <notimestamp>true</notimestamp>
+                    <doclint>-missing</doclint>
                 </configuration>
             </plugin>
         </plugins>
@@ -398,7 +449,7 @@
                         <plugin>
                             <groupId>org.jacoco</groupId>
                             <artifactId>jacoco-maven-plugin</artifactId>
-                            <version>0.8.5</version>
+                            <version>0.8.10</version>
                         </plugin>
                     </plugins>
                 </pluginManagement>