You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2020/04/10 09:56:48 UTC
[tomcat-taglibs-standard] branch master updated (08ae31d -> 46694f4)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git.
from 08ae31d fix scm informations
new 57a9c61 cleaning poms
new 9e086bb move some dependencies to parent pom deptMngt
new 86a6e21 fix checkstyle configuration but that is too much too fix :)
new 46694f4 bump version as moving to jakarta namespace is a big change
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-tools/pom.xml | 34 +--
.../src/main/resources/taglibs/checkstyle.xml | 6 +-
compat/pom.xml | 270 +++++++++------------
impl/pom.xml | 267 +++++++++-----------
.../org/apache/taglibs/standard/util/XmlUtil.java | 1 +
jstlel/pom.xml | 270 +++++++++------------
.../standard/lang/jstl/Resources.properties | 2 +-
pom.xml | 212 ++++++++++++----
spec/pom.xml | 174 ++++++-------
standard-examples/pom.xml | 169 ++++++-------
10 files changed, 668 insertions(+), 737 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 02/04: move some dependencies to parent
pom deptMngt
Posted by ol...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 03/04: fix checkstyle configuration but
that is too much too fix :)
Posted by ol...@apache.org.
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 86a6e21c12c5db792c6d5b00bba78b73b75cc723
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri Apr 10 18:31:37 2020 +1000
fix checkstyle configuration but that is too much too fix :)
Signed-off-by: olivier lamy <ol...@apache.org>
---
build-tools/src/main/resources/taglibs/checkstyle.xml | 6 ++++--
.../main/java/org/apache/taglibs/standard/util/XmlUtil.java | 1 +
.../apache/taglibs/standard/lang/jstl/Resources.properties | 2 +-
pom.xml | 13 +++++++++++++
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/build-tools/src/main/resources/taglibs/checkstyle.xml b/build-tools/src/main/resources/taglibs/checkstyle.xml
index 2bebc89..52c5727 100644
--- a/build-tools/src/main/resources/taglibs/checkstyle.xml
+++ b/build-tools/src/main/resources/taglibs/checkstyle.xml
@@ -24,7 +24,9 @@
<!-- http://checkstyle.sourceforge.net/config_coding.html -->
<!-- Whitespace -->
- <module name="FileTabCharacter"/>
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java,xml"/>
+ </module>
<module name="TreeWalker">
<!-- Coding -->
@@ -61,4 +63,4 @@
<module name="EmptyForInitializerPad"/>
<module name="EmptyForIteratorPad"/>
</module>
-</module>
\ No newline at end of file
+</module>
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
index 130f333..ee5ce3e 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
@@ -25,6 +25,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.concurrent.Callable;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.PageContext;
import javax.xml.XMLConstants;
diff --git a/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties b/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties
index 194e84b..59d9d26 100644
--- a/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties
+++ b/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties
@@ -14,7 +14,7 @@
# limitations under the License.
EXCEPTION_GETTING_BEANINFO=\
- An Exception occurred getting the BeanInfo for class {0}
+ An Exception occurred getting the BeanInfo for class {0}
NULL_EXPRESSION_STRING=\
A null expression string may not be passed to the \
diff --git a/pom.xml b/pom.xml
index e186e93..fcf2f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,19 @@
</plugins>
</pluginManagement>
<plugins>
+ <!-- too much to fix so not activated per default -->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <phase>validate</phase>-->
+<!-- <goals>-->
+<!-- <goal>check</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 01/04: cleaning poms
Posted by ol...@apache.org.
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 57a9c61010ac3f7d5ca5e51664970ad625e69baa
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri Apr 10 15:52:27 2020 +1000
cleaning poms
Signed-off-by: olivier lamy <ol...@apache.org>
---
build-tools/pom.xml | 7 --
compat/pom.xml | 273 ++++++++++++++++++++--------------------------
impl/pom.xml | 266 ++++++++++++++++++++------------------------
jstlel/pom.xml | 273 ++++++++++++++++++++--------------------------
pom.xml | 170 ++++++++++++++++++++---------
spec/pom.xml | 176 +++++++++++++-----------------
standard-examples/pom.xml | 173 +++++++++++++----------------
7 files changed, 628 insertions(+), 710 deletions(-)
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index c7b8647..2b19750 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -33,11 +33,4 @@
<description>Build tool settings common to all Standard Taglib modules</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools</url>
- </scm>
-
</project>
diff --git a/compat/pom.xml b/compat/pom.xml
index 513d930..6978718 100644
--- a/compat/pom.xml
+++ b/compat/pom.xml
@@ -19,167 +19,136 @@
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-standard-compat</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>
- <packaging>bundle</packaging>
-
- <name>Apache Standard Taglib 1.0 Compatibility</name>
-
- <inceptionYear>2001</inceptionYear>
- <description>
- Supports JSTL 1.0 tags using the Servlet container's EL implementation.
- </description>
+ </parent>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat</url>
- </scm>
+ <artifactId>taglibs-standard-compat</artifactId>
+ <version>1.2.6-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- </developers>
+ <name>Apache Standard Taglib 1.0 Compatibility</name>
- <contributors>
- <contributor><name>Robert Goff</name></contributor>
- </contributors>
+ <description>
+ Supports JSTL 1.0 tags using the Servlet container's EL implementation.
+ </description>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-spec</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-impl</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ </dependency>
- <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>
+ <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>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Export-Package>*;version="1.2"</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <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>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <targetJdk>${maven.compiler.target}</targetJdk>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>pmd</report>
- <report>cpd</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/impl/pom.xml b/impl/pom.xml
index ee5c6ae..de9fbe6 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -19,163 +19,133 @@
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-standard-impl</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>
- <packaging>bundle</packaging>
-
- <name>Apache Standard Taglib Implementation</name>
-
- <inceptionYear>2001</inceptionYear>
- <description>
- An implementation of the JSP Standard Tag Library (JSTL).
- </description>
+ </parent>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl</url>
- </scm>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>1.2.6-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- </developers>
+ <name>Apache Standard Taglib Implementation</name>
- <contributors>
- <contributor><name>Robert Goff</name></contributor>
- </contributors>
+ <description>
+ An implementation of the JSP Standard Tag Library (JSTL).
+ </description>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-spec</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <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>
+ <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>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Export-Package>*;version="1.2"</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <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>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <targetJdk>${maven.compiler.target}</targetJdk>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>pmd</report>
- <report>cpd</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/jstlel/pom.xml b/jstlel/pom.xml
index 33491fb..826594b 100644
--- a/jstlel/pom.xml
+++ b/jstlel/pom.xml
@@ -19,168 +19,135 @@
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-standard-jstlel</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>
- <packaging>bundle</packaging>
-
- <name>Apache Standard Taglib 1.0 EL Support</name>
-
- <inceptionYear>2001</inceptionYear>
- <description>
- Support JSTL 1.0 tags using the original EL implementation.
- </description>
+ </parent>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/jstlel</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/jstlel
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel</url>
- </scm>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <packaging>bundle</packaging>
- <developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- </developers>
+ <name>Apache Standard Taglib 1.0 EL Support</name>
- <contributors>
- <contributor><name>Robert Goff</name></contributor>
- <contributor><name>Dan Armstrong</name></contributor>
- </contributors>
+ <description>
+ Support JSTL 1.0 tags using the original EL implementation.
+ </description>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-spec</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-impl</artifactId>
- <version>1.2.6-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ </dependency>
- <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>
+ <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>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Export-Package>*;version="1.2"</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <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>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <targetJdk>${maven.compiler.target}</targetJdk>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>pmd</report>
- <report>cpd</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <!-- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/pom.xml b/pom.xml
index d055010..b156e86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
<!-- TODO:
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">
+<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>
@@ -51,25 +52,60 @@
</ciManagement>
<developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- <developer><name>Jeremy Boynes</name></developer>
- <developer><name>Konstantin Kolinko</name></developer>
+ <developer>
+ <name>Pierre Delisle</name>
+ </developer>
+ <developer>
+ <name>Shawn Bayern</name>
+ </developer>
+ <developer>
+ <name>Nathan Abramson</name>
+ </developer>
+ <developer>
+ <name>Hans Bergsten</name>
+ </developer>
+ <developer>
+ <name>Scott Hasse</name>
+ </developer>
+ <developer>
+ <name>Justyna Horwat</name>
+ </developer>
+ <developer>
+ <name>Mark Kolb</name>
+ </developer>
+ <developer>
+ <name>Jan Luehe</name>
+ </developer>
+ <developer>
+ <name>Glenn Nielsen</name>
+ </developer>
+ <developer>
+ <name>Dmitri Plotnikov</name>
+ </developer>
+ <developer>
+ <name>Felipe Leme</name>
+ </developer>
+ <developer>
+ <name>Henri Yandell</name>
+ </developer>
+ <developer>
+ <name>Bjorn Townsend</name>
+ </developer>
+ <developer>
+ <name>Jeremy Boynes</name>
+ </developer>
+ <developer>
+ <name>Konstantin Kolinko</name>
+ </developer>
</developers>
<contributors>
- <contributor><name>Robert Goff</name></contributor>
+ <contributor>
+ <name>Robert Goff</name>
+ </contributor>
+ <contributor>
+ <name>Dan Armstrong</name>
+ </contributor>
</contributors>
<modules>
@@ -79,42 +115,72 @@
<module>compat</module>
<module>jstlel</module>
<module>standard-examples</module>
-<!--
- <module>standard-test</module>
--->
+ <!--
+ <module>standard-test</module>
+ -->
</modules>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt</exclude>
- <exclude>CHANGES.txt</exclude>
- <exclude>DEPENDENCIES</exclude>
- <exclude>README_bin.txt</exclude>
- <exclude>README_src.txt</exclude>
- <exclude>RELEASING</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt</exclude>
+ <exclude>CHANGES.txt</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>README_bin.txt</exclude>
+ <exclude>README_src.txt</exclude>
+ <exclude>RELEASING.txt</exclude>
+ <exclude>Jenkinsfile</exclude>
+ <exclude>*/*.iml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<repositories>
<repository>
diff --git a/spec/pom.xml b/spec/pom.xml
index 443a249..6e3e6b1 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -15,115 +15,85 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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-standard-spec</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>
- <packaging>bundle</packaging>
-
- <name>Apache Standard Taglib Specification API</name>
-
- <inceptionYear>2001</inceptionYear>
- <description>
- An implementation of the JSP Standard Tag Library (JSTL) Specification API.
- </description>
+ </parent>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/spec
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec</url>
- </scm>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <packaging>bundle</packaging>
- <developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- </developers>
+ <name>Apache Standard Taglib Specification API</name>
- <contributors>
- <contributor><name>Robert Goff</name></contributor>
- </contributors>
+ <description>
+ An implementation of the JSP Standard Tag Library (JSTL) Specification API.
+ </description>
- <dependencies>
- <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>
+ <dependencies>
+ <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>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
- <Specification-Title>JSR-052 JavaServer Pages Standard Tag Library Specification
- </Specification-Title>
- <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
- <Specification-Version>1.2</Specification-Version>
- <Export-Package>javax.servlet.jsp.jstl*;version=1.2</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <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>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
+ <Specification-Title>JSR-052 JavaServer Pages Standard Tag Library Specification
+ </Specification-Title>
+ <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+ <Specification-Version>1.2</Specification-Version>
+ <Export-Package>javax.servlet.jsp.jstl*;version=1.2</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ </plugins>
+ </reporting>
</project>
diff --git a/standard-examples/pom.xml b/standard-examples/pom.xml
index 908db86..b20c460 100644
--- a/standard-examples/pom.xml
+++ b/standard-examples/pom.xml
@@ -15,108 +15,91 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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>
+<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-standard-examples</artifactId>
- <packaging>war</packaging>
+ <artifactId>taglibs-standard-examples</artifactId>
+ <packaging>war</packaging>
- <name>Apache Standard Taglib Example WAR</name>
+ <name>Apache Standard Taglib Example WAR</name>
- <inceptionYear>2001</inceptionYear>
- <description>
- An example WAR for the JSP Standard Tag Library (JSTL).
- </description>
+ <description>
+ An example WAR for the JSP Standard Tag Library (JSTL).
+ </description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.0-RC1/examples</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.0-RC1/examples
- </developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.0-RC1/examples</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <developers>
- <developer><name>Pierre Delisle</name></developer>
- <developer><name>Shawn Bayern</name></developer>
- <developer><name>Nathan Abramson</name></developer>
- <developer><name>Hans Bergsten</name></developer>
- <developer><name>Scott Hasse</name></developer>
- <developer><name>Justyna Horwat</name></developer>
- <developer><name>Mark Kolb</name></developer>
- <developer><name>Jan Luehe</name></developer>
- <developer><name>Glenn Nielsen</name></developer>
- <developer><name>Dmitri Plotnikov</name></developer>
- <developer><name>Felipe Leme</name></developer>
- <developer><name>Henri Yandell</name></developer>
- <developer><name>Bjorn Townsend</name></developer>
- </developers>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <contributors>
- <contributor><name>Robert Goff</name></contributor>
- </contributors>
+ <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>
+ <artifactId>derby</artifactId>
+ <version>10.4.2.0</version>
+ </dependency>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-spec</artifactId>
- <version>${project.version}</version>
- </dependency>
+ </dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <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>
- <artifactId>derby</artifactId>
- <version>10.4.2.0</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- we do not deploy examples -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- we do not deploy examples -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration combine.children="append">
+ <excludes>
+ <!-- we can ignore those files as they are not part of the release -->
+ <exclude>src/main/webapp/**/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 04/04: bump version as moving to jakarta
namespace is a big change
Posted by ol...@apache.org.
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 46694f4d5cea6691ea7f7ce3b7a358f5a0627f65
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri Apr 10 18:40:10 2020 +1000
bump version as moving to jakarta namespace is a big change
Signed-off-by: olivier lamy <ol...@apache.org>
---
build-tools/pom.xml | 4 ++--
compat/pom.xml | 4 ++--
impl/pom.xml | 4 ++--
jstlel/pom.xml | 2 +-
pom.xml | 2 +-
spec/pom.xml | 2 +-
standard-examples/pom.xml | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index ad37fa5..95d94f9 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-build-tools</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Standard Taglib Build Tools</name>
<description>Build tool settings common to all Standard Taglib modules</description>
diff --git a/compat/pom.xml b/compat/pom.xml
index bf359c8..f2be169 100644
--- a/compat/pom.xml
+++ b/compat/pom.xml
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-standard-compat</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Standard Taglib 1.0 Compatibility</name>
diff --git a/impl/pom.xml b/impl/pom.xml
index cf7510d..2043ea9 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-standard-impl</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Standard Taglib Implementation</name>
diff --git a/jstlel/pom.xml b/jstlel/pom.xml
index a8112af..ceeabb5 100644
--- a/jstlel/pom.xml
+++ b/jstlel/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-standard-jstlel</artifactId>
diff --git a/pom.xml b/pom.xml
index fcf2f08..e499a28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Standard Taglib</name>
<inceptionYear>2001</inceptionYear>
diff --git a/spec/pom.xml b/spec/pom.xml
index 640fb71..edd1245 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-standard-spec</artifactId>
diff --git a/standard-examples/pom.xml b/standard-examples/pom.xml
index 074c015..5b38bfb 100644
--- a/standard-examples/pom.xml
+++ b/standard-examples/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard</artifactId>
- <version>1.2.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>taglibs-standard-examples</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org