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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org