Skip to content

Commit d7e6b7a

Browse files
authored
Update deps (#237)
* update kafaka image build, update cglib so we can run on java 13 * verbose docker output
1 parent 0b514cf commit d7e6b7a

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Jenkinsfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ pipeline {
1717
when { not { buildingTag() } }
1818
steps {
1919
script {
20-
target = "install"
20+
target = "verify"
2121
}
2222
}
2323
}
2424
stage('Setup release') {
2525
when { buildingTag(); not { changeRequest() } }
2626
steps {
2727
script {
28-
target = "install deploy -P release --settings settings.xml"
28+
target = "deploy -P release --settings settings.xml"
2929
}
30+
sh 'gpg --batch --import arpnetworking.key'
3031
}
3132
}
3233
stage('Build') {
@@ -35,7 +36,7 @@ pipeline {
3536
usernamePassword(credentialsId: 'jenkins-ossrh', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS'),
3637
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
3738
withMaven {
38-
sh "./jdk-wrapper.sh ./mvnw clean $target -P rpm -U -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
39+
sh "./jdk-wrapper.sh ./mvnw $target -P rpm -U -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true"
3940
}
4041
}
4142
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<arpnetworking.commons.version>1.19.0</arpnetworking.commons.version>
7979
<aspectjrt.version>1.9.2</aspectjrt.version>
8080
<asynchttpclient.version>2.6.0</asynchttpclient.version>
81-
<cglib.version>3.2.10</cglib.version>
81+
<cglib.version>3.3.0</cglib.version>
8282
<client.protocol.version>0.12.0</client.protocol.version>
8383
<fastutil.version>8.2.2</fastutil.version>
8484
<guava.version>25.1-jre</guava.version>

src/main/docker/kafka/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@
1515
# Original: https://github.com/spotify/docker-kafka
1616

1717
# Kafka and Zookeeper
18-
FROM java:openjdk-8-jre
18+
FROM openjdk:8-jre-buster
1919

20-
ENV DEBIAN_FRONTEND noninteractive
2120
ENV SCALA_VERSION 2.13
22-
ENV KAFKA_VERSION 2.5.0
21+
ENV KAFKA_VERSION 2.7.0
2322
ENV KAFKA_HOME /opt/kafka_"$SCALA_VERSION"-"$KAFKA_VERSION"
2423

25-
RUN echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
26-
RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
27-
2824
# Install Kafka, Zookeeper and other needed things
2925
RUN apt-get -o Acquire::Check-Valid-Until=false update && \
30-
apt-get -o Acquire::Check-Valid-Until=false install -y zookeeper wget supervisor dnsutils && \
26+
DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false install -y zookeeper wget supervisor dnsutils && \
3127
rm -rf /var/lib/apt/lists/* && \
3228
apt-get clean && \
3329
wget -q "http://apache.mirrors.spacedump.net/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" -O "/tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" && \

0 commit comments

Comments
 (0)