Skip to content

Commit 39a7f70

Browse files
npomarolinpomaroli
committed
Merge branch 'hotfix-2.1.x' into dev
2 parents 2a3830a + 7962f13 commit 39a7f70

File tree

77 files changed

+1090
-151
lines changed

Some content is hidden

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

77 files changed

+1090
-151
lines changed

‎.jenkins/Dockerfile.nexus

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,44 @@
11
FROM docker.gentics.com/jenkinsbuilds/mesh-slave:java11-1.1
2+
ARG NODE_VERSION=20.12.1
3+
24
USER root
35

46
ADD ./files/settings.xml /opt/maven/conf/settings.xml
57

8+
# Update public keys for node installs.
9+
RUN set -ex \
10+
&& for key in \
11+
4ED778F539E3634C779C87C6D7062848A1AB005C \
12+
141F07595B7B3FFE74309A937405533BE57C7D57 \
13+
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
14+
DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
15+
CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
16+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
17+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
18+
890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
19+
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
20+
108F52B48DB57BB0CC439B2997B01419BD92F80A \
21+
A363A499291CBBC940DD62E41F10027AF002F8B0 \
22+
; do \
23+
gpg2 --batch --keyserver keys.openpgp.org --recv-keys "$key"; \
24+
done
25+
26+
# Download NodeJS
27+
RUN mkdir /opt/node \
28+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
29+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt" \
30+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.sig"
31+
# Verify downloaded NodeJS files
32+
RUN gpg --verify SHASUMS256.txt.sig SHASUMS256.txt \
33+
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c -
34+
# Install NodeJS
35+
RUN tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /opt/node --strip-components=1 \
36+
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.sig SHASUMS256.txt \
37+
&& ln -s /opt/node/bin/node /usr/local/bin/node \
38+
&& ln -s /opt/node/bin/npm /usr/local/bin/npm \
39+
&& ln -s /opt/node/bin/npx /usr/local/bin/npx \
40+
&& echo "export PATH=\$PATH:/opt/node/bin" > /etc/profile.d/nodejs.sh \
41+
&& chmod +x /etc/profile.d/* \
42+
&& chown -R 10000:10000 /opt/node
43+
644
USER jenkins

‎Jenkinsfile.split

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ stage("Setup Build Environment") {
397397

398398
stage("Deploy") {
399399
if (env.BUILD_SKIPPED != "true" && (Boolean.valueOf(params.runDeploy) || Boolean.valueOf(params.runDeployTesting))) {
400-
if (Boolean.valueOf(params.runDocker)) {
401400
if (Boolean.valueOf(params.runDeployTesting)) {
402401
version = branchName;
403402
registryHost = registryHostTest;
@@ -415,6 +414,22 @@ stage("Setup Build Environment") {
415414
sh 'docker push ' + registryHost + '/gentics/mesh-mariadb:' + version
416415
}
417416
}
417+
418+
if (Boolean.valueOf(params.runDeploy) {
419+
dir(path: 'js') {
420+
// Install dependencies
421+
sh 'npm ci --no-audit --no-fund'
422+
423+
// Set the version for the packages
424+
sh "npm run nx -- release version ${version}"
425+
426+
// Build all JS packages
427+
sh 'npm run nx -- run-many --targets build'
428+
429+
// Publish the pacakges to artifactory
430+
sh 'npm run nx -- release publish'
431+
}
432+
}
418433
} else {
419434
echo "Deploy skipped.."
420435
}

‎LTS-CHANGELOG.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ include::content/docs/variables.adoc-include[]
1717
The LTS changelog lists releases which are only accessible via a commercial subscription.
1818
All fixes and changes in LTS releases will be released the next minor release. Changes from LTS 1.4.x will be included in release 1.5.0.
1919

20+
[[v1.10.36]]
21+
== 1.10.36 (23.10.2024)
22+
23+
icon:check[] Cache: Image cache has been refactored, utilizing now simpler structure with less folder depth.
24+
25+
icon:check[] Core: A potential data loss on an edge case of node migration over several schema versions, including field name/type change, has been fixed.
26+
27+
icon:check[] Documentation: A missing query parameters documentation for the `/search` and `/{{project}}/search` has been added.
28+
2029
[[v1.10.35]]
2130
== 1.10.35 (27.09.2024)
2231

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<graphql.version>21.5</graphql.version>
2222
<graphql-scalars.version>21.0</graphql-scalars.version>
2323
<graphql-dataloader.version>3.2.2</graphql-dataloader.version>
24-
<graphql-filter.version>3.0.5</graphql-filter.version>
24+
<graphql-filter.version>3.0.6</graphql-filter.version>
2525
<pf4j.version>3.11.0</pf4j.version>
2626
<asm.version>3.3.1</asm.version>
2727
<spring.security.version>6.3.3</spring.security.version>

‎changelog-2.adoc-include

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ If you want to add changelog entries, create a new file in changelog/src/changel
66
mvn -pl changelog install
77
////
88

9-
[[v3.0.0-SNAPSHOT]]
10-
== 3.0.0-SNAPSHOT (24.09.2024)
9+
[[v2.1.10]]
10+
== 2.1.10 (06.11.2024)
1111

12-
icon:bullhorn[] Core: The storage layer has been replaced from the included OrientDB to the Hibernate ORM based solution, allowing the usage of 3rd party SQL RDBMS as a structured data storage. The supported database for Mesh OSS is MariaDB 10.7+. Additionally, an in-memory mode HSQLDB is supported for the testing purposes.
12+
icon:plus[] Core: Now it is possible to sort over binary metadata, node reference and micronode non-list fields.
13+
14+
[[v2.1.9]]
15+
== 2.1.9 (23.10.2024)
16+
17+
icon:check[] Documentation: A missing query parameters documentation for the `/search` and `/{{project}}/search` has been added.
18+
19+
icon:check[] Cache: Image cache has been refactored, utilizing now simpler structure with less folder depth.
20+
21+
icon:check[] Core: A potential data loss on an edge case of node migration over several schema versions, including field name/type change, has been fixed.
1322

1423
[[v2.1.8]]
1524
== 2.1.8 (09.10.2024)

‎changelog/src/changelog/entries/2024/04/7757.GPU-1413.enhancement

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Core: Now it is possible to sort over binary metadata, node reference and micronode non-list fields.

‎changelog/src/changelog/entries/2024/10/8032.SUP-17222.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Documentation: A missing query parameters documentation for the `/search` and `/{{project}}/search` has been added.

‎changelog/src/changelog/entries/2024/10/8033.SUP-17176.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Cache: Image cache has been refactored, utilizing now simpler structure with less folder depth.

‎changelog/src/changelog/entries/2024/10/8034.SUP-17282.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Core: A potential data loss on an edge case of node migration over several schema versions, including field name/type change, has been fixed.

‎changelog/src/changelog/mappings/2.1.10.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"changeLogEntryFileNames": [
3+
"7757.GPU-1413.enhancement"
4+
],
5+
"version": "2.1.10",
6+
"date": "06.11.2024",
7+
"genericProperties": {}
8+
}

0 commit comments

Comments
 (0)