[maven-release-plugin] copy for tag STRUTS_2_1_6

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6@731669 13f79535-47bb-0310-9956-ffa450edef68
Remove comment
2026-08-09 16:46:55 +00:00 · 2009-01-05 19:57:18 +00:00 · 2009-01-03 23:58:12 +00:00 · 2009-01-03 23:49:51 +00:00 · 2009-01-03 23:15:34 +00:00 · 2009-01-03 19:36:36 +00:00
35 changed files with 158 additions and 160 deletions
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-blank</artifactId>
@@ -34,9 +34,9 @@
    <name>Blank Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/blank</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/blank</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/blank</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
      <groupId>org.apache.struts</groupId>
      <artifactId>struts2-apps</artifactId>
-      <version>2.1.5-SNAPSHOT</version>
+      <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-mailreader</artifactId>
@@ -34,9 +34,9 @@
    <name>Starter Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-apps</artifactId>
@@ -41,9 +41,9 @@
    </modules>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps</url>
    </scm>

     <distributionManagement>
@@ -26,7 +26,7 @@
    <parent>
      <groupId>org.apache.struts</groupId>
      <artifactId>struts2-apps</artifactId>
-      <version>2.1.5-SNAPSHOT</version>
+      <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-portlet</artifactId>
@@ -34,9 +34,9 @@
    <name>Portlet Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</url>
    </scm>

 	<profiles>
@@ -26,13 +26,13 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>

 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.5-SNAPSHOT</version>
+	<version>2.1.6</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>

@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-showcase</artifactId>
@@ -34,9 +34,9 @@
    <name>Showcase Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</url>
    </scm>


@@ -11,13 +11,13 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>

    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/assembly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/assembly</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/assembly</url>
    </scm>
    
    <profiles>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-core</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Core</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/core/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/core</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/core</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/core</url>
    </scm>

    <build>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-codebehind-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Codebehind Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/codebehind/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-config-browser-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Configuration Browser Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/config-browser/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/config-browser/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/config-browser/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</url>
    </scm>

 </project>
@@ -3,7 +3,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-convention-plugin</artifactId>
@@ -11,9 +11,9 @@
    <name>Struts 2 Convention Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-convention-plugin</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_6</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_6</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_1_6</url>
    </scm>

    <build>
@@ -37,7 +37,7 @@
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-core</artifactId>
-            <version>2.1.5-SNAPSHOT</version>
+            <version>2.1.6</version>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
@@ -398,9 +398,6 @@ public class DefaultResultMapBuilder implements ResultMapBuilder {
            if (!params.containsKey(defaultParamName)) {
                params.put(defaultParamName, info.location);
            }
-        } else if (LOG.isWarnEnabled()){
-            LOG.warn("Result [#0] for action class [#1] is missing the location", info.name,
-                    actionClass.getSimpleName());
        }

        return new ResultConfig.Builder(info.name, resultTypeConfig.getClassName()).addParams(params).build();
@@ -31,6 +31,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.net.URL;

 import org.apache.struts2.convention.annotation.Action;
@@ -60,6 +61,7 @@ import com.opensymphony.xwork2.util.finder.UrlSet;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.FileManager;
+import com.opensymphony.xwork2.util.TextUtils;

 /**
 * <p>
@@ -78,9 +80,8 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
    private String[] actionPackages;
    private String[] excludePackages;
    private String[] packageLocators;
-    private String[] excludeJars;
+    private String[] includeJars;
    private String packageLocatorsBasePackage;
-    private boolean disableJarScanning = true;
    private boolean disableActionScanning = false;
    private boolean disablePackageLocatorsScanning = false;
    private String actionSuffix = "Action";
@@ -149,20 +150,12 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
    }

    /**
-     * @param exlcudeJars Comma separated list of regular expressions of jars to be exluded.
-     *                    Ignored if "struts.convention.action.disableJarScanning" is true
+     * @param includeJars Comma separated list of regular expressions of jars to be included.                         
     */
-    @Inject(value = "struts.convention.action.excludeJars", required = false)
-    public void setExcludeJars(String excludeJars) {
-        this.excludeJars = excludeJars.split("\\s*[,]\\s*");
-    }
-
-    /**
-     * @param disableJarScanning Disable scanning jar files for actions
-     */
-    @Inject(value = "struts.convention.action.disableJarScanning", required = false)
-    public void setDisableJarScanning(String disableJarScanning) {
-        this.disableJarScanning = "true".equals(disableJarScanning);
+    @Inject(value = "struts.convention.action.includeJars", required = false)
+    public void setIncludeJars(String includeJars) {
+        if (TextUtils.stringSet(includeJars))
+            this.includeJars = includeJars.split("\\s*[,]\\s*");
    }

    /**
@@ -335,12 +328,39 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
        urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
        urlSet = urlSet.exclude(".*/JavaVM.framework/.*");

-        if (disableJarScanning) {
+        if (includeJars == null) {
            urlSet = urlSet.exclude(".*?jar(!/)?");
-        } else if (excludeJars != null) {
-            for (String pattern : excludeJars) {
-                urlSet = urlSet.exclude(pattern.trim());
+        } else {
+            //jar urls regexes were specified
+            List<URL> rawIncludedUrls = urlSet.getUrls();
+            Set<URL> includeUrls = new HashSet<URL>();
+            boolean[] patternUsed = new boolean[includeJars.length];
+
+            for (URL url : rawIncludedUrls) {
+                if ("jar".equalsIgnoreCase(url.getProtocol())) {
+                    //it is a jar file, make sure it macthes at least a url regex
+                    for (int i = 0; i < includeJars.length; i++) {
+                        String includeJar = includeJars[i];
+                        if (Pattern.matches(includeJar, url.toExternalForm())) {
+                            includeUrls.add(url);
+                            patternUsed[i] = true;
+                            break;
+                        }
+                    }
+                } else {
+                    //it is not a jar
+                    includeUrls.add(url);
+                }
            }
+
+            if (LOG.isWarnEnabled()) {
+                for (int i = 0; i < patternUsed.length; i++) {
+                    if (!patternUsed[i]) {
+                        LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
+                    }
+                }
+            }
+            return new UrlSet(includeUrls);
        }

        return urlSet;
@@ -42,7 +42,6 @@
  <constant name="struts.convention.result.flatLayout" value="true"/>
  <constant name="struts.convention.action.suffix" value="Action"/>
  <constant name="struts.convention.action.disableScanning" value="false"/>
-  <constant name="struts.convention.action.disableJarScanning" value="true"/>
  <constant name="struts.convention.action.mapAllMatches" value="false"/>
  <constant name="struts.convention.action.checkImplementsAction" value="true"/>
  <constant name="struts.convention.default.parent.package" value="convention-default"/>
@@ -55,6 +54,7 @@
  <constant name="struts.convention.relative.result.types" value="dispatcher,velocity,freemarker"/>
  <constant name="struts.convention.redirect.to.slash" value="true"/>
  <constant name="struts.mapper.alwaysSelectFullNamespace" value="true"/>
+  <constant name="struts.convention.action.includeJars" value="" />  

  <constant name="struts.convention.classes.reload" value="false" />  

@@ -1,18 +0,0 @@
-struts.convention.action.excludeJars = .*/activemq-(core|ra)-[\\d.]+.jar(!/)?, \
-            .*/catalina.*?jar(!/)?, \
-            .*/tomcat.*?jar(!/)?, \
-            .*/junit-[\\d.]+.jar(!/)?, \
-            .*/log4j-[\\d.]+.jar(!/)?, \
-            .*/xwork-[\\d.]+.jar(!/)?, \
-            .*/ognl-[\\d.]+.jar(!/)?, \
-            .*/aopalliance-[\\d.]+.jar(!/)?, \
-            .*/jstl-[\\d.]+.jar(!/)?, \
-            .*/dwr-[\\d.]+.jar(!/)?, \
-            .*/freemarker-[\\d.]+.jar(!/)?, \
-            .*/servlet-api-[\\d.]+.jar(!/)?, \
-            .*/sitemesh-[\\d.]+.jar(!/)?, \
-            .*/commons-(beanutils|el|digester|fileupload|codec|chain|logging|cli|pool|lang|collections|dbcp)-[\\d.]+.jar(!/)?, \
-            .*/spring-(beans|context|core|mock|web|jdbc)-[\\d.]+.jar(!/)?, \
-            .*/velocity-[\\d.]+.jar(!/)?, \
-            .*/velocity-(dep|tools)-[\\d.]+.jar(!/)?, \
-            .*/struts2-(config-browser-plugin|core|dojo-plugin|dwr-plugin|jsf-plugin|sitemesh-plugin|spring-plugin|struts1-plugin|tiles-plugin)-[\\d.]+.jar(!/)?
@@ -279,7 +279,6 @@ public class PackageBasedActionConfigBuilderTest extends TestCase {
        interceptorBuilder.setConfiguration(configuration);
        PackageBasedActionConfigBuilder builder = new PackageBasedActionConfigBuilder(configuration,
            actionNameBuilder, resultMapBuilder, interceptorBuilder ,of, "false", "struts-default");
-        builder.setDisableJarScanning("true");
        if (actionPackages != null) {
            builder.setActionPackages(actionPackages);
        }
@@ -25,7 +25,7 @@
    <parent>
        <artifactId>struts2-plugins</artifactId>
        <groupId>org.apache.struts</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.apache.struts</groupId>
@@ -33,9 +33,9 @@
    <name>Struts 2 Dojo Plugin</name>

    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dojo/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</url>
    </scm>
    <profiles>
        <profile>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-dwr-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 DWR Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dwr/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-jasperreports-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Jasper Reports Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jasperreports/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jasperreports/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/jasperreports/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</url>
    </scm>

    <dependencies>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-javatemplates-plugin</artifactId>
@@ -12,9 +12,9 @@
    <name>Struts 2 Java Templates Plugin</name>

    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/javatemplates/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
   </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-jfreechart-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 JFreeChart Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jfreechart/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jfreechart/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/jfreechart/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-jsf-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 JSF Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jsf/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jsf/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/jsf/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-junit-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 JUnit Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/junit/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-pell-multipart-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Pell Multipart Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/pell-multipart/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/pell-multipart/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/pell-multipart/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-plexus-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Plexus Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/plexus/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/plexus/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/plexus/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-plugins</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts Plugins</name>

   <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/</connection>
-     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/</developerConnection>
-     <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</connection>
+     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</url>
   </scm>

    <modules>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-portlet-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Portlet Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/portlet/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</url>
    </scm>

    <dependencies>
@@ -26,11 +26,11 @@
 	<parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
   <groupId>org.apache.struts</groupId>
   <artifactId>struts2-rest-plugin</artifactId>
-   <version>2.1.5-SNAPSHOT</version>
+   <version>2.1.6</version>
   <name>Struts 2 REST Plugin</name>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-sitegraph-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Sitegraph Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitegraph/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitegraph/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/sitegraph/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</url>
    </scm>

    <build>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-sitemesh-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Sitemesh Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitemesh/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitemesh/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/sitemesh/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-spring-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Spring Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/spring/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/spring/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/spring/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</url>
    </scm>
   
   <properties>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-struts1-plugin</artifactId>
@@ -34,16 +34,16 @@
    <name>Struts 2 Struts 1 Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/struts1/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/struts1/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/struts1/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</url>
    </scm>

    <dependencies>
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts-core</artifactId>
-            <version>1.3.9</version>
+            <version>1.3.10</version>
        </dependency>
        <dependency>
            <groupId>${pom.groupId}</groupId>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-testng-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 TestNG Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/testng/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</url>
    </scm>

    <dependencies>
@@ -26,7 +26,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.6</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-tiles-plugin</artifactId>
@@ -34,9 +34,9 @@
    <name>Struts 2 Tiles Plugin</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/tiles/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</url>
    </scm>

    <dependencies>
@@ -9,7 +9,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.6</version>
    <packaging>pom</packaging>
    <name>Struts 2</name>
    <url>http://struts.apache.org/struts2</url>
@@ -28,9 +28,9 @@
    -->

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6</url>
    </scm>

    <issueManagement>
Author	SHA1	Message	Date
Musachy Barroso	e893492adc	[maven-release-plugin] copy for tag STRUTS_2_1_6 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6@731669 13f79535-47bb-0310-9956-ffa450edef68	2009-01-05 19:57:18 +00:00
Musachy Barroso	45d5c756c8	Remove comment git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731128 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 23:58:12 +00:00
Musachy Barroso	415f08e575	Minor change to makig logging consistent git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731127 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 23:49:51 +00:00
Jeromy Evans	92ab09649e	WW-2947 added LOG.warn()'s for includeJars patterns that fail to match any jars git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731124 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 23:15:34 +00:00
Musachy Barroso	f11b40aa46	WW-2947 Remove convention's "excludeJars" and add "includeJars" instead git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731070 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 19:36:36 +00:00
Musachy Barroso	e2a7c4c183	WW-2947 Remove convention's "excludeJars" and add "includeJars" instead git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731063 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 18:59:19 +00:00
Musachy Barroso	ed3e6e2458	WW-2946 Update struts 1 dependency to 1.3.10 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731031 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 17:25:10 +00:00
Musachy Barroso	6756f368f5	Remove annoying warning git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731023 13f79535-47bb-0310-9956-ffa450edef68	2009-01-03 16:58:42 +00:00
Musachy Barroso	85da3b3b1a	[maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@730774 13f79535-47bb-0310-9956-ffa450edef68	2009-01-02 16:28:44 +00:00
Musachy Barroso	ed28964bce	[maven-release-plugin] prepare release STRUTS_2_1_5 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@730771 13f79535-47bb-0310-9956-ffa450edef68	2009-01-02 16:27:28 +00:00