Author: olamy
Date: Tue Apr 29 07:08:04 2014
New Revision: 1590888
URL: http://svn.apache.org/r1590888
Log:
move tck tests code to a maven module activated with a java 1.7 profile
Added:
commons/proper/jcs/trunk/commons-jcs-tck-tests/
commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml (contents, props
changed)
- copied, changed from r1590887, commons/proper/jcs/trunk/tck.xml
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
(contents, props changed)
- copied, changed from r1590887,
commons/proper/jcs/trunk/src/tck-java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
- copied, changed from r1590887,
commons/proper/jcs/trunk/src/tck-resources/ExcludeList
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/services/
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider
- copied, changed from r1590887,
commons/proper/jcs/trunk/src/tck-resources/META-INF/services/javax.cache.annotation.BeanProvider
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties
(contents, props changed)
- copied, changed from r1590887,
commons/proper/jcs/trunk/src/tck-resources/log4j.properties
Removed:
commons/proper/jcs/trunk/src/tck-java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
commons/proper/jcs/trunk/src/tck-resources/ExcludeList
commons/proper/jcs/trunk/src/tck-resources/META-INF/services/javax.cache.annotation.BeanProvider
commons/proper/jcs/trunk/src/tck-resources/log4j.properties
commons/proper/jcs/trunk/tck.xml
Modified:
commons/proper/jcs/trunk/pom.xml
Copied: commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml (from r1590887,
commons/proper/jcs/trunk/tck.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml?p2=commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml&p1=commons/proper/jcs/trunk/tck.xml&r1=1590887&r2=1590888&rev=1590888&view=diff
==============================================================================
--- commons/proper/jcs/trunk/tck.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml Tue Apr 29 07:08:04
2014
@@ -2,10 +2,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <!--
- TO RUN TCKs CALL:
- $ mvn -f tck.xml test
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <!--
to run from an IDE a JMX test add:
-Dorg.jsr107.tck.management.agentId=MBeanServerJCS
-Djavax.management.builder.initial=org.apache.commons.jcs.jcache.jmx.ConfigurableMBeanServerIdBuilder
@@ -14,10 +18,9 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache-tck</artifactId>
<version>2.0-SNAPSHOT</version>
- <name>JCache TCK</name>
+ <name>Apache Commons JCS :: JCache TCK</name>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsr107.api.version>1.0.0</jsr107.api.version>
@@ -42,43 +45,36 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.4</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.3.3</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>2.0</version>
<optional>true</optional>
</dependency>
<!-- end of jcs dependencies "forced" == block can be removed once
jcache/tck in another module -->
@@ -92,13 +88,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
@@ -166,10 +160,9 @@
</dependencies>
<build>
- <testSourceDirectory>src/tck-java</testSourceDirectory>
<testResources>
<testResource>
- <directory>src/tck-resources</directory>
+ <directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
@@ -186,8 +179,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.testOutputDirectory}
- </outputDirectory>
+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<includeArtifactIds>cache-tests</includeArtifactIds>
<includeScope>test</includeScope>
<excludes>**/unwrap.properties</excludes>
@@ -232,8 +224,7 @@
<javax.cache.CacheManager>${CacheManagerImpl}</javax.cache.CacheManager>
<javax.cache.Cache>${CacheImpl}</javax.cache.Cache>
<javax.cache.Cache.Entry>${CacheEntryImpl}</javax.cache.Cache.Entry>
-
<javax.cache.annotation.CacheInvocationContext>${CacheInvocationContextImpl}
- </javax.cache.annotation.CacheInvocationContext>
+
<javax.cache.annotation.CacheInvocationContext>${CacheInvocationContextImpl}</javax.cache.annotation.CacheInvocationContext>
</systemPropertyVariables>
</configuration>
</plugin>
Propchange: commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
(from r1590887,
commons/proper/jcs/trunk/src/tck-java/org/apache/commons/jcs/jcache/OWBBeanProvider.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java?p2=commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java&p1=commons/proper/jcs/trunk/src/tck-java/org/apache/commons/jcs/jcache/OWBBeanProvider.java&r1=1590887&r2=1590888&rev=1590888&view=diff
==============================================================================
(empty)
Propchange:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
(from r1590887, commons/proper/jcs/trunk/src/tck-resources/ExcludeList)
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList?p2=commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList&p1=commons/proper/jcs/trunk/src/tck-resources/ExcludeList&r1=1590887&r2=1590888&rev=1590888&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider
(from r1590887,
commons/proper/jcs/trunk/src/tck-resources/META-INF/services/javax.cache.annotation.BeanProvider)
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider?p2=commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider&p1=commons/proper/jcs/trunk/src/tck-resources/META-INF/services/javax.cache.annotation.BeanProvider&r1=1590887&r2=1590888&rev=1590888&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties
(from r1590887, commons/proper/jcs/trunk/src/tck-resources/log4j.properties)
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties?p2=commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties&p1=commons/proper/jcs/trunk/src/tck-resources/log4j.properties&r1=1590887&r2=1590888&rev=1590888&view=diff
==============================================================================
(empty)
Propchange:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: commons/proper/jcs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1590888&r1=1590887&r2=1590888&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Tue Apr 29 07:08:04 2014
@@ -357,6 +357,15 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>tck-java-1.7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <modules>
+ <module>commons-jcs-tck-tests</module>
+ </modules>
+ </profile>
</profiles>
<properties>
