Project cleanup.
Signed-off-by: Tomas Kraus <tomas.kraus@oracle.com>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..d64dcfb
--- /dev/null
+++ 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: JSON-P 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
deleted file mode 100644
index 501f7b7..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
-#
-# 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
-#
-
-dist: bionic
-
-language: java
-
-jdk:
- - openjdk11
- - openjdk-ea
-
-cache:
- directories:
- - .autoconf
- - $HOME/.m2
-
-install: true
-
-script:
- - cd api
- - mvn -U -C -Pstaging,oss-release -Dgpg.skip=true clean install
diff --git a/README.md b/README.md
index 0731a6c..586a9ff 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,11 @@
[//]: # " "
[//]: # " SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 "
-[](https://travis-ci.org/eclipse-ee4j/jsonp)
-
# Jakarta JSON Processing
+[](https://github.com/eclipse-ee4j/jsonp/actions/workflows/maven.yml?branch=master)
+[](https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/json/jakarta.json-api/)
+
Jakarta JSON Processing provides portable APIs to parse, generate, transform, and query JSON documents.
This project contains Jakarta JSON Processing specification, API and TCK.
diff --git a/api/pom.xml b/api/pom.xml
index e2a66bb..88dc04b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7</version>
<relativePath/>
</parent>
@@ -75,15 +75,15 @@
</developers>
<properties>
- <config.dir>${project.root.location}/etc/config</config.dir>
- <copyright.exclude>${config.dir}/copyright-exclude</copyright.exclude>
- <copyright.templatefile>${config.dir}/copyright.txt</copyright.templatefile>
+ <copyright.exclude>${project.basedir}/../etc/copyright-exclude</copyright.exclude>
+ <copyright.templatefile>${project.basedir}/../etc/copyright.txt</copyright.templatefile>
<copyright.ignoreyear>false</copyright.ignoreyear>
<copyright.scmonly>true</copyright.scmonly>
<copyright.update>false</copyright.update>
+ <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
- <spotbugs.version>4.2.2</spotbugs.version>
+ <spotbugs.version>4.3.0</spotbugs.version>
<non.final>false</non.final>
<extension.name>jakarta.json</extension.name>
@@ -100,7 +100,6 @@
<artifactId>directory-maven-plugin</artifactId>
<version>0.3.1</version>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
@@ -149,17 +148,21 @@
<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>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.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>
</plugins>
</pluginManagement>
@@ -204,7 +207,6 @@
</executions>
</plugin>
<plugin>
- <!-- Requires validate target to initialize copyright.config.dir properly -->
<!-- e.g. mvn validate glassfish-copyright:repair -->
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
@@ -276,7 +278,7 @@
<locale>en,US</locale>
<pattern>yyyy</pattern>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -287,6 +289,8 @@
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
</configuration>
<executions>
<execution>
@@ -404,10 +408,10 @@
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <skip>${spotbugs.skip}</skip>
- <threshold>${spotbugs.threshold}</threshold>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
<fork>true</fork>
+ <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
+ <failThreshold>High</failThreshold>
</configuration>
</plugin>
</plugins>
diff --git a/api/etc/config/copyright-exclude b/etc/copyright-exclude
similarity index 100%
rename from api/etc/config/copyright-exclude
rename to etc/copyright-exclude
diff --git a/api/etc/config/copyright.txt b/etc/copyright.txt
similarity index 100%
rename from api/etc/config/copyright.txt
rename to etc/copyright.txt
diff --git a/api/etc/config/exclude.xml b/etc/spotbugs-exclude.xml
similarity index 100%
rename from api/etc/config/exclude.xml
rename to etc/spotbugs-exclude.xml
