Skip to content

Commit 0db1af2

Browse files
abrokenjesterabrokenjester
committed
Merge branch 'develop' into issues/eclipse-rdf4j#1431-jackson-update
2 parents 5c5c216 + 58479ad commit 0db1af2

File tree

1,672 files changed

+36034
-1547
lines changed

Some content is hidden

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

1,672 files changed

+36034
-1547
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ dependency-reduced-pom.xml
3333
**/nb-configuration.xml
3434
**/nbactions*.xml
3535
*.jfr
36+
compliance/repository/overlays

Diff for: ‎client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
66
<artifactId>rdf4j-parent</artifactId>
7-
<version>2.5-SNAPSHOT</version>
7+
<version>3.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-client</artifactId>
1010
<name>RDF4J: Client Library</name>

Diff for: ‎compliance/pom.xml

+7-32
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
<parent>
66
<groupId>org.eclipse.rdf4j</groupId>
77
<artifactId>rdf4j-parent</artifactId>
8-
<version>2.5-SNAPSHOT</version>
8+
<version>3.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>rdf4j-compliance</artifactId>
1212
<packaging>pom</packaging>
1313

14-
<modules>
15-
<module>repository</module>
16-
<module>queryresultio</module>
17-
<module>rio</module>
18-
</modules>
14+
<modules>
15+
<module>repository</module>
16+
<module>rio</module>
17+
</modules>
1918

20-
<name>RDF4J compliance tests</name>
21-
<description>RDF4J compliance tests</description>
19+
<name>RDF4J Compliance tests</name>
20+
<description>Eclipse RDF4J compliance and integration tests</description>
2221

2322
<dependencyManagement>
2423
<dependencies>
@@ -27,30 +26,6 @@
2726
<artifactId>rdf4j-rio-testsuite</artifactId>
2827
<version>${project.version}</version>
2928
</dependency>
30-
31-
<dependency>
32-
<groupId>${project.groupId}</groupId>
33-
<artifactId>rdf4j-store-testsuite</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
37-
<dependency>
38-
<groupId>${project.groupId}</groupId>
39-
<artifactId>rdf4j-serql-testsuite</artifactId>
40-
<version>${project.version}</version>
41-
</dependency>
42-
43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>rdf4j-sparql-testsuite</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
48-
49-
<dependency>
50-
<groupId>${project.groupId}</groupId>
51-
<artifactId>rdf4j-queryparser-sparql-compliance</artifactId>
52-
<version>${project.version}</version>
53-
</dependency>
5429
</dependencies>
5530
</dependencyManagement>
5631

Diff for: ‎compliance/queryresultio/pom.xml

-96
This file was deleted.

Diff for: ‎compliance/repository/pom.xml

+26-14
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,61 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
24

35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>org.eclipse.rdf4j</groupId>
79
<artifactId>rdf4j-compliance</artifactId>
8-
<version>2.5-SNAPSHOT</version>
10+
<version>3.0-SNAPSHOT</version>
911
</parent>
1012

1113
<artifactId>rdf4j-repository-compliance</artifactId>
12-
<packaging>war</packaging>
14+
<packaging>war</packaging>
1315

1416
<name>RDF4J Repository compliance tests</name>
1517
<description>Compliance testing for the Repository API implementations</description>
1618

17-
<properties>
18-
<!-- use a pinned version of RDF4J Server - what we're testing is how the client operates against an endpoint -->
19-
<rdf4j.server.version>2.4.2</rdf4j.server.version>
20-
<jetty.version>7.0.2.v20100331</jetty.version>
21-
</properties>
19+
<properties>
20+
<rdf4j.server.version>2.5.0</rdf4j.server.version>
21+
<jetty.version>7.0.2.v20100331</jetty.version>
22+
</properties>
2223

2324
<dependencies>
2425
<dependency>
2526
<groupId>${project.groupId}</groupId>
2627
<artifactId>rdf4j-store-testsuite</artifactId>
28+
<version>${project.version}</version>
2729
</dependency>
2830

2931
<dependency>
3032
<groupId>${project.groupId}</groupId>
3133
<artifactId>rdf4j-serql-testsuite</artifactId>
34+
<version>${project.version}</version>
3235
</dependency>
3336

3437
<dependency>
3538
<groupId>${project.groupId}</groupId>
3639
<artifactId>rdf4j-sparql-testsuite</artifactId>
40+
<version>${project.version}</version>
3741
</dependency>
3842

3943
<dependency>
4044
<groupId>${project.groupId}</groupId>
4145
<artifactId>rdf4j-repository-http</artifactId>
42-
<version>${project.version}</version>
46+
<version>${project.version}</version>
4347
</dependency>
4448

4549
<dependency>
4650
<groupId>${project.groupId}</groupId>
4751
<artifactId>rdf4j-repository-sparql</artifactId>
48-
<version>${project.version}</version>
52+
<version>${project.version}</version>
4953
</dependency>
5054

5155
<dependency>
5256
<groupId>${project.groupId}</groupId>
5357
<artifactId>rdf4j-http-server</artifactId>
54-
<version>${rdf4j.server.version}</version>
58+
<version>${rdf4j.server.version}</version>
5559
<type>war</type>
5660
</dependency>
5761

@@ -73,6 +77,14 @@
7377
<version>${project.version}</version>
7478
</dependency>
7579

80+
<dependency>
81+
<groupId>${project.groupId}</groupId>
82+
<artifactId>rdf4j-repository-api</artifactId>
83+
<classifier>tests</classifier>
84+
<type>test-jar</type>
85+
<version>${project.version}</version>
86+
<scope>test</scope>
87+
</dependency>
7688
<dependency>
7789
<groupId>${project.groupId}</groupId>
7890
<artifactId>rdf4j-repository-manager</artifactId>
@@ -82,19 +94,19 @@
8294
<dependency>
8395
<groupId>org.eclipse.jetty</groupId>
8496
<artifactId>jetty-server</artifactId>
85-
<version>${jetty.version}</version>
97+
<version>${jetty.version}</version>
8698
</dependency>
8799

88100
<dependency>
89101
<groupId>org.eclipse.jetty</groupId>
90102
<artifactId>jetty-webapp</artifactId>
91-
<version>${jetty.version}</version>
103+
<version>${jetty.version}</version>
92104
</dependency>
93105

94106
<dependency>
95107
<groupId>org.mortbay.jetty</groupId>
96108
<artifactId>jetty-jsp-2.1</artifactId>
97-
<version>${jetty.version}</version>
109+
<version>${jetty.version}</version>
98110
<scope>runtime</scope>
99111
</dependency>
100112

Diff for: ‎compliance/rio/pom.xml

+10-20
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
24

35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>org.eclipse.rdf4j</groupId>
79
<artifactId>rdf4j-compliance</artifactId>
8-
<version>2.5-SNAPSHOT</version>
10+
<version>3.0-SNAPSHOT</version>
911
</parent>
1012

1113
<artifactId>rdf4j-rio-compliance</artifactId>
@@ -14,24 +16,6 @@
1416
<description>Tests for parsers and writers of various RDF file formats.</description>
1517

1618
<dependencies>
17-
<dependency>
18-
<groupId>${project.groupId}</groupId>
19-
<artifactId>rdf4j-runtime</artifactId>
20-
<version>${project.version}</version>
21-
</dependency>
22-
23-
<dependency>
24-
<groupId>${project.groupId}</groupId>
25-
<artifactId>rdf4j-repository-sail</artifactId>
26-
<version>${project.version}</version>
27-
</dependency>
28-
29-
<dependency>
30-
<groupId>${project.groupId}</groupId>
31-
<artifactId>rdf4j-sail-memory</artifactId>
32-
<version>${project.version}</version>
33-
</dependency>
34-
3519
<dependency>
3620
<groupId>${project.groupId}</groupId>
3721
<artifactId>rdf4j-rio-testsuite</artifactId>
@@ -92,6 +76,12 @@
9276
<version>${project.version}</version>
9377
</dependency>
9478

79+
<dependency>
80+
<groupId>${project.groupId}</groupId>
81+
<artifactId>rdf4j-rio-jsonld</artifactId>
82+
<version>${project.version}</version>
83+
</dependency>
84+
9585
<dependency>
9686
<groupId>xml-security</groupId>
9787
<artifactId>xmlsec</artifactId>

0 commit comments

Comments
 (0)