Skip to content

Commit 9170a97

Browse files
VerdentVerdent
committed
Fixes #351 Copyright plugin added to the project
Signed-off-by: David Kral <[email protected]>
1 parent 117df22 commit 9170a97

File tree

534 files changed

+4782
-4205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

534 files changed

+4782
-4205
lines changed

‎.travis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
#
2+
# Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
113
language: java
214

315
jdk:
@@ -21,6 +33,8 @@ jobs:
2133
# - java -jar target/yasson-jmh.jar -t 1 -f 2
2234
- stage: checkstyle
2335
script: mvn checkstyle:checkstyle
36+
- stage: copyright
37+
script: mvn glassfish-copyright:check
2438
- stage: tck-run
2539
script: bash tck.sh
2640

‎LICENSE.md

+77-76
Large diffs are not rendered by default.

‎etc/checkstyle-suppressions.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
<!--
33
44
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
5+
56
This program and the accompanying materials are made available under the
6-
terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
7-
which accompanies this distribution.
8-
The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
9-
and the Eclipse Distribution License is available at
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
1010
http://www.eclipse.org/org/documents/edl-v10.php.
1111
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
1214
-->
1315

1416
<!DOCTYPE suppressions PUBLIC

‎etc/checkstyle.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
<!--
33
44
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
5+
56
This program and the accompanying materials are made available under the
6-
terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
7-
which accompanies this distribution.
8-
The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
9-
and the Eclipse Distribution License is available at
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
1010
http://www.eclipse.org/org/documents/edl-v10.php.
1111
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
1214
-->
1315

1416
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

‎etc/copyright-exclude.txt

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
.iml
2+
.apt
3+
.args
4+
.bundle
5+
.class
6+
.ddl
7+
.exe
8+
.gif
9+
.gitignore
10+
.ico
11+
.jar
12+
.jks
13+
.jpg
14+
.json
15+
.mm
16+
.ods
17+
.png
18+
.svg
19+
.war
20+
.zip
21+
.dat
22+
.md
23+
.p12
24+
.txt
25+
.mf
26+
.pem
27+
.p8
28+
.pkcs8.pem
29+
.p12
30+
.bin
31+
.vm
32+
.policy

‎etc/copyright.txt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/

‎pom.xml

+57-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
4-
This program and the accompanying materials are made available under the
5-
terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
6-
which accompanies this distribution.
7-
The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
8-
and the Eclipse Distribution License is available at
9-
http://www.eclipse.org/org/documents/edl-v10.php.
3+
4+
Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
10+
http://www.eclipse.org/org/documents/edl-v10.php.
11+
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
1014
-->
15+
1116
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1217
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1318

@@ -26,14 +31,14 @@
2631

2732
<description>Eclipse Yasson. Reference implementation of JSR-367 (JSON-B).</description>
2833
<url>https://projects.eclipse.org/projects/ee4j.yasson</url>
29-
34+
3035
<properties>
3136
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3237
<jakarta.json.version>1.1.6</jakarta.json.version>
3338
<jakarta.json.bind.version>1.0.2</jakarta.json.bind.version>
3439
<netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform>
3540
</properties>
36-
41+
3742
<dependencies>
3843
<!-- Compile dependencies -->
3944
<dependency>
@@ -104,12 +109,16 @@
104109

105110
<licenses>
106111
<license>
107-
<name>Eclipse Distribution License 1.0 (BSD)</name>
108-
<url>https://projects.eclipse.org/content/eclipse-distribution-license-1.0-bsd</url>
112+
<name>Eclipse Public License v. 2.0</name>
113+
<url>http://www.eclipse.org/legal/epl-v20.html</url>
114+
<distribution>repo</distribution>
115+
<comments>Standard Eclipse License</comments>
109116
</license>
110117
<license>
111-
<name>Eclipse Public License 1.0</name>
112-
<url>https://projects.eclipse.org/content/eclipse-public-license-1.0</url>
118+
<name>Eclipse Distribution License v. 1.0</name>
119+
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
120+
<distribution>repo</distribution>
121+
<comments>Standard Eclipse Distribution License</comments>
113122
</license>
114123
</licenses>
115124

@@ -184,6 +193,26 @@
184193
</plugins>
185194
</build>
186195
</profile>
196+
<profile>
197+
<id>copyright</id>
198+
<build>
199+
<plugins>
200+
<plugin>
201+
<groupId>org.glassfish.copyright</groupId>
202+
<artifactId>glassfish-copyright-maven-plugin</artifactId>
203+
<executions>
204+
<execution>
205+
<id>run-copyright</id>
206+
<goals>
207+
<goal>check</goal>
208+
</goals>
209+
<phase>validate</phase>
210+
</execution>
211+
</executions>
212+
</plugin>
213+
</plugins>
214+
</build>
215+
</profile>
187216
</profiles>
188217

189218
<build>
@@ -478,6 +507,21 @@
478507
</dependency>
479508
</dependencies>
480509
</plugin>
510+
<plugin>
511+
<groupId>org.glassfish.copyright</groupId>
512+
<artifactId>glassfish-copyright-maven-plugin</artifactId>
513+
<version>2.2</version>
514+
<configuration>
515+
<templateFile>etc/copyright.txt</templateFile>
516+
<excludeFile>etc/copyright-exclude.txt</excludeFile>
517+
<scm>git</scm>
518+
<debug>false</debug>
519+
<scmOnly>true</scmOnly>
520+
<warn>true</warn>
521+
<ignoreYear>false</ignoreYear>
522+
<preserveCopyrights>true</preserveCopyrights>
523+
</configuration>
524+
</plugin>
481525
</plugins>
482526
</pluginManagement>
483527
<plugins>

‎src/main/assembly/assembly-src-licensee.xml

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
4-
This program and the accompanying materials are made available under the
5-
terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
6-
which accompanies this distribution.
7-
The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
8-
and the Eclipse Distribution License is available at
9-
http://www.eclipse.org/org/documents/edl-v10.php.
3+
4+
Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
10+
http://www.eclipse.org/org/documents/edl-v10.php.
11+
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
1014
-->
15+
1116
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
1217
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1318
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

‎src/main/java/module-info.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
/*******************************************************************************
2-
* Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
* Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
3+
*
34
* This program and the accompanying materials are made available under the
4-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5-
* which accompanies this distribution.
6-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7-
* and the Eclipse Distribution License is available at
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
88
* http://www.eclipse.org/org/documents/edl-v10.php.
99
*
10-
* Contributors:
11-
* Roman Grigoriadi
12-
******************************************************************************/
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
1313
module org.eclipse.yasson {
1414
requires java.json;
1515
requires java.json.bind;

‎src/main/java/org/eclipse/yasson/FieldAccessStrategy.java

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
113
package org.eclipse.yasson;
214

315
import java.lang.reflect.Field;

‎src/main/java/org/eclipse/yasson/ImplementationClass.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
/*******************************************************************************
2-
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
* Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
3+
*
34
* This program and the accompanying materials are made available under the
4-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5-
* which accompanies this distribution.
6-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7-
* and the Eclipse Distribution License is available at
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
88
* http://www.eclipse.org/org/documents/edl-v10.php.
99
*
10-
******************************************************************************/
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
1113
package org.eclipse.yasson;
1214

1315
import java.lang.annotation.ElementType;

‎src/main/java/org/eclipse/yasson/JsonBindingProvider.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
/*******************************************************************************
2-
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
* Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
3+
*
34
* This program and the accompanying materials are made available under the
4-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5-
* which accompanies this distribution.
6-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7-
* and the Eclipse Distribution License is available at
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
88
* http://www.eclipse.org/org/documents/edl-v10.php.
99
*
10-
* Contributors:
11-
* Dmitry Kornilov - initial implementation
12-
******************************************************************************/
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
1313
package org.eclipse.yasson;
1414

1515
import javax.json.bind.JsonbBuilder;

‎src/main/java/org/eclipse/yasson/YassonJsonb.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
/*******************************************************************************
1+
/*
22
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
3+
*
34
* This program and the accompanying materials are made available under the
4-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5-
* which accompanies this distribution.
6-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7-
* and the Eclipse Distribution License is available at
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
88
* http://www.eclipse.org/org/documents/edl-v10.php.
9-
******************************************************************************/
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
1013
package org.eclipse.yasson;
1114

1215
import java.lang.reflect.Type;

‎src/main/java/org/eclipse/yasson/YassonProperties.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
/*******************************************************************************
2-
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2019 Payara Foundation and/or its affiliates. All rights reserved.
4+
*
45
* This program and the accompanying materials are made available under the
5-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
6-
* which accompanies this distribution.
7-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
8-
* and the Eclipse Distribution License is available at
6+
* terms of the Eclipse Public License v. 2.0 which is available at
7+
* http://www.eclipse.org/legal/epl-2.0,
8+
* or the Eclipse Distribution License v. 1.0 which is available at
99
* http://www.eclipse.org/org/documents/edl-v10.php.
1010
*
11-
******************************************************************************/
11+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
12+
*/
1213

1314
package org.eclipse.yasson;
1415

0 commit comments

Comments
 (0)