This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
commit 9e086bb9c826e100cef3f42e485a320552b96e02
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri Apr 10 18:23:07 2020 +1000
move some dependencies to parent pom deptMngt
Signed-off-by: olivier lamy <ol...@apache.org>
---
build-tools/pom.xml | 27 ++++++++++++---------------
compat/pom.xml | 9 ++-------
impl/pom.xml | 13 ++-----------
jstlel/pom.xml | 9 ++-------
pom.xml | 27 +++++++++++++++++++++++++++
spec/pom.xml | 4 ----
standard-examples/pom.xml | 4 ----
7 files changed, 45 insertions(+), 48 deletions(-)
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 2b19750..ad37fa5 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -15,22 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- TODO:
- Generate the examples war
- Enable Cactus tests
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- </parent>
-
- <artifactId>taglibs-build-tools</artifactId>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard</artifactId>
<version>1.2.6-SNAPSHOT</version>
- <name>Apache Standard Taglib Build Tools</name>
+ </parent>
+
+ <artifactId>taglibs-build-tools</artifactId>
+ <version>1.2.6-SNAPSHOT</version>
+ <name>Apache Standard Taglib Build Tools</name>
- <description>Build tool settings common to all Standard Taglib
modules</description>
+ <description>Build tool settings common to all Standard Taglib
modules</description>
</project>
diff --git a/compat/pom.xml b/compat/pom.xml
index 6978718..bf359c8 100644
--- a/compat/pom.xml
+++ b/compat/pom.xml
@@ -51,25 +51,21 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -101,7 +97,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
<configuration>
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
</configuration>
@@ -114,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
+ <version>3.13.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
@@ -140,7 +135,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.5</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
diff --git a/impl/pom.xml b/impl/pom.xml
index de9fbe6..cf7510d 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -15,10 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- TODO:
- Generate the examples war
- Enable Cactus tests
--->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -48,25 +44,21 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -98,7 +90,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
<configuration>
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
</configuration>
@@ -111,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
+ <version>3.13.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
@@ -137,7 +128,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.5</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
diff --git a/jstlel/pom.xml b/jstlel/pom.xml
index 826594b..a8112af 100644
--- a/jstlel/pom.xml
+++ b/jstlel/pom.xml
@@ -50,25 +50,21 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -100,7 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
<configuration>
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
</configuration>
@@ -113,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
+ <version>3.13.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
@@ -139,7 +134,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.5</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
diff --git a/pom.xml b/pom.xml
index b156e86..e186e93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,28 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+
+ <!-- Tests -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
@@ -164,6 +186,11 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/spec/pom.xml b/spec/pom.xml
index 6e3e6b1..640fb71 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -37,19 +37,16 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
<configuration>
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
</configuration>
diff --git a/standard-examples/pom.xml b/standard-examples/pom.xml
index b20c460..074c015 100644
--- a/standard-examples/pom.xml
+++ b/standard-examples/pom.xml
@@ -49,25 +49,21 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
