Skip to content

Commit ed8d277

Browse files
ibauersachsibauersachs
committed
Update dependencies, build fixes
1 parent e951050 commit ed8d277

File tree

8 files changed

+96
-51
lines changed

8 files changed

+96
-51
lines changed

‎.github/workflows/deploy-debian.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v4
3434

35-
- uses: robinraju/release-downloader@4bdb8ee081c9ee08a35320794dd461312ac9e4ad
35+
# v1.12
36+
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05
3637
with:
3738
repository: "${{ github.repository }}"
3839
tag: "${{ github.event.inputs.tag || inputs.tag }}"

‎.github/workflows/maven-and-native.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,6 @@ jobs:
133133
env:
134134
DEBIAN_FRONTEND: noninteractive
135135
run: |
136-
# Remove broken packages from pre-installed php in Actions image
137-
# No longer needed in ubuntu-22.04
138-
sudo apt-get remove -y libpcre2-dev libicu-dev icu-devtools
139-
sudo apt-add-repository ppa:ondrej/php -y
140-
sudo apt-get install -y aptitude
141-
echo "Get::allow-downgrades \"true\";" | sudo tee /etc/apt/apt.conf.d/99-downgrades
142-
echo "Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/99-downgrades
143-
sudo ./resources/ubuntu-build-image/ppa-purge.sh ppa:ondrej/php -y true
144136
if [ "${{ matrix.arch }}" != "x86" ] && [ "${{ matrix.arch }}" != "x86-64" ]; then
145137
sudo cp -f resources/ubuntu-build-image/ports-sources.list /etc/apt/sources.list
146138
fi
@@ -228,7 +220,8 @@ jobs:
228220
resources/deb-build.sh \
229221
"${{ needs.version.outputs.version }}" \
230222
"${{ matrix.dist.dist }}" \
231-
"${{ matrix.arch }}"
223+
"${{ matrix.arch }}" \
224+
"[email protected]"
232225
233226
- name: Upload package as artifact
234227
uses: actions/upload-artifact@v4
@@ -441,7 +434,8 @@ jobs:
441434
442435
- name: Create release
443436
if: github.ref == 'refs/heads/master'
444-
uses: ncipollo/release-action@37c87f6b53fb46d40450c3cac428aa83c8d0055f
437+
# v1.16.0
438+
uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174
445439
with:
446440
artifacts: "target/*.jar,debian-releases.tar"
447441
allowUpdates: true

‎pom.xml‎

Lines changed: 60 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</licenses>
4646

4747
<properties>
48-
<bouncycastle.version>1.77</bouncycastle.version>
48+
<bouncycastle.version>1.80</bouncycastle.version>
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050
</properties>
5151

@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>net.java.dev.jna</groupId>
7171
<artifactId>jna</artifactId>
72-
<version>5.13.0</version>
72+
<version>5.17.0</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.bouncycastle</groupId>
@@ -94,12 +94,12 @@
9494
<dependency>
9595
<groupId>${project.groupId}</groupId>
9696
<artifactId>jitsi-utils</artifactId>
97-
<version>1.0-126-g02b0c86</version>
97+
<version>1.0-135-g56f462d</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>${project.groupId}</groupId>
101101
<artifactId>jitsi-srtp</artifactId>
102-
<version>1.1-15-ga19c05a</version>
102+
<version>1.1-20-g3cd87a0</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>org.opentelecoms.sdp</groupId>
@@ -127,26 +127,26 @@
127127
<dependency>
128128
<groupId>org.apache.commons</groupId>
129129
<artifactId>commons-lang3</artifactId>
130-
<version>3.12.0</version>
130+
<version>3.17.0</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>org.jetbrains</groupId>
134134
<artifactId>annotations</artifactId>
135-
<version>24.0.1</version>
135+
<version>26.0.2</version>
136136
<scope>provided</scope>
137137
</dependency>
138138

139139
<!-- test -->
140140
<dependency>
141141
<groupId>org.junit.jupiter</groupId>
142142
<artifactId>junit-jupiter-engine</artifactId>
143-
<version>5.9.3</version>
143+
<version>5.12.2</version>
144144
<scope>test</scope>
145145
</dependency>
146146
<dependency>
147147
<groupId>org.mockito</groupId>
148148
<artifactId>mockito-core</artifactId>
149-
<version>5.4.0</version>
149+
<version>5.17.0</version>
150150
<scope>test</scope>
151151
</dependency>
152152
<dependency>
@@ -158,11 +158,35 @@
158158
</dependencies>
159159

160160
<build>
161+
<pluginManagement>
162+
<plugins>
163+
<plugin>
164+
<groupId>org.apache.maven.plugins</groupId>
165+
<artifactId>maven-antrun-plugin</artifactId>
166+
<version>3.1.0</version>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-assembly-plugin</artifactId>
171+
<version>3.7.1</version>
172+
</plugin>
173+
<plugin>
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-dependency-plugin</artifactId>
176+
<version>3.8.1</version>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-release-plugin</artifactId>
181+
<version>3.1.1</version>
182+
</plugin>
183+
</plugins>
184+
</pluginManagement>
161185
<plugins>
162186
<plugin>
163187
<groupId>org.codehaus.mojo</groupId>
164188
<artifactId>versions-maven-plugin</artifactId>
165-
<version>2.16.0</version>
189+
<version>2.18.0</version>
166190
<configuration>
167191
<ruleSet>
168192
<ignoreVersions>
@@ -213,7 +237,7 @@
213237
<plugin>
214238
<groupId>org.apache.maven.plugins</groupId>
215239
<artifactId>maven-compiler-plugin</artifactId>
216-
<version>3.11.0</version>
240+
<version>3.14.0</version>
217241
<configuration>
218242
<release>11</release>
219243
<compilerArgs>
@@ -224,45 +248,56 @@
224248
</configuration>
225249
</plugin>
226250
<plugin>
227-
<artifactId>maven-surefire-plugin</artifactId>
228-
<version>3.1.2</version>
251+
<groupId>org.apache.maven.plugins</groupId>
252+
<artifactId>maven-clean-plugin</artifactId>
253+
<version>3.4.1</version>
254+
</plugin>
255+
<plugin>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-deploy-plugin</artifactId>
258+
<version>3.1.4</version>
259+
</plugin>
260+
<plugin>
261+
<groupId>org.apache.maven.plugins</groupId>
262+
<artifactId>maven-install-plugin</artifactId>
263+
<version>3.1.4</version>
229264
</plugin>
230265
<plugin>
231266
<groupId>org.apache.maven.plugins</groupId>
232267
<artifactId>maven-javadoc-plugin</artifactId>
233-
<version>3.5.0</version>
268+
<version>3.11.2</version>
234269
<configuration>
235270
<doclint>-missing</doclint>
236271
<source>11</source>
237272
</configuration>
238273
</plugin>
239274
<plugin>
240275
<groupId>org.apache.maven.plugins</groupId>
241-
<artifactId>maven-source-plugin</artifactId>
242-
<version>3.3.0</version>
243-
<configuration>
244-
<excludeResources>true</excludeResources>
245-
</configuration>
276+
<artifactId>maven-resources-plugin</artifactId>
277+
<version>3.3.1</version>
246278
</plugin>
247279
<plugin>
248280
<groupId>org.apache.maven.plugins</groupId>
249-
<artifactId>maven-resources-plugin</artifactId>
250-
<version>3.3.1</version>
281+
<artifactId>maven-site-plugin</artifactId>
282+
<version>3.21.0</version>
251283
</plugin>
252284
<plugin>
253285
<groupId>org.apache.maven.plugins</groupId>
254-
<artifactId>maven-install-plugin</artifactId>
255-
<version>3.1.1</version>
286+
<artifactId>maven-source-plugin</artifactId>
287+
<version>3.3.1</version>
288+
<configuration>
289+
<excludeResources>true</excludeResources>
290+
</configuration>
256291
</plugin>
257292
<plugin>
258293
<groupId>org.apache.maven.plugins</groupId>
259-
<artifactId>maven-deploy-plugin</artifactId>
260-
<version>3.1.1</version>
294+
<artifactId>maven-surefire-plugin</artifactId>
295+
<version>3.5.3</version>
261296
</plugin>
262297
<plugin>
263298
<groupId>org.sonatype.plugins</groupId>
264299
<artifactId>nexus-staging-maven-plugin</artifactId>
265-
<version>1.6.13</version>
300+
<version>1.7.0</version>
266301
<extensions>true</extensions>
267302
<configuration>
268303
<serverId>ossrh</serverId>

‎resources/deb-build.sh‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
#!/usr/bin/env bash
2+
if [ "$#" -ne 4 ]; then
3+
echo "Usage: $0 <VERSION> <DIST> <ARCH> <GPG_ID>"
4+
echo " VERSION: Source package version, e.g. 2.14.123-gcaffee"
5+
echo " DIST: Debian/Ubuntu distribution name (e.g. focal or bullseye)"
6+
echo " ARCH: Architecture (e.g. amd64, aarch64)"
7+
echo " GPG_ID: id for package signing"
8+
exit 1
9+
fi;
10+
211
set -e
312
set -x
413
VERSION=$1
514
DIST=$2
615
ARCH=$3
16+
GPG_ID=$4
717
PROJECT_DIR="$(realpath "$(dirname "$0")/../")"
818
cd "${PROJECT_DIR}" || exit
919
# export for sbuildrc sourcing
@@ -13,16 +23,21 @@ mkdir -p "${BUILD_DIR}"
1323
# use tmpfs for sbuild
1424
sudo tee -a /etc/fstab < "${PROJECT_DIR}/resources/sbuild-tmpfs"
1525

16-
# --skip-security because: https://bugs.launchpad.net/ubuntu/+source/ubuntu-dev-tools/+bug/1955116
1726
if [[ "${ARCH}" != "amd64" ]]; then
18-
mk-sbuild "${DIST}" --target "${ARCH}" --skip-security --type=file --debootstrap-include=ca-certificates || sbuild-update -udc "${DIST}"-amd64-"${ARCH}"
27+
mk-sbuild "${DIST}" --target "${ARCH}" --type=file --debootstrap-include=ca-certificates || sbuild-update -udc "${DIST}"-amd64-"${ARCH}"
28+
29+
# union-type= is not valid for type=file, remove to prevent warnings
30+
sudo sed -i s/union-type=.*//g "/etc/schroot/chroot.d/sbuild-${DIST}-amd64-${ARCH}"
1931
else
2032
if debian-distro-info --all | grep -Fqxi "${DIST}"; then
2133
export DEBOOTSTRAP_MIRROR=${DEBOOTSTRAP_MIRROR:-$UBUNTUTOOLS_DEBIAN_MIRROR}
2234
elif ubuntu-distro-info --all | grep -Fqxi "${DIST}"; then
2335
export DEBOOTSTRAP_MIRROR=${DEBOOTSTRAP_MIRROR:-$UBUNTUTOOLS_UBUNTU_MIRROR}
2436
fi
25-
mk-sbuild "${DIST}" --skip-security --type=file --debootstrap-include=ca-certificates || sbuild-update -udc "${DIST}"-amd64
37+
mk-sbuild "${DIST}" --type=file --debootstrap-include=ca-certificates || sbuild-update -udc "${DIST}"-amd64
38+
39+
# union-type= is not valid for type=file, remove to prevent warnings
40+
sudo sed -i s/union-type=.*//g "/etc/schroot/chroot.d/sbuild-${DIST}-amd64"
2641
fi
2742

2843
mvn -B versions:set -DnewVersion="${VERSION}" -DgenerateBackupPoms=false
@@ -35,7 +50,7 @@ else
3550
cp "${PROJECT_DIR}"/../libjitsi_* "$BUILD_DIR"
3651
fi
3752

38-
debsign -S -[email protected] "${BUILD_DIR}"/*.changes --re-sign -p"${PROJECT_DIR}"/resources/gpg-wrap.sh
53+
debsign -S -e"${GPG_ID}" "${BUILD_DIR}"/*.changes --re-sign -p"${PROJECT_DIR}"/resources/gpg-wrap.sh
3954

4055
#make build files readable for Windows and archivable for GitHub Actions
4156
rename 's|:|-|g' "$BUILD_DIR"/*.build

‎resources/ubuntu-build-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:jammy
22

33
ARG ARCH=x86-64
44
ARG JAVA_VERSION=11

‎resources/ubuntu-build-image/packages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dpkg --add-architecture $DEBARCH
2525
if [[ "$GNUARCH" == "" ]]; then
2626
PACKAGES+=(g++-multilib gcc-multilib)
2727
else
28-
PACKAGES+=("libgcc-7-dev:$DEBARCH" "g++-$GNUARCH-linux-gnu" "gcc-$GNUARCH-linux-gnu")
28+
PACKAGES+=("libgcc-9-dev:$DEBARCH" "g++-$GNUARCH-linux-gnu" "gcc-$GNUARCH-linux-gnu")
2929
fi;
3030

3131
PACKAGES+=(

‎resources/ubuntu-build-image/ports-sources.list‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
2-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
3-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
4-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu focal-security main restricted universe multiverse
1+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
2+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
3+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse
4+
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
55

6-
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse
7-
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse
8-
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse
9-
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
6+
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
7+
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
8+
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
9+
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎src/native/vcpkg‎

Submodule vcpkg updated 9257 files

0 commit comments

Comments
 (0)