Skip to content

Commit 1bedae2

Browse files
Bump org.apache.logging:logging-parent from 12.0.0 to 12.1.0 in /log4j-samples-graalvm (#308)
* Bump org.apache.logging:logging-parent in /log4j-samples-graalvm 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 Apache Snapshots repository * 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 407c3a3 commit 1bedae2

File tree

1 file changed

+20
-37
lines changed

1 file changed

+20
-37
lines changed

log4j-samples-graalvm/pom.xml

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.logging</groupId>
2222
<artifactId>logging-parent</artifactId>
23-
<version>12.0.0</version>
23+
<version>12.1.0</version>
2424
<relativePath />
2525
</parent>
2626

@@ -150,43 +150,27 @@
150150

151151
</dependencies>
152152

153+
<repositories>
154+
<!--
155+
~ The repository that contains the requested Log4j version.
156+
~
157+
~ By default, we use Apache Snapshots.
158+
~ An alternative repository is defined in the `staging-repo` profile.
159+
-->
160+
<!-- The repository that contains the requested Log4j version -->
161+
<repository>
162+
<releases>
163+
<enabled>false</enabled>
164+
</releases>
165+
<id>log4j-repo</id>
166+
<name>Apache Snapshot Repository</name>
167+
<url>https://repository.apache.org/snapshots</url>
168+
</repository>
169+
</repositories>
170+
153171
<build>
154172
<plugins>
155173

156-
<plugin>
157-
<groupId>org.apache.maven.plugins</groupId>
158-
<artifactId>maven-enforcer-plugin</artifactId>
159-
<executions>
160-
<execution>
161-
<id>remove-obsolete-configuration</id>
162-
<goals>
163-
<goal>enforce</goal>
164-
</goals>
165-
<configuration>
166-
<rules>
167-
<requireProperty>
168-
<property>project.parent.version</property>
169-
<regex>12.0.0</regex>
170-
<message>Remove obsolete configurations, see `TODO` comments.</message>
171-
</requireProperty>
172-
</rules>
173-
</configuration>
174-
</execution>
175-
</executions>
176-
</plugin>
177-
178-
<!-- TODO: Remove after `logging-parent` version `12.1.0` is out -->
179-
<plugin>
180-
<groupId>org.apache.maven.plugins</groupId>
181-
<artifactId>maven-compiler-plugin</artifactId>
182-
<configuration>
183-
<compilerArgs combine.children="append">
184-
<!-- Workaround Error Prone breaking change -->
185-
<arg>--should-stop=ifError=FLOW</arg>
186-
</compilerArgs>
187-
</configuration>
188-
</plugin>
189-
190174
<!--
191175
~ Step 0: we add per-profile resource.
192176
-->
@@ -674,7 +658,6 @@
674658
<activation>
675659
<property>
676660
<name>log4j.repository.url</name>
677-
<value>!</value>
678661
</property>
679662
</activation>
680663

@@ -693,7 +676,7 @@
693676
<snapshots>
694677
<enabled>false</enabled>
695678
</snapshots>
696-
<id>log4j-staging</id>
679+
<id>log4j-repo</id>
697680
<name>Log4j Staging Repository</name>
698681
<url>${log4j.repository.url}</url>
699682
</repository>

0 commit comments

Comments
 (0)