Skip to content
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

Get FAIR Data Team dependencies from Maven Central repository #577

Merged
merged 7 commits into from
Nov 5, 2024
Merged

Get FAIR Data Team dependencies from Maven Central repository #577

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
1492b4a
pom replace nexus repository with github packages
dennisvang Oct 14, 2024
38e878a
replace fairdevkit references by fairdatateam
dennisvang Oct 14, 2024
641b82a
temporarily use dennisvang forks of fairdatateam dependencies
dennisvang Oct 16, 2024
7a5f020
temporarily obtain spring-rdf-migration and rdf-resource-resolver fro…
dennisvang Oct 25, 2024
caaa338
update namespace for spring-rdf-migration and rdf-resource-resolver
dennisvang Oct 25, 2024
fcb408a
change groupId to org.fairdatateam.rdf for dependencies
dennisvang Oct 28, 2024
55a9ed8
revert explicit port
dennisvang Oct 28, 2024
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
55 changes: 14 additions & 41 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
<maven.compiler.target>21</maven.compiler.target>

<!-- Project related -->
<spring.rdf.migration.version>1.2.0.RELEASE</spring.rdf.migration.version>

<spring.rdf.migration.version>2.0.0</spring.rdf.migration.version>
<rdf-resolver.version>0.2.0</rdf-resolver.version>

<!-- Core -->
<springdoc.version>2.5.0</springdoc.version>
<postgresql.version>42.7.3</postgresql.version>
<rdf4j.version>4.3.12</rdf4j.version>
<jwt.version>0.12.5</jwt.version>
<lombok.version>1.18.32</lombok.version>
<rdf-resolver.version>0.1.2-SNAPSHOT</rdf-resolver.version>
<hypersistence.version>3.7.6</hypersistence.version>

<!-- Test -->
Expand All @@ -76,43 +76,26 @@
<plugin.spotbugs.version>4.8.5.0</plugin.spotbugs.version>
</properties>

<repositories>
<repository>
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repository>
<id>nexus-releases</id>
<name>Nexus Releases</name>
<url>https://nexus.internal.fairdatapoint.org/repository/maven-releases/</url>
</repository>
<repository>
<id>nexus-snapshots</id>
<name>Nexus Snapshots</name>
<url>https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/</url>
</repository>
</repositories>

<dependencies>

<!-- ////////////////// -->
<!-- Project related -->
<!-- ////////////////// -->
<dependency>
<groupId>nl.dtls</groupId>
<groupId>org.fairdatateam.rdf</groupId>
<artifactId>spring-rdf-migration</artifactId>
<version>${spring.rdf.migration.version}</version>
</dependency>
<dependency>
<groupId>org.fairdatateam.rdf</groupId>
<artifactId>rdf-resource-resolver-core</artifactId>
<version>${rdf-resolver.version}</version>
</dependency>
<dependency>
<groupId>org.fairdatateam.rdf</groupId>
<artifactId>rdf-resource-resolver-api</artifactId>
<version>${rdf-resolver.version}</version>
</dependency>

<!-- ////////////////// -->
<!-- Spring -->
Expand Down Expand Up @@ -212,16 +195,6 @@
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>com.github.fairdevkit</groupId>
<artifactId>rdf-resource-resolver-core</artifactId>
<version>${rdf-resolver.version}</version>
</dependency>
<dependency>
<groupId>com.github.fairdevkit</groupId>
<artifactId>rdf-resource-resolver-api</artifactId>
<version>${rdf-resolver.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
package org.fairdatapoint.config;

import org.fairdatapoint.Profiles;
import nl.dtls.rdf.migration.database.RdfMigrationRepository;
import nl.dtls.rdf.migration.runner.RdfProductionMigrationRunner;
import org.fairdatateam.rdf.migration.database.RdfMigrationRepository;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigrationRunner;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

import lombok.extern.slf4j.Slf4j;
import org.fairdatapoint.service.reset.FactoryDefaults;
import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
import nl.dtls.rdf.migration.runner.RdfProductionMigration;
import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
import org.bson.Document;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Statement;
Expand Down
4 changes: 2 additions & 2 deletions ...rg/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
package org.fairdatapoint.database.rdf.migration.production;

import lombok.extern.slf4j.Slf4j;
import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
import nl.dtls.rdf.migration.runner.RdfProductionMigration;
import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
import org.springframework.stereotype.Service;

@RdfMigrationAnnotation(
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
package org.fairdatapoint.database.rdf.migration.production;

import lombok.extern.slf4j.Slf4j;
import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
import nl.dtls.rdf.migration.runner.RdfProductionMigration;
import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
import org.springframework.stereotype.Service;

@RdfMigrationAnnotation(
Expand Down
4 changes: 2 additions & 2 deletions ...org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
package org.fairdatapoint.database.rdf.migration.production;

import lombok.extern.slf4j.Slf4j;
import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
import nl.dtls.rdf.migration.runner.RdfProductionMigration;
import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
import org.springframework.stereotype.Service;

@RdfMigrationAnnotation(
Expand Down
4 changes: 2 additions & 2 deletions ...airdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
package org.fairdatapoint.database.rdf.migration.production;

import lombok.extern.slf4j.Slf4j;
import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
import nl.dtls.rdf.migration.runner.RdfProductionMigration;
import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
import org.springframework.stereotype.Service;

@RdfMigrationAnnotation(
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/fairdatapoint/service/label/LabelService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import static java.util.function.Predicate.isEqual;
import static org.fairdatapoint.config.CacheConfig.LABEL_CACHE;
import static org.fairdatapoint.util.ValueFactoryHelper.i;
import com.github.fairdevkit.rdf.resolver.api.ResourceResolver;
import com.github.fairdevkit.rdf.resolver.core.ContentNegotiationStrategy;
import com.github.fairdevkit.rdf.resolver.core.CoreResourceResolver;
import com.github.fairdevkit.rdf.resolver.core.PathExtensionStrategy;
import org.fairdatateam.rdf.resolver.api.ResourceResolver;
import org.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy;
import org.fairdatateam.rdf.resolver.core.CoreResourceResolver;
import org.fairdatateam.rdf.resolver.core.PathExtensionStrategy;
import java.util.Optional;

import lombok.extern.slf4j.Slf4j;
Expand Down
Loading