From d0ca93f0ab993450a53f47bd3fd57270180c24f6 Mon Sep 17 00:00:00 2001 From: Dennis <29799340+dennisvang@users.noreply.github.com> Date: Tue, 5 Nov 2024 15:32:33 +0100 Subject: [PATCH] Get FAIR Data Team dependencies from Maven Central repository (#577) * pom replace nexus repository with github packages * replace fairdevkit references by fairdatateam * temporarily use dennisvang forks of fairdatateam dependencies * temporarily obtain spring-rdf-migration and rdf-resource-resolver from dennisvang on maven central * update namespace for spring-rdf-migration and rdf-resource-resolver * change groupId to org.fairdatateam.rdf for dependencies spring-rdf-migration and, rdf-resource-resolver-* * revert explicit port (accidentally included in previous commit) NOTE: The *"Snyk (Maven)"* check did not run, due to an authentication issue which I could not resolve. However, a local run of `snyk code test` did not show any [critical][1] issues. [1]: https://github.com/FAIRDataTeam/FAIRDataPoint/blob/1e33bfdbdd10673370fc5a3a7e819401eb62b685/.github/workflows/security.yml#L69 --- pom.xml | 55 +++++-------------- .../config/RepositoryMigrationConfig.java | 4 +- .../production/Rdf_Migration_0001_Init.java | 4 +- .../Rdf_Migration_0002_Metadata_Draft.java | 4 +- .../production/Rdf_Migration_0003_FDPO.java | 4 +- .../Rdf_Migration_0004_Cleanup_Index.java | 4 +- ...Rdf_Migration_0005_FixMetadataVersion.java | 4 +- .../service/label/LabelService.java | 8 +-- 8 files changed, 30 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index 9780ef60..fbd65dd7 100644 --- a/pom.xml +++ b/pom.xml @@ -51,15 +51,15 @@ 21 - 1.2.0.RELEASE - + 2.0.0 + 0.2.0 + 2.5.0 42.7.3 4.3.12 0.12.5 1.18.32 - 0.1.2-SNAPSHOT 3.7.6 @@ -76,43 +76,26 @@ 4.8.5.0 - - - central - Central Repository - https://repo.maven.apache.org/maven2 - default - - true - always - - - true - always - - - - nexus-releases - Nexus Releases - https://nexus.internal.fairdatapoint.org/repository/maven-releases/ - - - nexus-snapshots - Nexus Snapshots - https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/ - - - - nl.dtls + org.fairdatateam.rdf spring-rdf-migration ${spring.rdf.migration.version} + + org.fairdatateam.rdf + rdf-resource-resolver-core + ${rdf-resolver.version} + + + org.fairdatateam.rdf + rdf-resource-resolver-api + ${rdf-resolver.version} + @@ -212,16 +195,6 @@ lombok ${lombok.version} - - com.github.fairdevkit - rdf-resource-resolver-core - ${rdf-resolver.version} - - - com.github.fairdevkit - rdf-resource-resolver-api - ${rdf-resolver.version} - org.flywaydb flyway-core diff --git a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java index b1863fa3..9c7f96a3 100644 --- a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java +++ b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java @@ -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; diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java index 54e190be..e2313a4e 100644 --- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java +++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java @@ -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; diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java index ff5b08b0..908cd5f5 100644 --- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java +++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java @@ -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( diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java index e610a82c..1e7bca1b 100644 --- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java @@ -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( diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java index 7c258d81..b9635c9c 100644 --- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java @@ -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( diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java index 77fb9459..f6ef3d14 100644 --- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java @@ -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( diff --git a/src/main/java/org/fairdatapoint/service/label/LabelService.java b/src/main/java/org/fairdatapoint/service/label/LabelService.java index 2872727a..874227b0 100644 --- a/src/main/java/org/fairdatapoint/service/label/LabelService.java +++ b/src/main/java/org/fairdatapoint/service/label/LabelService.java @@ -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;