Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .github/workflows/build11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: succed job 'build (11)'

on: pull_request

jobs:
build:
strategy:
fail-fast: true
matrix:
jdk: [ 11 ]
runs-on: ubuntu-latest
steps:
- name: Always Succeed
run: true
2 changes: 1 addition & 1 deletion .github/workflows/develop-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk: [11, 17]
jdk: [17]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk: [11, 17]
jdk: [17]

steps:
- uses: actions/checkout@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Check formatting
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Compile (mvn clean install)
Expand All @@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: true
matrix:
jdk: [ 11, 25 ]
jdk: [ 17, 25 ]
steps:
- uses: actions/checkout@v4
- name: Set up JDK
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Build
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Build
Expand All @@ -120,7 +120,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Run install
Expand All @@ -137,7 +137,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: maven
- name: Install dependencies
Expand Down
23 changes: 22 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<module>core</module>
<module>tools</module>
<module>spring-components</module>
<module>spring6-components</module>
<module>testsuites</module>
<module>compliance</module>
<module>examples</module>
Expand Down Expand Up @@ -806,6 +807,22 @@
<artifactId>solr-core</artifactId>
<version>${solr.version}</version>
</additionalDependency>
<!-- add these in case we run with JDK 17+ -->
<additionalDependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</additionalDependency>
<additionalDependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</additionalDependency>
<additionalDependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</plugin>
Expand Down Expand Up @@ -1039,6 +1056,8 @@
<include>javax.servlet:jstl:*:*:provided</include>
<!-- Allow test server dependencies -->
<include>javax.servlet:javax.servlet-api:*:*:test</include>
<!-- Allow to provide old javax dependencies for compiling with JDK 17+ -->
<include>javax.*:*:*:*:provided</include>
</includes>
</bannedDependencies>
</rules>
Expand All @@ -1061,6 +1080,8 @@
<!-- mockserver-junit-jupiter-no-dependencies contains these classes -->
<ignoreClass>org.opentest4j.*</ignoreClass>
</ignoreClasses>
<!-- Allow to provide old javax dependencies for compiling with JDK 17+ -->
<ignoredScopes>provided</ignoredScopes>
<ignoreWhenIdentical>true</ignoreWhenIdentical>
</banDuplicateClasses>
</rules>
Expand All @@ -1072,7 +1093,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.1</version>
<version>1.11.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions site/content/documentation/programming/spring.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ To use RDF as the data backend of a spring application built with maven, use the
```xml
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-spring</artifactId>
<artifactId>rdf4j-spring6</artifactId>
<version>${rdf4j.version}</version>
</dependency>
```
... setting the property `rdf4j.version` is set to the RDF4J version you want (minimum `4.0.0`).
... setting the property `rdf4j.version` is set to the RDF4J version you want (minimum `5.3.0`).

In order for the application to run, a repository has to be configured:

Expand Down
6 changes: 6 additions & 0 deletions spring-components/rdf4j-spring-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
7 changes: 7 additions & 0 deletions spring-components/rdf4j-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<scope>provided</scope>
<!-- For javadoc/compile; not bundled at runtime -->
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
69 changes: 69 additions & 0 deletions spring6-components/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.3.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modules>
<module>spring6-boot-sparql-web</module>
<module>rdf4j-spring6</module>
<module>rdf4j-spring6-demo</module>
</modules>
<properties>
<!-- spring-boot 3 / spring 6 requires java 17, compile these modules accordingly -->
<java.version>17</java.version>
<spring.boot.version>3.5.7</spring.boot.version>
<!-- override properties to match versions for spring-boot -->
<spring.version>6.2.12</spring.version>
<slf4j.version>2.0.17</slf4j.version>
<logback.version>1.5.20</logback.version>
<log4j.version>2.24.3</log4j.version>
<jetty.version>12.0.29</jetty.version>
</properties>
<artifactId>rdf4j-spring6-components</artifactId>
<name>RDF4J: Spring6 components</name>
<description>Components to use with Spring</description>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
</plugin>
</plugins>
</build>
</project>
14 changes: 14 additions & 0 deletions spring6-components/rdf4j-spring6-demo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# RDF4J-Spring Demo

Small demo application for `rdf4j-spring`.

The purpose of `rdf4j-spring` is to use an RDF4J repository as the data backend of a spring or spring boot application.

To run the demo, do

```$bash
mvn spring-boot:run
```

The program writes to stdout and exits. The class [ArtDemoCli](src/main/java/org/eclipse/rdf4j/spring.demo/ArtDemoCli.java) is a good starting point for looking at the code.

58 changes: 58 additions & 0 deletions spring6-components/rdf4j-spring6-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>rdf4j-spring6-demo</artifactId>
<name>RDF4J: Spring6 Demo</name>
<description>Demo of a spring-boot project using an RDF4J repo as its backend</description>
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-spring6-components</artifactId>
<version>5.3.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-spring6</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
</plugin>
</plugins>
</build>
</project>
Loading
Loading