Skip to content

Commit 89c4c26

Browse files
ledsoftledsoft
authored
Merge pull request #60 from kbss-cvut/development
[0.14.0] Release
2 parents 77dcb10 + 5069b09 commit 89c4c26

File tree

238 files changed

+4534
-2192
lines changed

Some content is hidden

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

238 files changed

+4534
-2192
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# JB4JSON-LD Changelog
22

3+
## 0.14.0 - 2023-11-03
4+
- Rewrite API to use Jakarta JSON (**Breaking change**).
5+
- Dependency updates: JOPA 1.1.4, test deps.
6+
37
## 0.13.1 - 2023-07-31
48
- Better handle class hierarchies when resolving property access.
59

‎header.txt

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
JB4JSON-LD
12
Copyright (C) 2023 Czech Technical University in Prague
23

3-
This program is free software: you can redistribute it and/or modify it under
4-
the terms of the GNU General Public License as published by the Free Software
5-
Foundation, either version 3 of the License, or (at your option) any
6-
later version.
4+
This library is free software; you can redistribute it and/or
5+
modify it under the terms of the GNU Lesser General Public
6+
License as published by the Free Software Foundation; either
7+
version 3.0 of the License, or (at your option) any later version.
78

8-
This program is distributed in the hope that it will be useful, but WITHOUT
9-
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
10-
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
11-
details. You should have received a copy of the GNU General Public License
12-
along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
This library is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
Lesser General Public License for more details.
13+
14+
You should have received a copy of the GNU Lesser General Public
15+
License along with this library.
1316

‎pom.xml

+22-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>cz.cvut.kbss.jsonld</groupId>
88
<artifactId>jb4jsonld</artifactId>
9-
<version>0.13.1</version>
9+
<version>0.14.0</version>
1010
<name>JB4JSON-LD</name>
1111
<description>Java Binding for JSON-LD allows serialization and deserialization of Java POJOs to/from JSON-LD.
1212
This is the core implementation, which has to be integrated with Jackson, Jersey etc.
@@ -18,13 +18,12 @@
1818
<maven.compiler.source>11</maven.compiler.source>
1919
<maven.compiler.target>11</maven.compiler.target>
2020

21-
<cz.cvut.kbss.jopa.version>1.1.0</cz.cvut.kbss.jopa.version>
21+
<cz.cvut.kbss.jopa.version>1.1.4</cz.cvut.kbss.jopa.version>
2222

23-
<com.github.jsonld-java.version>0.13.4</com.github.jsonld-java.version>
2423
<org.junit.jupiter.version>5.9.2</org.junit.jupiter.version>
2524
<org.mockito.version>4.11.0</org.mockito.version>
26-
<ch.qos.logback.version>1.3.5</ch.qos.logback.version>
27-
<org.eclipse.rdf4j.version>4.3.4</org.eclipse.rdf4j.version>
25+
<ch.qos.logback.version>1.4.11</ch.qos.logback.version>
26+
<org.eclipse.rdf4j.version>4.3.7</org.eclipse.rdf4j.version>
2827
</properties>
2928

3029
<dependencies>
@@ -33,6 +32,11 @@
3332
<artifactId>jopa-api</artifactId>
3433
<version>${cz.cvut.kbss.jopa.version}</version>
3534
</dependency>
35+
<dependency>
36+
<groupId>jakarta.json</groupId>
37+
<artifactId>jakarta.json-api</artifactId>
38+
<version>2.0.1</version>
39+
</dependency>
3640

3741
<!-- Test dependencies -->
3842
<dependency>
@@ -73,9 +77,15 @@
7377
</dependency>
7478
<!-- JSON-LD Java implementation -->
7579
<dependency>
76-
<groupId>com.github.jsonld-java</groupId>
77-
<artifactId>jsonld-java</artifactId>
78-
<version>${com.github.jsonld-java.version}</version>
80+
<groupId>com.apicatalog</groupId>
81+
<artifactId>titanium-json-ld</artifactId>
82+
<version>1.3.2</version>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.glassfish</groupId>
87+
<artifactId>jakarta.json</artifactId>
88+
<version>2.0.1</version>
7989
<scope>test</scope>
8090
</dependency>
8191
<dependency>
@@ -198,8 +208,11 @@
198208
<plugin>
199209
<groupId>com.mycila</groupId>
200210
<artifactId>license-maven-plugin</artifactId>
201-
<version>2.11</version>
211+
<version>3.0</version>
202212
<configuration>
213+
<mapping>
214+
<java>SLASHSTAR_STYLE</java>
215+
</mapping>
203216
<header>header.txt</header>
204217
<excludes>
205218
<exclude>**/src/test/resources/**</exclude>

‎src/main/java/cz/cvut/kbss/jsonld/ConfigParam.java

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
3-
* <p>
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
8-
* <p>
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
9+
*
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld;
1619

‎src/main/java/cz/cvut/kbss/jsonld/Configuration.java

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
3-
* <p>
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
8-
* <p>
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
9+
*
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld;
1619

‎src/main/java/cz/cvut/kbss/jsonld/JsonLd.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
39
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
814
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld;
1619

‎src/main/java/cz/cvut/kbss/jsonld/annotation/JsonLdAttributeOrder.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
39
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
814
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld.annotation;
1619

‎src/main/java/cz/cvut/kbss/jsonld/annotation/JsonLdProperty.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
39
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
814
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld.annotation;
1619

‎src/main/java/cz/cvut/kbss/jsonld/common/BeanAnnotationProcessor.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
34
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
89
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld.common;
1619

‎src/main/java/cz/cvut/kbss/jsonld/common/BeanClassProcessor.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
34
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
89
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld.common;
1619

‎src/main/java/cz/cvut/kbss/jsonld/common/CollectionType.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
/**
2-
* Copyright (C) 2022 Czech Technical University in Prague
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
39
*
4-
* This program is free software: you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation, either version 3 of the License, or (at your option) any
7-
* later version.
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
814
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details. You should have received a copy of the GNU General Public License
13-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
1417
*/
1518
package cz.cvut.kbss.jsonld.common;
1619

‎src/main/java/cz/cvut/kbss/jsonld/common/Configurable.java

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
* JB4JSON-LD
3+
* Copyright (C) 2023 Czech Technical University in Prague
4+
*
5+
* This library is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU Lesser General Public
7+
* License as published by the Free Software Foundation; either
8+
* version 3.0 of the License, or (at your option) any later version.
9+
*
10+
* This library is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* Lesser General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU Lesser General Public
16+
* License along with this library.
17+
*/
118
package cz.cvut.kbss.jsonld.common;
219

320
import cz.cvut.kbss.jsonld.Configuration;

0 commit comments

Comments
 (0)