Skip to content

Commit 6a9e596

Browse files
thespadthespad
committed
Merge branch 'main' into jre21
2 parents 759fb2d + c2922e8 commit 6a9e596

File tree

6 files changed

+49
-46
lines changed

6 files changed

+49
-46
lines changed

‎.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
echo "> External trigger running off of main branch. To disable this trigger, add \`unifi-network-application_main\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
26+
EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
2727
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
2828
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2929
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

‎Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ RUN \
2323
unzip && \
2424
echo "**** install unifi ****" && \
2525
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
27-
|grep -A 7 -m 1 'Package: unifi' \
26+
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
27+
| gunzip \
28+
| grep -A 7 -m 1 'Package: unifi' \
2829
| awk -F ': ' '/Version/{print $2;exit}' \
2930
| awk -F '-' '{print $1}'); \
3031
fi && \

‎Dockerfile.aarch64

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ RUN \
2323
unzip && \
2424
echo "**** install unifi ****" && \
2525
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
27-
|grep -A 7 -m 1 'Package: unifi' \
26+
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
27+
| gunzip \
28+
| grep -A 7 -m 1 'Package: unifi' \
2829
| awk -F ': ' '/Version/{print $2;exit}' \
2930
| awk -F '-' '{print $1}'); \
3031
fi && \

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pipeline {
131131
steps{
132132
script{
133133
env.EXT_RELEASE = sh(
134-
script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
134+
script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
135135
returnStdout: true).trim()
136136
env.RELEASE_LINK = 'custom_command'
137137
}

‎jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: unifi-network-application
55
external_type: na
6-
custom_version_command: "curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
6+
custom_version_command: "curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
77
release_type: stable
88
release_tag: latest
99
ls_branch: main

‎package_versions.txt

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ bcpkix-jdk18on 1.75 jav
2424
bcprov-jdk18on 1.75 java-archive
2525
bcutil-jdk18on 1.75 java-archive
2626
bsdutils 1:2.39.3-9ubuntu6.1 deb
27-
bson 4.11.2 java-archive
28-
bson-record-codec 4.11.2 java-archive
27+
bson 4.11.5 java-archive
28+
bson-record-codec 4.11.5 java-archive
2929
ca-certificates 20240203 deb
3030
ca-certificates-java 20240118 deb
3131
ca-certificates-java UNKNOWN java-archive
@@ -99,8 +99,8 @@ hostname 3.23+nmu2ubuntu2 deb
9999
httpclient 4.5.5 java-archive
100100
httpclient5 5.2.3 java-archive
101101
httpcore 4.4.16 java-archive
102-
httpcore5 5.2.4 java-archive
103-
httpcore5-h2 5.2.4 java-archive
102+
httpcore5 5.2.5 java-archive
103+
httpcore5-h2 5.2.5 java-archive
104104
imap 2.0.3 java-archive
105105
init-system-helpers 1.66ubuntu1 deb
106106
istack-commons-runtime 4.1.2 java-archive
@@ -132,7 +132,7 @@ jaxb-runtime 4.0.5 jav
132132
jaxen 2.0.0 java-archive
133133
jbcrypt 0.4 java-archive
134134
jboss-logging 3.5.3.Final java-archive
135-
jcl-over-slf4j 2.0.13 java-archive
135+
jcl-over-slf4j 2.0.16 java-archive
136136
jenetics 4.2.0 java-archive
137137
jgrapht-core 1.0.1 java-archive
138138
jgrapht-ext 1.0.1 java-archive
@@ -148,7 +148,7 @@ jsr305 3.0.2 jav
148148
jstl 1.2 java-archive
149149
jstun 0.7.4 java-archive
150150
jsvc 1.0.15-11build1 deb
151-
jul-to-slf4j 2.0.13 java-archive
151+
jul-to-slf4j 2.0.16 java-archive
152152
keyboxd 2.4.4-2ubuntu17 deb
153153
krb5-locales 1.20.1-6ubuntu2.2 deb
154154
lazysodium-java 5.1.4 java-archive
@@ -248,12 +248,13 @@ logging-mailhandler 2.0.3 jav
248248
login 1:4.13+dfsg1-4ubuntu3.2 deb
249249
logrotate 3.21.0-2build1 deb
250250
logsave 1.47.0-2.4~exp1ubuntu4.1 deb
251+
mapstruct 1.6.2 java-archive
251252
mawk 1.3.4.20240123-1build1 deb
252-
micrometer-commons 1.12.7 java-archive
253-
micrometer-observation 1.12.7 java-archive
253+
micrometer-commons 1.12.13 java-archive
254+
micrometer-observation 1.12.13 java-archive
254255
minimal-json 0.9.5 java-archive
255-
mongodb-driver-core 4.11.2 java-archive
256-
mongodb-driver-sync 4.11.2 java-archive
256+
mongodb-driver-core 4.11.5 java-archive
257+
mongodb-driver-sync 4.11.5 java-archive
257258
mount 2.39.3-9ubuntu6.1 deb
258259
ncurses-base 6.4+20240113-1ubuntu2 deb
259260
ncurses-bin 6.4+20240113-1ubuntu2 deb
@@ -276,48 +277,48 @@ publicsuffix 20231001.0357-0.1 deb
276277
pull-parser 2.1.10 java-archive
277278
radclient4 4.0 java-archive
278279
reactive-streams 1.0.4 java-archive
279-
reactor-core 3.6.7 java-archive
280+
reactor-core 3.6.12 java-archive
280281
readline-common 8.2-4build1 deb
281282
relaxngDatatype 20020414 java-archive
282283
resource-loader 2.0.2 java-archive
283284
sed 4.9-2build1 deb
284285
sensible-utils 0.0.22 deb
285-
slf4j-api 2.0.13 java-archive
286+
slf4j-api 2.0.16 java-archive
286287
smtp 2.0.3 java-archive
287288
snakeyaml 2.2 java-archive
288289
snappy-java 1.1.10.5 java-archive
289-
spring-aop 6.1.10 java-archive
290-
spring-beans 6.1.10 java-archive
291-
spring-boot 3.2.7 java-archive
292-
spring-boot-autoconfigure 3.2.7 java-archive
293-
spring-boot-starter 3.2.7 java-archive
294-
spring-boot-starter-data-mongodb 3.2.7 java-archive
295-
spring-boot-starter-json 3.2.7 java-archive
296-
spring-boot-starter-logging 3.2.7 java-archive
297-
spring-boot-starter-tomcat 3.2.7 java-archive
298-
spring-boot-starter-validation 3.2.7 java-archive
299-
spring-boot-starter-web 3.2.7 java-archive
300-
spring-boot-starter-websocket 3.2.7 java-archive
301-
spring-context 6.1.10 java-archive
302-
spring-core 6.1.10 java-archive
303-
spring-data-commons 3.2.7 java-archive
304-
spring-data-mongodb 4.2.7 java-archive
305-
spring-expression 6.1.10 java-archive
306-
spring-messaging 6.1.10 java-archive
307-
spring-tx 6.1.10 java-archive
308-
spring-web 6.1.10 java-archive
309-
spring-webmvc 6.1.10 java-archive
310-
spring-websocket 6.1.10 java-archive
290+
spring-aop 6.1.15 java-archive
291+
spring-beans 6.1.15 java-archive
292+
spring-boot 3.2.12 java-archive
293+
spring-boot-autoconfigure 3.2.12 java-archive
294+
spring-boot-starter 3.2.12 java-archive
295+
spring-boot-starter-data-mongodb 3.2.12 java-archive
296+
spring-boot-starter-json 3.2.12 java-archive
297+
spring-boot-starter-logging 3.2.12 java-archive
298+
spring-boot-starter-tomcat 3.2.12 java-archive
299+
spring-boot-starter-validation 3.2.12 java-archive
300+
spring-boot-starter-web 3.2.12 java-archive
301+
spring-boot-starter-websocket 3.2.12 java-archive
302+
spring-context 6.1.15 java-archive
303+
spring-core 6.1.15 java-archive
304+
spring-data-commons 3.2.12 java-archive
305+
spring-data-mongodb 4.2.12 java-archive
306+
spring-expression 6.1.15 java-archive
307+
spring-messaging 6.1.15 java-archive
308+
spring-tx 6.1.15 java-archive
309+
spring-web 6.1.15 java-archive
310+
spring-webmvc 6.1.15 java-archive
311+
spring-websocket 6.1.15 java-archive
311312
sshj 0.38.0 java-archive
312313
stax-api 1.0-2 java-archive
313314
systemd-standalone-sysusers 255.4-1ubuntu8.4 deb
314315
sysvinit-utils 3.08-6ubuntu3 deb
315316
tar 1.35+dfsg-3build1 deb
316-
tomcat-annotations-api 10.1.25 java-archive
317-
tomcat-embed-core 10.1.25 java-archive
318-
tomcat-embed-el 10.1.25 java-archive
319-
tomcat-embed-jasper 10.1.25 java-archive
320-
tomcat-embed-websocket 10.1.25 java-archive
317+
tomcat-annotations-api 10.1.33 java-archive
318+
tomcat-embed-core 10.1.33 java-archive
319+
tomcat-embed-el 10.1.33 java-archive
320+
tomcat-embed-jasper 10.1.33 java-archive
321+
tomcat-embed-websocket 10.1.33 java-archive
321322
txw2 4.0.5 java-archive
322323
tzdata 2024a-3ubuntu1.1 deb
323324
ubuntu-keyring 2023.11.28.1 deb

0 commit comments

Comments
 (0)