Skip to content

chore(deps): update maven-compiler.version #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZxBot wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

chore(deps): update maven-compiler.version #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2193f
chore: [CO-3846] temporary revert to ProtectSystem=yes (#281)
M0Rf30 Jun 19, 2026
52cae2b
chore(deps): update maven-compiler.version
ZxBot Jun 20, 2026
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
52 changes: 6 additions & 46 deletions package/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,19 @@ source=(
"policies.json"
"service-protocol.json"
"service-router.json"
"carbonio-files-watches.service"
"carbonio-files-start-watches.sh"
"carbonio-files-handle-kv-changes.py"
)
sha256sums=(
'96f4a551909cd061e95fe06175ff3e2f35578af77ac677023174098c8f940ed3'
'1b48886989ad379f5c8ef1024f275a3657801c55cd038fe95ac4c9026ce471a7'
'a7ee302ad9fbd4b833aaff762434318b1d16fd0dcbf749d44cffa23005a55d4f'
'ef9409dc0ff2e5096fefa6b6ee06b0253e7a5005f1600771bf1e1bba36381d20'
'999745be7b0af1051ebc2855d2331585984a80de644553af59e37ce00a2e3297'
'8963c7a7c3679a3c14550d4a40d353ff20ee6995d77eb7dc2c3c96f40690a7e3'
'13849da0f25c1a0fa573c7e33f42e39efda0969bffb921d9710a85d722725309'
'6997ab298de2d92fc41e07de618e0c3785e586291b504354d8eb43ce54cb8437'
'SKIP'
'2f5e8f227d48471e14278068956723ae7dac12c4c6aa0dd6955c00868e1f7ad2'
'bc4ae477209ec6c64162749a087cd039269bd087647419648bdfee334c87ced3'
'419211cf2a57b235eaa96d50c46212897e5731589bef96e5cf898f732208bd66'
'1a1a163fbbca4006ff7951add46d41415fb99948f072a02cd16e408e1fc322da'
'28b19e0eadf4afc64bb097878abf666ca4594168c53d03fdb13213e33a31c967'
'2fc8cb3533d4a14c7666a91ca5092431ceee469f845feccc20b0b505262da6ec'
'6bc85f53bf4470e3251dcb477085336f7e0a674b789f64bb883a4b70603495b4'
)

backup=(
Expand Down Expand Up @@ -101,12 +95,6 @@ _package_common() {

install -Dm644 "${srcdir}/service-router.json" \
"${pkgdir}/etc/carbonio/files/service-discover/service-router.json"

install -Dm644 "${srcdir}/carbonio-files-watches.service" \
"${pkgdir}/lib/systemd/system/carbonio-files-watches.service"

install -Dm755 "${srcdir}/carbonio-files-handle-kv-changes.py" \
"${pkgdir}/usr/bin/carbonio-files-handle-kv-changes.py"
}

_package_legacy() {
Expand All @@ -125,52 +113,24 @@ build__rocky_8() {
pip3.8 install \
--prefix="${pkgdir}/opt/zextras/common" \
pika

install -Dm 755 "${srcdir}/carbonio-files-start-watches.sh" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PYTHON_VER/3.8/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PREFIX/common/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
}

build__rocky_9() {
pip3 install \
--prefix="${pkgdir}/opt/zextras/common" \
pika

install -Dm 755 "${srcdir}/carbonio-files-start-watches.sh" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PYTHON_VER/3.9/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PREFIX/common/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
}

build__ubuntu_jammy() {
pip3 install \
--prefix="${pkgdir}/opt/zextras/common" \
pika

install -Dm 755 "${srcdir}/carbonio-files-start-watches.sh" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PYTHON_VER/3.10/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PREFIX/common\/local/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
}

build__ubuntu_noble() {
pip3 install \
--prefix="${pkgdir}/opt/zextras/common" \
pika

install -Dm 755 "${srcdir}/carbonio-files-start-watches.sh" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PYTHON_VER/3.12/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
sed -i "s/PREFIX/common\/local/g" \
"${pkgdir}/usr/bin/carbonio-files-start-watches.sh"
}

package() {
Expand All @@ -186,10 +146,10 @@ package__ubuntu_jammy() {
}

postinst() {
getent group 'carbonio-files' >/dev/null \
|| groupadd -r 'carbonio-files'
getent passwd 'carbonio-files' >/dev/null \
|| useradd -r -M -g 'carbonio-files' -s /sbin/nologin 'carbonio-files'
getent group 'carbonio-files' >/dev/null ||
groupadd -r 'carbonio-files'
getent passwd 'carbonio-files' >/dev/null ||
useradd -r -M -g 'carbonio-files' -s /sbin/nologin 'carbonio-files'

mkdir -p "/var/log/carbonio/files/"
chown carbonio-files:carbonio-files "/var/log/carbonio/files"
Expand Down
6 changes: 5 additions & 1 deletion package/carbonio-files-sidecar-legacy.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ LimitNOFILE=65536

# Hardening
PrivateTmp=yes
ProtectSystem=strict
#ProtectSystem=strict
ProtectSystem=yes
ReadOnlyPaths=/usr
ReadOnlyPaths=/boot
ReadOnlyPaths=/efi
NoNewPrivileges=yes
PrivateDevices=yes
ProtectHome=yes
Expand Down
6 changes: 5 additions & 1 deletion package/carbonio-files-sidecar.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ LimitNOFILE=65536

# Hardening
PrivateTmp=yes
ProtectSystem=strict
#ProtectSystem=strict
ProtectSystem=yes
ReadOnlyPaths=/usr
ReadOnlyPaths=/boot
ReadOnlyPaths=/efi
NoNewPrivileges=yes
PrivateDevices=yes
ProtectHome=yes
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ SPDX-License-Identifier: AGPL-3.0-only

<!-- Plugins -->
<maven-assembly.version>3.6.0</maven-assembly.version>
<maven-compiler.version>3.13.0</maven-compiler.version>
<maven-compiler.version>3.15.0</maven-compiler.version>
<maven-failsafe.version>3.5.4</maven-failsafe.version>
<maven-jacoco.version>0.8.12</maven-jacoco.version>
<maven-surefire.version>3.5.4</maven-surefire.version>
Expand Down