(bval) branch master updated: set tomcat version via property to avoid two dependabot PRs for the same release

[jungm]

This is an automated email from the ASF dual-hosted git repository.

jungm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git


The following commit(s) were added to refs/heads/master by this push:
     new a5c1e2e  set tomcat version via property to avoid two dependabot PRs 
for the same release
a5c1e2e is described below

commit a5c1e2e6c8f270b1d6a4060c7042a1950b2b4cc7
Author: Markus Jung <ju...@apache.org>
AuthorDate: Wed Sep 18 16:19:34 2024 +0200

    set tomcat version via property to avoid two dependabot PRs for the same 
release
---
 pom.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5466e0..87fa677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,10 @@
         
<site.url>scm:svn:https://svn.apache.org/repos/infra/websites/production/bval/content/mvnsite</site.url>
         <site.server>bval.site</site.server>
         <built.by>${user.name}</built.by>
-        <plugin.javadoc.version>3.10.0</plugin.javadoc.version>
+
+        <version.plugin.javadoc>3.10.0</version.plugin.javadoc>
+        <!-- TODO upgrade to 11.0.x once stable version is released -->
+        <version.tomcat>10.1.30</version.tomcat> <!-- used for EL API + EL 
impl in tests -->
     </properties>
 
     <inceptionYear>2010</inceptionYear>
@@ -271,7 +274,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${plugin.javadoc.version}</version>
+                <version>${version.plugin.javadoc}</version>
                 <configuration>
                     <doclint>none</doclint>
                     <show>package</show>
@@ -293,7 +296,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${plugin.javadoc.version}</version>
+                <version>${version.plugin.javadoc}</version>
                 <inherited>false</inherited>
                 <configuration>
                     <doclint>none</doclint>
@@ -359,17 +362,16 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- TODO upgrade to 11.0.x once released -->
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-el-api</artifactId>
-                <version>10.1.30</version>
+                <version>${version.tomcat}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-jasper-el</artifactId>
-                <version>10.1.30</version>
+                <version>${version.tomcat}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -420,7 +422,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${plugin.javadoc.version}</version>
+                    <version>${version.plugin.javadoc}</version>
                     <configuration>
                         <encoding>${project.build.sourceEncoding}</encoding>
                         
<additionalparam>${javadoc.additionalparam}</additionalparam>