Skip to content

Commit e61945b

Browse files
tomix26tomix26
authored
Merge pull request #135 from reneleonhardt/updates
chore(deps): Update dependencies
2 parents 6b85d71 + edb503d commit e61945b

File tree

5 files changed

+123
-30
lines changed

5 files changed

+123
-30
lines changed

‎.github/dependabot.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "maven"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
with:
1313
ref: master
1414
fetch-depth: 0

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
java: [8, 11, 13, 15, 17, 18, 19]
9+
java: [8, 11, 17, 21, 22] # LTS and newer versions
1010
steps:
1111
- name: Checkout project
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Set up JDK
1414
uses: actions/setup-java@v4
1515
with:

‎pom.xml

+108-25
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,27 @@
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3232

33-
<embedded-postgres-binaries.version>14.10.1</embedded-postgres-binaries.version>
33+
<embedded-postgres-binaries.version>14.12.0</embedded-postgres-binaries.version>
34+
<commons-codec.version>1.17.1</commons-codec.version>
35+
<commons-compress.version>1.26.2</commons-compress.version>
36+
<commons-io.version>2.16.1</commons-io.version>
37+
<commons-lang3.version>3.15.0</commons-lang3.version>
38+
<flyway.version>9.22.3</flyway.version>
39+
<junit5.version>5.10.3</junit5.version>
40+
<junit4.version>4.13.2</junit4.version>
41+
<liquibase.version>4.29.1</liquibase.version>
42+
<mockito.version>4.11.0</mockito.version>
43+
<pmd.version>7.4.0</pmd.version>
44+
<postgresql.version>42.7.3</postgresql.version>
45+
<slf4j.version>1.7.36</slf4j.version>
46+
<xz.version>1.10</xz.version>
47+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
48+
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
49+
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
50+
<maven-pmd-plugin.version>3.24.0</maven-pmd-plugin.version>
51+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
52+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
53+
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
3454
</properties>
3555

3656
<url>https://github.com/zonkyio/embedded-postgres</url>
@@ -71,6 +91,37 @@
7191
</snapshotRepository>
7292
</distributionManagement>
7393

94+
<dependencyManagement>
95+
<dependencies>
96+
<dependency>
97+
<groupId>commons-io</groupId>
98+
<artifactId>commons-io</artifactId>
99+
<version>${commons-io.version}</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.apache.commons</groupId>
103+
<artifactId>commons-lang3</artifactId>
104+
<version>${commons-lang3.version}</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.commons</groupId>
108+
<artifactId>commons-compress</artifactId>
109+
<version>${commons-compress.version}</version>
110+
</dependency>
111+
<dependency>
112+
<groupId>commons-codec</groupId>
113+
<artifactId>commons-codec</artifactId>
114+
<version>${commons-codec.version}</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.junit</groupId>
118+
<artifactId>junit-bom</artifactId>
119+
<version>${junit5.version}</version>
120+
<type>pom</type>
121+
<scope>import</scope>
122+
</dependency>
123+
</dependencies>
124+
</dependencyManagement>
74125
<dependencies>
75126
<dependency>
76127
<groupId>io.zonky.test.postgres</groupId>
@@ -100,100 +151,117 @@
100151
<dependency>
101152
<groupId>org.slf4j</groupId>
102153
<artifactId>slf4j-api</artifactId>
103-
<version>1.7.36</version>
154+
<version>${slf4j.version}</version>
104155
</dependency>
105156
<dependency>
106157
<groupId>org.apache.commons</groupId>
107158
<artifactId>commons-lang3</artifactId>
108-
<version>3.12.0</version>
109159
</dependency>
110160
<dependency>
111161
<groupId>org.apache.commons</groupId>
112162
<artifactId>commons-compress</artifactId>
113-
<version>1.26.0</version>
114163
</dependency>
115164
<dependency>
116165
<groupId>org.tukaani</groupId>
117166
<artifactId>xz</artifactId>
118-
<version>1.9</version>
167+
<version>${xz.version}</version>
119168
</dependency>
120169
<dependency>
121170
<groupId>commons-io</groupId>
122171
<artifactId>commons-io</artifactId>
123-
<version>2.11.0</version>
124172
</dependency>
125173
<dependency>
126174
<groupId>commons-codec</groupId>
127175
<artifactId>commons-codec</artifactId>
128-
<version>1.15</version>
129176
</dependency>
130177
<dependency>
131178
<groupId>org.flywaydb</groupId>
132179
<artifactId>flyway-core</artifactId>
133-
<version>7.15.0</version>
180+
<version>${flyway.version}</version>
134181
<optional>true</optional>
135182
</dependency>
136183
<dependency>
137184
<groupId>org.liquibase</groupId>
138185
<artifactId>liquibase-core</artifactId>
139-
<version>4.10.0</version>
186+
<version>${liquibase.version}</version>
140187
<optional>true</optional>
141188
</dependency>
142189
<dependency>
143190
<groupId>org.postgresql</groupId>
144191
<artifactId>postgresql</artifactId>
145-
<version>42.7.3</version>
192+
<version>${postgresql.version}</version>
146193
</dependency>
147194
<dependency>
148195
<groupId>junit</groupId>
149196
<artifactId>junit</artifactId>
150-
<version>4.13.2</version>
197+
<version>${junit4.version}</version>
151198
<scope>provided</scope>
152199
<optional>true</optional>
153200
</dependency>
154201
<dependency>
155202
<groupId>org.junit.jupiter</groupId>
156203
<artifactId>junit-jupiter-api</artifactId>
157-
<version>5.8.2</version>
158204
<scope>provided</scope>
159205
<optional>true</optional>
160206
</dependency>
161207
<dependency>
162208
<groupId>org.junit.vintage</groupId>
163209
<artifactId>junit-vintage-engine</artifactId>
164-
<version>5.8.2</version>
165210
<scope>test</scope>
166211
</dependency>
167212
<dependency>
168213
<groupId>org.junit.jupiter</groupId>
169214
<artifactId>junit-jupiter-engine</artifactId>
170-
<version>5.8.2</version>
171215
<scope>test</scope>
172216
</dependency>
173217

174218
<dependency>
175219
<groupId>org.slf4j</groupId>
176220
<artifactId>slf4j-simple</artifactId>
177-
<version>1.7.36</version>
221+
<version>${slf4j.version}</version>
178222
<scope>test</scope>
179223
</dependency>
180224
<dependency>
181225
<groupId>org.mockito</groupId>
182226
<artifactId>mockito-core</artifactId>
183-
<version>3.12.4</version>
227+
<version>${mockito.version}</version><!-- last Java 8 version -->
184228
<scope>test</scope>
185229
</dependency>
186230
</dependencies>
187231

188232
<build>
189233
<plugins>
234+
<plugin>
235+
<groupId>org.apache.maven.plugins</groupId>
236+
<artifactId>maven-enforcer-plugin</artifactId>
237+
<version>${maven-enforcer-plugin.version}</version>
238+
<executions>
239+
<execution>
240+
<id>enforce-versions</id>
241+
<phase>validate</phase>
242+
<goals>
243+
<goal>enforce</goal>
244+
</goals>
245+
<configuration>
246+
<rules>
247+
<dependencyConvergence/>
248+
</rules>
249+
</configuration>
250+
</execution>
251+
</executions>
252+
</plugin>
190253
<plugin>
191254
<artifactId>maven-surefire-plugin</artifactId>
192-
<version>2.22.2</version>
255+
<version>${maven-surefire-plugin.version}</version>
256+
<configuration>
257+
<environmentVariables>
258+
<LC_ALL>${env.LC_ALL}</LC_ALL><!-- needed by initdb -->
259+
</environmentVariables>
260+
</configuration>
193261
</plugin>
194262
<plugin>
195263
<artifactId>maven-pmd-plugin</artifactId>
196-
<version>3.13.0</version>
264+
<version>${maven-pmd-plugin.version}</version>
197265
<executions>
198266
<execution>
199267
<phase>verify</phase>
@@ -206,29 +274,29 @@
206274
<dependency>
207275
<groupId>net.sourceforge.pmd</groupId>
208276
<artifactId>pmd-core</artifactId>
209-
<version>6.55.0</version>
277+
<version>${pmd.version}</version>
210278
<scope>compile</scope>
211279
</dependency>
212280
<dependency>
213281
<groupId>net.sourceforge.pmd</groupId>
214282
<artifactId>pmd-java</artifactId>
215-
<version>6.55.0</version>
283+
<version>${pmd.version}</version>
216284
<scope>compile</scope>
217285
</dependency>
218286
</dependencies>
219287
<configuration>
220288
<skip>false</skip>
221289
<failOnViolation>true</failOnViolation>
222290
<targetJdk>1.8</targetJdk>
223-
<sourceEncoding>UTF-8</sourceEncoding>
291+
<inputEncoding>UTF-8</inputEncoding>
224292
<minimumTokens>100</minimumTokens>
225293
<failurePriority>4</failurePriority>
226294
</configuration>
227295
</plugin>
228296
<plugin>
229297
<groupId>org.apache.maven.plugins</groupId>
230298
<artifactId>maven-source-plugin</artifactId>
231-
<version>3.2.1</version>
299+
<version>${maven-source-plugin.version}</version>
232300
<executions>
233301
<execution>
234302
<id>attach-sources</id>
@@ -241,7 +309,7 @@
241309
<plugin>
242310
<groupId>org.apache.maven.plugins</groupId>
243311
<artifactId>maven-javadoc-plugin</artifactId>
244-
<version>3.2.0</version>
312+
<version>${maven-javadoc-plugin.version}</version>
245313
<executions>
246314
<execution>
247315
<id>attach-javadocs</id>
@@ -257,7 +325,7 @@
257325
<plugin>
258326
<groupId>org.apache.maven.plugins</groupId>
259327
<artifactId>maven-release-plugin</artifactId>
260-
<version>2.5.3</version>
328+
<version>${maven-release-plugin.version}</version>
261329
<configuration>
262330
<useReleaseProfile>false</useReleaseProfile>
263331
<releaseProfiles>release</releaseProfiles>
@@ -268,14 +336,29 @@
268336
</build>
269337

270338
<profiles>
339+
<!-- prevent "initdb: error: invalid locale settings; check LANG and LC_* environment variables" -->
340+
<profile>
341+
<id>default-lc-all</id>
342+
<activation>
343+
<property>
344+
<name>!env.LC_ALL</name><!-- if LC_ALL is missing -->
345+
</property>
346+
<os>
347+
<family>Unix</family>
348+
</os>
349+
</activation>
350+
<properties>
351+
<env.LC_ALL>en_US.UTF-8</env.LC_ALL><!-- set default -->
352+
</properties>
353+
</profile>
271354
<profile>
272355
<id>release</id>
273356
<build>
274357
<plugins>
275358
<plugin>
276359
<groupId>org.apache.maven.plugins</groupId>
277360
<artifactId>maven-gpg-plugin</artifactId>
278-
<version>1.6</version>
361+
<version>${maven-gpg-plugin.version}</version>
279362
<executions>
280363
<execution>
281364
<id>sign-artifacts</id>

‎src/main/resources/sh/detect_linux_distribution.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ detect_linux_distribution() {
1212
else
1313
DISTRO=''
1414
fi
15-
echo $DISTRO
15+
echo "$DISTRO"
1616
}
1717

18-
echo $(detect_linux_distribution)
18+
detect_linux_distribution

0 commit comments

Comments
 (0)