Skip to content

Commit 407c3a3

Browse files
Bump org.apache.logging:logging-parent from 12.0.0 to 12.1.0 (#306)
* Bump org.apache.logging:logging-parent from 12.0.0 to 12.1.0 Bumps [org.apache.logging:logging-parent](https://github.com/apache/logging-parent) from 12.0.0 to 12.1.0. - [Release notes](https://github.com/apache/logging-parent/releases) - [Commits](apache/logging-parent@rel/12.0.0...rel/12.1.0) --- updated-dependencies: - dependency-name: org.apache.logging:logging-parent dependency-version: 12.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Add ASF Snapshots repo by default * Remove Error Prone workaround --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Piotr P. Karwasz <[email protected]>
1 parent f33da62 commit 407c3a3

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

log4j-samples-flume-embedded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
m <?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
~ Licensed to the Apache Software Foundation (ASF) under one or more
44
~ contributor license agreements. See the NOTICE file distributed with

pom.xml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.logging</groupId>
2424
<artifactId>logging-parent</artifactId>
25-
<version>12.0.0</version>
25+
<version>12.1.0</version>
2626
<relativePath />
2727
</parent>
2828

@@ -276,6 +276,24 @@
276276
</dependencies>
277277
</dependencyManagement>
278278

279+
<repositories>
280+
<!--
281+
~ The repository that contains the requested Log4j version.
282+
~
283+
~ By default, we use Apache Snapshots.
284+
~ An alternative repository is defined in the `staging-repo` profile.
285+
-->
286+
<!-- The repository that contains the requested Log4j version -->
287+
<repository>
288+
<releases>
289+
<enabled>false</enabled>
290+
</releases>
291+
<id>log4j-repo</id>
292+
<name>Apache Snapshot Repository</name>
293+
<url>https://repository.apache.org/snapshots</url>
294+
</repository>
295+
</repositories>
296+
279297
<build>
280298

281299
<pluginManagement>
@@ -311,8 +329,6 @@
311329
</path>
312330
</annotationProcessorPaths>
313331
<compilerArgs combine.children="append">
314-
<!-- Workaround Error Prone breaking change -->
315-
<arg>--should-stop=ifError=FLOW</arg>
316332
<!-- Provide arguments for the GraalVM processor -->
317333
<arg>-Alog4j.graalvm.groupId=${project.groupId}</arg>
318334
<arg>-Alog4j.graalvm.artifactId=${project.artifactId}</arg>
@@ -334,7 +350,6 @@
334350
<activation>
335351
<property>
336352
<name>log4j.repository.url</name>
337-
<value>!</value>
338353
</property>
339354
</activation>
340355

@@ -353,7 +368,7 @@
353368
<snapshots>
354369
<enabled>false</enabled>
355370
</snapshots>
356-
<id>log4j-staging</id>
371+
<id>log4j-repo</id>
357372
<name>Log4j Staging Repository</name>
358373
<url>${log4j.repository.url}</url>
359374
</repository>

0 commit comments

Comments
 (0)