You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/11/26 09:07:46 UTC
[wicket] branch master updated: Update Maven plugins if there are non-Milestone releases
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 232ef21 Update Maven plugins if there are non-Milestone releases
232ef21 is described below
commit 232ef2170de97d5b7cc23728aaef664f90c78e38
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Nov 26 11:06:28 2021 +0200
Update Maven plugins if there are non-Milestone releases
Add dependencyManagement where needed to fix maven-enforcer-plugin errors.
---
archetypes/quickstart/pom.xml | 4 +--
pom.xml | 8 ++---
testing/wicket-common-tests/pom.xml | 35 ++++++++++++++++++++++
wicket-bean-validation/pom.xml | 11 +++++++
wicket-core/pom.xml | 1 +
wicket-examples/pom.xml | 3 ++
.../wicket-native-websocket-javax/pom.xml | 11 +++++++
wicket-user-guide/pom.xml | 2 +-
8 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 2e324d1..d06e718 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -60,14 +60,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
- <nonFilteredFileExtensions>
- <nonFilteredFileExtension>p12</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 85400e9..42b2149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<guice.version>5.0.1</guice.version>
<el-impl.version>2.2.1-b05</el-impl.version>
- <forbiddenapis.version>3.1</forbiddenapis.version>
+ <forbiddenapis.version>3.2</forbiddenapis.version>
<jacoco.version>0.8.7</jacoco.version>
<jackson.version>2.10.5</jackson.version>
<jakarta.annotation-api.version>2.0.0-RC1</jakarta.annotation-api.version>
@@ -184,12 +184,12 @@
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
- <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
- <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+ <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
- <maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
+ <maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index b4ed490..7eec7fad3 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -32,6 +32,41 @@
<japicmp.skip>true</japicmp.skip>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.4.2.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>2.2.1.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <version>2.2.1.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 722b493..8104bff 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -27,6 +27,17 @@
<packaging>bundle</packaging>
<name>Wicket Bean Validation</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.4.2.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>jakarta.el</groupId>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index d164eca..70e7220 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -87,6 +87,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.1</version>
<configuration>
<excludes>
<exclude>**/jquery*.js</exclude>
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index fd09671..c8ac1fd 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -246,6 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -253,6 +254,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
<configuration>
<!-- include the manifest entries so that we can emit the version of the examples. -->
<archive>
@@ -278,6 +280,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index fe60a25..6d15278 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -28,6 +28,17 @@
<name>Wicket Native WebSocket Javax</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>jakarta.websocket</groupId>
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index a429eb9..f90578f 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
+ <version>${maven-enforcer-plugin.version}</version>
<inherited>false</inherited>
<configuration>
<skip>true</skip>