Skip to content

Commit

Permalink
JSON-B 3.0.0 and github actions (#288)
Browse files Browse the repository at this point in the history 
* JSON-B 3.0.0 and github actions added

Signed-off-by: David Kral <david.k.kral@oracle.com>
  • Loading branch information
@Verdent
Verdent committed Oct 21, 2021
1 parent de9d2bc commit 2afb4d4
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 111 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/maven.yml
View file
@@ -0,0 +1,51 @@
#
# 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.
#
# This Source Code may also be made available under the following Secondary
# Licenses when the conditions for such availability set forth in the
# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
# version 2 with the GNU Classpath Exception, which is available at
# https://www.gnu.org/software/classpath/license.html.
#
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#

name: JSON-B API

on: [push, pull_request]

jobs:
build:
name: JSON-B API compilation
runs-on: ubuntu-latest

steps:
- name: Checkout for build
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Set up compile JDK
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11
- name: Maven cache
uses: actions/cache@v2
env:
cache-name: maven-cache
with:
path:
~/.m2
key: build-${{ env.cache-name }}
- name: API compilation
run: cd api && mvn clean install
- name: TCK test compilation
run: cd tck && mvn clean install
- name: Javadoc compilation
run: cd docs && mvn clean install
- name: Generating specification
run: cd spec && mvn clean install
106 changes: 15 additions & 91 deletions api/pom.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016, 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
Expand All @@ -23,12 +23,12 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
</parent>

<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>JSON-B API</name>
Expand Down Expand Up @@ -86,13 +86,13 @@
<release.spec.feedback>jsonb-dev@eclipse.org</release.spec.feedback>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<milestone.number>01</milestone.number>
<new.spec.version>2.0.0</new.spec.version>
<new.spec.version>3.0.0</new.spec.version>
<non.final>false</non.final>
<skip.release.tests>false</skip.release.tests>
<spec.version>2.0</spec.version>
<jakarta.json.version>2.0.0</jakarta.json.version>
<spec.version>3.0</spec.version>
<jakarta.json.version>2.0.1</jakarta.json.version>
<!-- The version of JSON-B API to compare against to verify we follow semantic versioning rules -->
<baseline.compare.version>1.0.2</baseline.compare.version>
<baseline.compare.version>2.0.0</baseline.compare.version>
<api_package>jakarta.json.bind</api_package>
<legal.doc.source>${project.basedir}/..</legal.doc.source>
<vendor.name>Oracle Corporation</vendor.name>
Expand Down Expand Up @@ -127,57 +127,6 @@
</dependencies>

<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>jdk-11</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<jdk>(,9)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>final</id>
<activation>
Expand Down Expand Up @@ -252,34 +201,8 @@
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
<release>11</release>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<release>11</release>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<!-- recompile everything for 1.8 except the module-info.java -->
<configuration>
<release>8</release>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<release>11</release>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- This plugin generates the buildNumber property used in maven-bundle-plugin -->
Expand Down Expand Up @@ -377,23 +300,23 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<source>8</source>
<source>11</source>
<doctitle>Jakarta JSON Binding ${project.version} API Specification</doctitle>
<sourceFileExcludes>
<sourceFileExclude>**/module-info.java</sourceFileExclude>
<sourceFileExclude>target/**/*.java</sourceFileExclude>
</sourceFileExcludes>
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://docs.oracle.com/en/java/javase/11/docs/api/</link>
</links>
<detectJavaApiLink>false</detectJavaApiLink>
<detectOfflineLinks>false</detectOfflineLinks>
<header><![CDATA[<br>Jakarta JSON Binding API v${project.version}]]>
</header>
<bottom><![CDATA[
Comments to: <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br>
Copyright &#169; 2019, 2020 Eclipse Foundation. All Rights Reserved.<br>
Copyright &#169; 2019, 2021 Eclipse Foundation. All Rights Reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>
Expand Down Expand Up @@ -435,7 +358,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
<configuration>
<excludeFile>${basedir}/../etc/config/copyright-exclude</excludeFile>
<scm>git</scm>
Expand All @@ -452,6 +375,7 @@
<executions>
<execution>
<goals>
<goal>copyright</goal>
<goal>check</goal>
</goals>
<phase>compile</phase>
Expand Down Expand Up @@ -554,12 +478,12 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
<version>4.3.0</version>
<version>6.0.0</version>
<configuration>
<base>
<version>${baseline.compare.version}</version>
</base>
</configuration>
</configuration>
<executions>
<execution>
<id>baseline</id>
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/json/bind/Jsonb.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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
Expand Down
5 changes: 4 additions & 1 deletion api/src/main/java/module-info.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
Expand All @@ -14,6 +14,9 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

/**
* Jakarta JSON Binding API.
*/
module jakarta.json.bind {
exports jakarta.json.bind;
exports jakarta.json.bind.adapter;
Expand Down
23 changes: 13 additions & 10 deletions docs/pom.xml
View file
Expand Up @@ -15,7 +15,7 @@

<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-docs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JSON Binding Docs</name>

Expand All @@ -28,15 +28,8 @@

<repositories>
<repository>
<id>rubygems-proxy-releases2</id>
<name>RubyGems.org Proxy (Releases)</name>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>

Expand Down Expand Up @@ -119,5 +112,15 @@
</executions>
</plugin>
</plugins>

<!-- This extension converts reubygems repository to maven repository on the fly -->
<!-- This is needed because of the old maven proxy address does not support HTTPS -->
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>1.0.3</version>
</extension>
</extensions>
</build>
</project>
4 changes: 2 additions & 2 deletions spec/pom.xml
View file
Expand Up @@ -20,14 +20,14 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>jakarta.json.bind</groupId>
<artifactId>jsonb-spec</artifactId>
<packaging>pom</packaging>
<version>2.0-SNAPSHOT</version>
<version>3.0-SNAPSHOT</version>
<name>Jakarta JSON Binding Specification</name>

<properties>
Expand Down
12 changes: 6 additions & 6 deletions tck/pom.xml
View file
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
</parent>

<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>JSON-B TCK</name>
Expand All @@ -48,8 +48,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
</properties>

<dependencies>
Expand All @@ -62,13 +62,13 @@
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.0.0-RC1</version>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.0-RC4</version>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 2afb4d4

Please sign in to comment.