Skip to content

Commit cfec9c7

Browse files
jvanmalderjvanmalder
committed
release: 2.6.0
1 parent b23aad0 commit cfec9c7

File tree

322 files changed

+13647
-3254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+13647
-3254
lines changed

‎.spotbugs/spotbugs-security-exclude.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,16 @@
7272
<Class name="eu.openanalytics.rdepot.repo.r.storage.implementations.CranFileSystemStorageService" />
7373
<Bug pattern="PATH_TRAVERSAL_IN" />
7474
</Match>
75+
<Match>
76+
<Class name="eu.openanalytics.rdepot.python.mirroring.PypiMirrorSynchronizer" />
77+
<Bug pattern="PATH_TRAVERSAL_IN" />
78+
</Match>
79+
<Match>
80+
<Class name="eu.openanalytics.rdepot.base.api.v2.controllers.ApiV2StatusController" />
81+
<Bug pattern="URLCONNECTION_SSRF_FD" />
82+
</Match>
83+
<Match>
84+
<Class name="eu.openanalytics.rdepot.base.synchronization.healthcheck.ServerAddressHealthcheckService" />
85+
<Bug pattern="URLCONNECTION_SSRF_FD" />
86+
</Match>
7587
</FindBugsFilter>

‎demo/docker-compose.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
networks:
2929
- oa-rdepot
3030
backend:
31-
image: openanalytics/rdepot-app:2.5.2
31+
image: openanalytics/rdepot-app:2.6.0
3232
restart: unless-stopped
3333
hostname: oa-rdepot-backend
3434
container_name: oa-rdepot-backend
@@ -52,7 +52,7 @@ services:
5252
timeout: 10s
5353
retries: 10
5454
repo:
55-
image: openanalytics/rdepot-repo:2.5.2
55+
image: openanalytics/rdepot-repo:2.6.0
5656
restart: unless-stopped
5757
hostname: oa-rdepot-repo
5858
container_name: oa-rdepot-repo
@@ -63,7 +63,7 @@ services:
6363
- oa-rdepot
6464
frontend:
6565
container_name: oa-rdepot-frontend
66-
image: openanalytics/rdepot-client:2.5.2
66+
image: openanalytics/rdepot-client:2.6.0
6767
restart: unless-stopped
6868
networks:
6969
- oa-rdepot

‎docker-compose.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
build:
3333
dockerfile: docker/build/app-standalone/Dockerfile
3434
cache_from:
35-
- openanalytics/rdepot-app:2.5.2
35+
- openanalytics/rdepot-app:2.6.0
3636
restart: unless-stopped
3737
hostname: oa-rdepot-backend
3838
container_name: oa-rdepot-backend
@@ -59,7 +59,7 @@ services:
5959
build:
6060
dockerfile: docker/build/repo-standalone/Dockerfile
6161
cache_from:
62-
- openanalytics/rdepot-repo:2.5.2
62+
- openanalytics/rdepot-repo:2.6.0
6363
restart: unless-stopped
6464
hostname: oa-rdepot-repo
6565
container_name: oa-rdepot-repo
@@ -70,7 +70,7 @@ services:
7070
- oa-rdepot
7171
frontend:
7272
container_name: oa-rdepot-frontend
73-
image: openanalytics/rdepot-client:2.5.2
73+
image: openanalytics/rdepot-client:2.6.0
7474
restart: unless-stopped
7575
networks:
7676
- oa-rdepot

‎docker/build/app-standalone/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM registry.openanalytics.eu/openanalytics/rdepot-app-it:2.5.2
1+
FROM registry.openanalytics.eu/openanalytics/rdepot-app-it:2.6.0
22

3-
COPY ./rdepot-app/target/rdepot-app-2.5.2.war /opt/rdepot/rdepot.war
3+
COPY ./rdepot-app/target/rdepot-app-2.6.0.war /opt/rdepot/rdepot.war
44
COPY ./docker/build/app-standalone/application.yml /opt/rdepot/application.yml
55

66
ENTRYPOINT exec java $JAVA_OPTS -jar /opt/rdepot/rdepot.war --spring.config.location=classpath:/application.yml --spring.config.additional-location=file:/opt/rdepot/application.yml

‎docker/build/repo-standalone/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.openanalytics.eu/openanalytics/rdepot-repo-it:2.5.2
1+
FROM registry.openanalytics.eu/openanalytics/rdepot-repo-it:2.6.0
22

3-
COPY ./rdepot-repo/target/rdepot-repo-2.5.2.jar /opt/repo/rdepot-repo.jar
3+
COPY ./rdepot-repo/target/rdepot-repo-2.6.0.jar /opt/repo/rdepot-repo.jar
44
COPY ./docker/build/repo-standalone/application.yml /opt/repo/application.yml

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>eu.openanalytics</groupId>
88
<artifactId>rdepot</artifactId>
9-
<version>2.5.2</version>
9+
<version>2.6.0</version>
1010
<packaging>pom</packaging>
1111
<name>RDepot</name>
1212
<description>Enterprise Management of Package Repositories</description>

‎rdepot-app/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>eu.openanalytics</groupId>
1212
<artifactId>rdepot-app</artifactId>
13-
<version>2.5.2</version>
13+
<version>2.6.0</version>
1414
<packaging>war</packaging>
1515
<name>RDepot App</name>
1616
<description>RDepot Server App Entrypoint Module</description>
@@ -74,22 +74,22 @@
7474
<dependency>
7575
<groupId>eu.openanalytics</groupId>
7676
<artifactId>rdepot-base</artifactId>
77-
<version>2.5.2</version>
77+
<version>2.6.0</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>eu.openanalytics</groupId>
8181
<artifactId>rdepot-python-module</artifactId>
82-
<version>2.5.2</version>
82+
<version>2.6.0</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>eu.openanalytics</groupId>
8686
<artifactId>rdepot-r-module</artifactId>
87-
<version>2.5.2</version>
87+
<version>2.6.0</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>eu.openanalytics</groupId>
9191
<artifactId>rdepot-repo</artifactId>
92-
<version>2.5.2</version>
92+
<version>2.6.0</version>
9393
</dependency>
9494
<!-- https://mvnrepository.com/artifact/org.testcontainers/testcontainers -->
9595
<dependency>

‎rdepot-app/src/main/resources/application.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ package:
123123
- noble
124124
- bullseye
125125
- bookworm
126+
python:
127+
hashFunctions:
128+
- md5
129+
- sha1
130+
- sha224
131+
- sha256
132+
- sha384
133+
- sha512
126134

127135
# Repository generation related properties
128136
repository:

‎rdepot-app/src/main/resources/db/changelog/schema/13_last_used_access_token.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ databaseChangeLog:
22
- changeSet:
33
id: 13_01_last_used_access_token
44
author: pgleska
5+
preConditions:
6+
- onFail: MARK_RAN
7+
- not:
8+
- columnExists:
9+
tableName: access_token
10+
schemaName: public
11+
columnName: last_used
512
changes:
613
- addColumn:
714
tableName: access_token

‎rdepot-app/src/main/resources/db/changelog/schema/14_repository_authentication.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ databaseChangeLog:
22
- changeSet:
33
id: 14_01_last_used_access_token
44
author: pgleska
5+
preConditions:
6+
- onFail: MARK_RAN
7+
- not:
8+
- columnExists:
9+
tableName: repository
10+
schemaName: public
11+
columnName: requires_authentication
512
changes:
613
- addColumn:
714
tableName: repository

0 commit comments

Comments
 (0)