Skip to content

backports from master #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasj merged 7 commits into from
Jun 17, 2022
Merged

backports from master #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6e3bfa
bump version to 1.0.1-SNAPSHOT
lukasj Jun 17, 2022
14e0383
integrate api 2.0.2
lukasj Jun 17, 2022
b602db2
update build plugins
lukasj Jun 17, 2022
d974025
fix the build for maven 3.8.2
lukasj Sep 30, 2021
78476b9
Huge demo jars #52
jbescos Mar 18, 2022
5840ea4
#61: Parsson media do not work with injection framework on module path
lukasj Jun 16, 2022
66cfefd
add dyn imports
lukasj Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021 Contributors to the Eclipse Foundation
# Copyright (c) 2021, 2022 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
Expand All @@ -23,15 +23,21 @@ jobs:

strategy:
matrix:
java_version: [ 11, 17-ea ]
java_version: [ 11, 17 ]

steps:
- name: Cancel previous runs of this workflow
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Checkout for build
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ matrix.java_version }}
cache: 'maven'
- name: Verify
run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true
run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Dcopyright.ignoreyear=true
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ nbproject/
# Java noise
*.class
*err_pid*.log
/tck-impl/.gradle/
/tck-impl/build/
4 changes: 2 additions & 2 deletions bundles/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2022 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 @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-bundles</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>parsson-dist</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions bundles/jakarta.json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

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 Public License v. 2.0, which is available at
Expand All @@ -23,13 +23,13 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-bundles</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<name>JSON-P with Parsson Provider</name>
<description>Default provider for Jakarta JSON Processing</description>

Expand Down Expand Up @@ -177,6 +177,7 @@
<Specification-Vendor>Eclipse Foundation</Specification-Vendor>
<Specification-Version>${spec.specification.version}</Specification-Version>
<Export-Package>!org.eclipse.parsson,*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</execution>
Expand Down Expand Up @@ -212,7 +213,7 @@
<header><![CDATA[<br>JSON Processing API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:jsonp-dev@eclipse.org">jsonp-dev@eclipse.org</a>.<br>
Copyright &#169; 2019, 2021 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 2019, 2022 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2022 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,7 +23,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>project</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions demos/customprovider-jdk9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions demos/facebook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions demos/jsonpointer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 2 additions & 6 deletions demos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 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
Expand All @@ -16,18 +16,14 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>project</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<packaging>pom</packaging>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>

<properties>
<legal.doc.source>${basedir}/..</legal.doc.source>
</properties>

<modules>
<module>rest</module>
<module>twitter</module>
Expand Down
4 changes: 2 additions & 2 deletions demos/rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions demos/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions demos/twitter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 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
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>demos</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

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 Public License v. 2.0, which is available at
Expand All @@ -23,13 +23,13 @@
<parent>
<groupId>org.eclipse.parsson</groupId>
<artifactId>project</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<name>Eclipse Parsson</name>
<description>Jakarta JSON Processing provider</description>

Expand Down
Loading