Skip to content

Commit

Permalink
upgrade versions of build/runtime libraries/artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
jmal98 committed Jul 4, 2018
1 parent f135351 commit 58b30e9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -2,8 +2,8 @@ FROM alpine:3.7

RUN apk add --no-cache openjdk8-jre

ENV MAVEN_VERSION=3.5.2 \
MAVEN_SHA1=190dcebb8a080f983af4420cac4f3ece7a47dd64
ENV MAVEN_VERSION=3.5.4 \
MAVEN_SHA1=22cac91b3557586bb1eba326f2f7727543ff15e3

RUN addgroup -g 9232 -S exporter ; \
adduser -D -S -u 9232 -G exporter exporter
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Expand Up @@ -5,14 +5,14 @@
version: '3'
services:
prometheus:
image: quay.io/prometheus/prometheus:v2.2.1
image: quay.io/prometheus/prometheus:v2.3.1
ports:
- 9090:9090
volumes:
- "./src/test/resources/prometheus.yml:/etc/prometheus/prometheus.yml:Z"

grafana:
image: grafana/grafana:5.0.4
image: grafana/grafana:5.2.1
ports:
- 3000:3000
volumes:
Expand All @@ -24,9 +24,9 @@ services:
GF_USERS_ALLOW_SIGN_UP: "false"

sqs-exporter:
image: jmal98/sqs-exporter:0.0.4
image: jmal98/sqs-exporter:latest
build: .
ports:
- 9384:9384
volumes:
- "~/.aws:/home/exporter/.aws:Z"
- "~/.aws:/home/exporter/.aws:Z"
30 changes: 15 additions & 15 deletions pom.xml
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jmal.prometheus</groupId>
<artifactId>sqs-exporter</artifactId>
<version>0.0.4</version>
<version>0.0.5-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -37,27 +37,27 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.1</version>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.0-M2</version>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.0</version>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<version>3.7.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand All @@ -68,12 +68,12 @@

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.0</version>
</plugin>

<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.2</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -241,7 +241,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

Expand All @@ -254,39 +254,39 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.3.13.v20161014</version>
<version>9.4.11.v20180605</version>
</dependency>

<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_servlet</artifactId>
<version>0.0.21</version>
<version>0.4.0</version>
</dependency>

<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
<version>0.0.21</version>
<version>0.4.0</version>
</dependency>

<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_log4j2</artifactId>
<version>0.0.21</version>
<version>0.4.0</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.308</version>
<version>1.11.354</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.8.2</version>
<version>2.11.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down

0 comments on commit 58b30e9

Please sign in to comment.