Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ch.epfl.bluebrain.nexus.delta.kernel.syntax.{ClassTagSyntax, Http4sRespon
import ch.epfl.bluebrain.nexus.delta.rdf.instances.{TripleInstances, UriInstances}
import ch.epfl.bluebrain.nexus.delta.rdf.syntax.{IriSyntax, IterableSyntax, JsonLdEncoderSyntax, JsonSyntax, PathSyntax, UriSyntax}
import ch.epfl.bluebrain.nexus.delta.sdk.instances.{CredentialsInstances, HttpResponseFieldsInstances, IdentityInstances, IriInstances, ProjectRefInstances}
import ch.epfl.bluebrain.nexus.delta.sdk.syntax.{HttpRequestSyntax, HttpResponseFieldsSyntax, IORejectSyntax, IriEncodingSyntax, ProjectionErrorsSyntax}
import ch.epfl.bluebrain.nexus.delta.sdk.syntax.{HttpResponseFieldsSyntax, IORejectSyntax, IriEncodingSyntax, ProjectionErrorsSyntax}

/**
* Aggregate instances and syntax from rdf plus the current sdk instances and syntax to avoid importing multiple
Expand All @@ -28,7 +28,6 @@ package object implicits
with IterableSyntax
with KamonSyntax
with IORejectSyntax
with HttpRequestSyntax
with HttpResponseFieldsSyntax
with IOSyntax
with ClassTagSyntax
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
package ch.epfl.bluebrain.nexus.delta.sdk.instances

import akka.http.scaladsl.model.headers.BasicHttpCredentials
import org.http4s.BasicCredentials
import pureconfig.*
import pureconfig.generic.semiauto.deriveReader

trait CredentialsInstances {

implicit final val basicHttpCredentialsConfigReader: ConfigReader[BasicHttpCredentials] =
deriveReader[BasicHttpCredentials]

implicit final val basicCredentialsConfigReader: ConfigReader[BasicCredentials] =
ConfigReader.forProduct2[BasicCredentials, String, String]("username", "password")(BasicCredentials(_, _))
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ package object syntax
with IterableSyntax
with KamonSyntax
with IORejectSyntax
with HttpRequestSyntax
with HttpResponseFieldsSyntax
with ClassTagSyntax
with IOSyntax
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ElasticSearchContainer(password: String)
}

object ElasticSearchContainer {
val Version = "8.17.4"
val Version = "9.0.0"

private val ElasticSearchUser = "elastic"
private val ElasticSearchPassword = "password"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/docs/delta/api/assets/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"blazegraph": "2.1.6-RC-21-jre",
"postgresql": "17.4",
"elasticsearch": "8.17.4"
"elasticsearch": "9.0.0"
},
"plugins": {
"archive": "1.10.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
memory: 1024M

elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.4"
image: "docker.elastic.co/elasticsearch/elasticsearch:9.0.0"
environment:
discovery.type: "single-node"
bootstrap.memory_lock: "true"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/docs/running-nexus/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $ curl http://localhost/v1/version | jq
"delta": "1.10.0",
"dependencies": {
"blazegraph": "2.1.6-SNAPSHOT",
"elasticsearch": "8.17.4",
"elasticsearch": "9.0.0",
"postgres": "17.4"
},
"environment": "dev",
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.4
image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0
environment:
ES_JAVA_OPTS: "-Xmx4G"
discovery.type: "single-node"
Expand Down
Loading