Project cleanup. (#111)

* Project cleanup. * Fixed build and removed Travis job. Signed-off-by: Tomas Kraus <tomas.kraus@oracle.com>
jakartaee · Aug 18, 2021 · 1bcd6d2 · 1bcd6d2
1 parent ec8dc9d
commit 1bcd6d2
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 40 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2021 Contributors to the Eclipse Foundation
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0,
+# or the Eclipse Distribution License v. 1.0 which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+#
+
+name: SAAJ API
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    name: Test on JDK ${{ matrix.java_version }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java_version: [ 11, 17-ea ]
+
+    steps:
+    - name: Checkout for build
+      uses: actions/checkout@v2.3.4
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'zulu'
+        java-version: ${{ matrix.java_version }}
+    - name: Verify
+      run: cd api && mvn -B -V -U -C -Poss-release -Pstaging clean verify -Dgpg.skip=true
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -6,10 +6,12 @@
 [//]: # "  "
 [//]: # " SPDX-License-Identifier: BSD-3-Clause "
 
-[![Build Status](https://travis-ci.com/eclipse-ee4j/saaj-api.svg?branch=master)](https://travis-ci.com/eclipse-ee4j/saaj-api)
-
 # Jakarta SOAP with Attachments
 
+[![Build Status](https://github.com/eclipse-ee4j/saaj-api/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/eclipse-ee4j/saaj-api/actions/workflows/maven.yml?branch=master)
+[![Jakarta Staging (Snapshots)](https://img.shields.io/nexus/s/https/jakarta.oss.sonatype.org/jakarta.xml.soap/jakarta.xml.soap-api.svg)](https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/xml/soap/jakarta.xml.soap-api/)
+
+
 Jakarta SOAP with Attachments defines an API enabling developers to produce
 and consume messages conforming to the SOAP 1.1, SOAP 1.2, and SOAP Attachments Feature.
 
@@ -40,4 +42,3 @@ the license text included in every source file.
 
 We use [contribution policy](CONTRIBUTING.md), which means we can only accept contributions under
 the terms of [Eclipse Contributor Agreement](http://www.eclipse.org/legal/ECA.php).
-
diff --git a/api/pom.xml b/api/pom.xml
@@ -17,20 +17,20 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <copyright.exclude>${project.basedir}/copyright-exclude</copyright.exclude>
+        <copyright.exclude>${project.basedir}/../etc/copyright-exclude</copyright.exclude>
         <copyright.ignoreyear>false</copyright.ignoreyear>
         <copyright.scmonly>true</copyright.scmonly>
-        <copyright.templatefile>${project.basedir}/edl-copyright_template.txt</copyright.templatefile>
+        <copyright.templatefile>${project.basedir}/../etc/edl-copyright_template.txt</copyright.templatefile>
         <copyright.update>false</copyright.update>
-        <spotbugs.exclude>exclude.xml</spotbugs.exclude>
+        <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.2.0</spotbugs.version>
+        <spotbugs.version>4.3.0</spotbugs.version>
 
         <extension.name>jakarta.xml.soap</extension.name>
         <spec.version>1.4</spec.version>
@@ -120,9 +120,8 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <!-- FIXME: jUnit tests are failing with 2.21.0 and later -->
                     <version>2.20</version>
-                    <!-- FIXME: 6 jUnit tests are failing with 2.21.0 and later -->
-                    <!--version>2.22.1</version-->
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -156,12 +155,16 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
                     <version>${spotbugs.version}</version>
+                    <configuration>
+                        <skip>${spotbugs.skip}</skip>
+                        <threshold>${spotbugs.threshold}</threshold>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -171,7 +174,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.0.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -262,6 +265,8 @@
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                     </compilerArgs>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
                 </configuration>
                 <executions>
                     <execution>
@@ -420,12 +425,18 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <skip>${spotbugs.skip}</skip>
-                    <threshold>${spotbugs.threshold}</threshold>
-                    <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
                     <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                     <fork>true</fork>
+                    <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
+                    <failThreshold>High</failThreshold>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
 

diff --git a/api/copyright-exclude → etc/copyright-exclude b/api/copyright-exclude → etc/copyright-exclude
diff --git a/api/edl-copyright_template.txt → etc/edl-copyright_template.txt b/api/edl-copyright_template.txt → etc/edl-copyright_template.txt
diff --git a/api/exclude.xml → etc/spotbugs-exclude.xml b/api/exclude.xml → etc/spotbugs-exclude.xml