Skip to content
Snippets Groups Projects
Commit a4220ac5 authored by Denis Sukhoroslov's avatar Denis Sukhoroslov
Browse files

Merge branch 'feature/branch-2.x' into 'main'

branch 2.x starting

See merge request eclipse/xfsc/cat/fc-service!338
parents 8efaa350 44519f0b
No related branches found
No related tags found
No related merge requests found
Pipeline #45869 failed with stages
FROM --platform=$BUILDPLATFORM maven:3.8.1-openjdk-17-slim AS build
FROM --platform=$BUILDPLATFORM maven:3.8.1-openjdk-21-slim AS build
WORKDIR /app
......
......@@ -20,7 +20,7 @@ dependencies:
version: 12.4.3
repository: "oci://registry-1.docker.io/bitnamicharts"
- name: neo4j
version: 5.14.0
version: 5.18.0
repository: "https://neo4j.github.io/helm-charts/"
- name: keycloak
version: 20.0.1
......
......@@ -179,7 +179,7 @@ postgresql:
keycloak:
fullnameOverride: fc-keycloak
image:
tag: 20.0.2
tag: 23.0.7
auth:
adminUser: admin
adminPassword: admin
......@@ -241,12 +241,10 @@ neo4j:
neo4j:
name: fc-neo4j-db
password: "neo12345"
# passwordFromSecret: fc-neo4j-secret
volumes:
data:
mode: defaultStorageClass
env:
# NEO4J_AUTH: neo4j/neo12345
NEO4J_PLUGINS: '["apoc", "graph-data-science", "n10s"]'
additionalVolumes:
- name: fc-neo4j-data
......@@ -270,9 +268,9 @@ neo4j:
- "/bin/sh"
- "-c"
- |
curl -L https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/5.5.0/apoc-5.5.0-extended.jar -O
curl -L https://github.com/neo4j-labs/neosemantics/releases/download/5.5.0.0/neosemantics-5.5.0.0.jar -O
curl -L https://graphdatascience.ninja/neo4j-graph-data-science-2.3.5.jar -O
cp -R apoc-5.5.0-extended.jar /var/lib/neo4j/plugins
cp -R neosemantics-5.5.0.0.jar /var/lib/neo4j/plugins
cp -R neo4j-graph-data-science-2.3.5.jar /var/lib/neo4j/plugins
curl -L https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/5.18.0/apoc-5.18.0-extended.jar -O
curl -L https://github.com/neo4j-labs/neosemantics/releases/download/5.18.0/neosemantics-5.18.0.jar -O
curl -L https://graphdatascience.ninja/neo4j-graph-data-science-2.6.6.jar -O
cp -R apoc-5.18.0-extended.jar /var/lib/neo4j/plugins
cp -R neosemantics-5.18.0.jar /var/lib/neo4j/plugins
cp -R neo4j-graph-data-science-2.6.6.jar /var/lib/neo4j/plugins
......@@ -14,7 +14,7 @@ PROXY_ADDRESS_FORWARDING=true
AUTH_SERVER_HOST_GATEWAY=127.0.0.1
### FC SERVER PROPERTIES ###
CI_REGISTRY=registry.gitlab.com/gaia-x/data-infrastructure-federation-services/cat/fc-service
CI_REGISTRY=node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/catalogue
# federated-catalog client secret, gaia-x realm
FC_CLIENT_SECRET=**********
......
......@@ -14,7 +14,7 @@ PROXY_ADDRESS_FORWARDING=true
AUTH_SERVER_HOST_GATEWAY=127.0.0.1
### FC SERVER PROPERTIES ###
CI_REGISTRY=registry.gitlab.com/gaia-x/data-infrastructure-federation-services/cat/fc-service
CI_REGISTRY=node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/catalogue
# federated-catalog client secret, gaia-x realm
FC_CLIENT_SECRET=**********
......
......@@ -31,7 +31,7 @@ services:
neo4j:
container_name: "neo4j"
image: neo4j:5.14.0
image: neo4j:5.18.0
environment:
NEO4J_AUTH: "${GRAPH_STORE_USER}/${GRAPH_STORE_PASSWORD}"
NEO4J_server_http_listen__address: :7474
......
......@@ -60,17 +60,11 @@
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
</dependency>
-->
<dependency>
<groupId>org.neo4j.gds</groupId>
<artifactId>open-model-catalog</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
......
......@@ -18,10 +18,25 @@
<name>fc-service</name>
<description>Eclipse XFSC Federated Catalogue Service</description>
<inceptionYear>2022</inceptionYear>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>T-Systems International GmbH</name>
</organization>
<developers>
<developer>
<id>dsukhoroslov</id>
<name>Denis Sukhoroslov</name>
<email>dsukhoroslov@gmail.com</email>
</developer>
</developers>
<repositories>
<repository>
<id>danubetech-maven-public</id>
......@@ -55,10 +70,9 @@
<spring-boot.version>3.2.5</spring-boot.version>
<spring.security.version>6.2.4</spring.security.version>
<springdoc.version>2.5.0</springdoc.version>
<lombok.version>1.18.32</lombok.version>
<keycloak.version>23.0.7</keycloak.version>
<liquibase.version>4.27.0</liquibase.version>
<jena.version>4.9.0</jena.version>
<jena.version>4.10.0</jena.version>
<topbraid.version>1.4.2</topbraid.version>
<vc.version>1.9.0</vc.version>
<key-format.version>1.15.0</key-format.version>
......@@ -67,15 +81,12 @@
<uni-resolver.version>0.17.0</uni-resolver.version>
<titanium.version>1.3.2</titanium.version>
<caffeine.version>3.1.8</caffeine.version>
<eclipse-collections.version>11.1.0</eclipse-collections.version>
<neo4j.driver.version>5.14.0</neo4j.driver.version>
<neo4j.gds.version>2.5.6</neo4j.gds.version>
<neo4j.apoc.version>5.14.0</neo4j.apoc.version>
<neo4j.neosemantics.version>5.14.0</neo4j.neosemantics.version>
<neo4j.driver.version>5.18.0</neo4j.driver.version>
<neo4j.gds.version>2.6.6</neo4j.gds.version>
<neo4j.apoc.version>5.18.0</neo4j.apoc.version>
<neo4j.neosemantics.version>5.18.0</neo4j.neosemantics.version>
<bcpkix-jdk18on.version>1.78.1</bcpkix-jdk18on.version>
<jnats.version>2.16.13</jnats.version>
<logback.version>1.4.14</logback.version>
<protobuf-javalite.version>3.25.1</protobuf-javalite.version>
<jnats.version>2.17.6</jnats.version>
<jackson-bom.version>2.16.0</jackson-bom.version>
<commons-compress.version>1.26.0</commons-compress.version>
<commons-config2.version>2.10.1</commons-config2.version>
......@@ -88,7 +99,7 @@
<security.test-addons.version>4.5.1</security.test-addons.version>
<embedded.postgres.version>2.0.6</embedded.postgres.version>
<embedded.postgres.test.version>2.4.0</embedded.postgres.test.version>
<neo4j.test-harness.version>5.15.0</neo4j.test-harness.version>
<neo4j.test-harness.version>5.19.0</neo4j.test-harness.version>
<neo4j.test-spring.version>4.3.6.0</neo4j.test-spring.version>
<jose4j.version>0.9.4</jose4j.version>
<!-- plugins -->
......@@ -196,13 +207,6 @@
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
<!--scope>provided</scope-->
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
......@@ -325,30 +329,6 @@
</dependency>
<!-- set versions to resolve vulnerabilities -->
<!--
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>${eclipse-collections.version}</version>
</dependency>
-->
<!--
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
<version>${protobuf-javalite.version}</version>
</dependency>
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>${commons-config2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${mime4j.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
......@@ -364,6 +344,11 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${mime4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
......@@ -508,7 +493,7 @@
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
</container>
<from>
<image>bellsoft/liberica-openjdk-alpine:17</image>
<image>bellsoft/liberica-openjdk-alpine:21</image>
</from>
<!-- Turn it off for all the modules, but
turn it on in server module only -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment