[maven-release-plugin] copy for tag commons-jcs-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0-beta-2@1767436 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/commons-jcs-dist/src/assembly/bin.xml b/commons-jcs-dist/src/assembly/bin.xml
index 4cec735..9f56c1f 100644
--- a/commons-jcs-dist/src/assembly/bin.xml
+++ b/commons-jcs-dist/src/assembly/bin.xml
@@ -20,6 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <baseDirectory>${project.parent.artifactId}-${version}-bin</baseDirectory>
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
diff --git a/commons-jcs-dist/src/assembly/src.xml b/commons-jcs-dist/src/assembly/src.xml
index 6692618..03cfb2a 100644
--- a/commons-jcs-dist/src/assembly/src.xml
+++ b/commons-jcs-dist/src/assembly/src.xml
@@ -20,6 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <baseDirectory>${project.parent.artifactId}-${version}-src</baseDirectory>
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
@@ -41,6 +42,8 @@
<exclude>.settings/**</exclude>
<exclude>.classpath</exclude>
<exclude>.project</exclude>
+ <exclude>*.log</exclude>
+ <exclude>tomcat.0/**</exclude>
</excludes>
</fileSet>
</fileSets>
diff --git a/commons-jcs-jcache-extras/pom.xml b/commons-jcs-jcache-extras/pom.xml
index 19151d4..116b110 100644
--- a/commons-jcs-jcache-extras/pom.xml
+++ b/commons-jcs-jcache-extras/pom.xml
@@ -79,13 +79,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>8.0.18</version>
+ <version>7.0.72</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>8.0.18</version>
+ <version>7.0.72</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>7.0.72</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs/jcache/extras/web/JCacheFilterTest.java b/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs/jcache/extras/web/JCacheFilterTest.java
index 8a0ef43..3c514d1 100644
--- a/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs/jcache/extras/web/JCacheFilterTest.java
+++ b/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs/jcache/extras/web/JCacheFilterTest.java
@@ -18,27 +18,28 @@
*/
package org.apache.commons.jcs.jcache.extras.web;
-import org.apache.catalina.Context;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleState;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.commons.io.IOUtils;
-import org.apache.tomcat.util.descriptor.web.FilterDef;
-import org.apache.tomcat.util.descriptor.web.FilterMap;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.deploy.FilterMap;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.IOUtils;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class JCacheFilterTest
{
diff --git a/commons-jcs-tck-tests/pom.xml b/commons-jcs-tck-tests/pom.xml
index c3d0223..67acfcd 100644
--- a/commons-jcs-tck-tests/pom.xml
+++ b/commons-jcs-tck-tests/pom.xml
@@ -244,7 +244,5 @@
</build>
</profile>
</profiles>
-
- <packaging>pom</packaging>
</project>
diff --git a/pom.xml b/pom.xml
index 9e28f67..6392a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,7 +470,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <version>${commons.findbugs.version}</version>
</plugin>
</plugins>
</reporting>
@@ -489,7 +489,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <releaseProfiles>release,apache-release</releaseProfiles>
+ <releaseProfiles>release</releaseProfiles>
</configuration>
</plugin>
</plugins>
@@ -522,7 +522,7 @@
<commons.release.version>2.0-beta-2</commons.release.version>
<commons.release.desc>(Java 6.0+)</commons.release.desc>
<!-- The RC version used in the staging repository URL. -->
- <commons.rc.version>RC1</commons.rc.version>
+ <commons.rc.version>RC2</commons.rc.version>
<commons.jira.id>JCS</commons.jira.id>
<commons.site.path>commons-jcs</commons.site.path>
<commons.scmPubUrl>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 534cf5a..71fa792 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,7 +21,7 @@
<body>
<release version="2.0" date="unreleased" description="JDK 1.6 based major release">
</release>
- <release version="2.0-beta-2" date="2016-10-21" description="JDK 1.6 based major release (beta-2)">
+ <release version="2.0-beta-2" date="2016-11-01" description="JDK 1.6 based major release (beta-2)">
<action dev="tv" type="remove">
Remove size limitation configuration of indexed cache recycle bin
</action>
