Author: struberg
Date: Thu May 1 07:45:40 2014
New Revision: 1591557
URL: http://svn.apache.org/r1591557
Log:
JCS-120 move the TCK run to an own profile
Building with the following line now will trigger the JSR-107 TCK to run:
$> mvn clean install -PjcacheTck
Modified:
commons/proper/jcs/trunk/commons-jcs-core/pom.xml
commons/proper/jcs/trunk/commons-jcs-jcache/pom.xml
commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
commons/proper/jcs/trunk/pom.xml
Modified: commons/proper/jcs/trunk/commons-jcs-core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/pom.xml?rev=1591557&r1=1591556&r2=1591557&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/pom.xml Thu May 1 07:45:40 2014
@@ -25,11 +25,12 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
<version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-core</artifactId>
<packaging>jar</packaging>
- <version>2.0-SNAPSHOT</version>
+
<name>Apache Commons JCS :: Core</name>
<properties>
Modified: commons/proper/jcs/trunk/commons-jcs-jcache/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-jcache/pom.xml?rev=1591557&r1=1591556&r2=1591557&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-jcache/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-jcache/pom.xml Thu May 1 07:45:40 2014
@@ -26,10 +26,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
<version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.0-SNAPSHOT</version>
+
<name>Apache Commons JCS :: JCache</name>
<dependencies>
Modified: commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml?rev=1591557&r1=1591556&r2=1591557&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml Thu May 1 07:45:40
2014
@@ -26,6 +26,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
<version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<!--
@@ -35,7 +36,7 @@
-->
<artifactId>commons-jcs-jcache-tck</artifactId>
- <version>2.0-SNAPSHOT</version>
+
<name>Apache Commons JCS :: JCache TCK</name>
<properties>
@@ -144,43 +145,6 @@
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-cache-tests</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
- <includeArtifactIds>cache-tests</includeArtifactIds>
- <includeScope>test</includeScope>
- <excludes>**/unwrap.properties</excludes>
- </configuration>
- </execution>
- <execution>
- <id>copy-domain</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.cache</groupId>
- <artifactId>app-domain</artifactId>
- <version>${jsr107.api.version}</version>
- <outputDirectory>${domain-lib-dir}</outputDirectory>
- <destFileName>${domain-jar}</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -188,23 +152,73 @@
<version>2.0.3</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <systemPropertyVariables>
- <domainJar>${domain-lib-dir}/${domain-jar}</domainJar>
-
<javax.management.builder.initial>${javax.management.builder.initial}</javax.management.builder.initial>
-
<org.jsr107.tck.management.agentId>${org.jsr107.tck.management.agentId}</org.jsr107.tck.management.agentId>
-
<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>
- </systemPropertyVariables>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jcacheTck</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-cache-tests</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <includeArtifactIds>cache-tests</includeArtifactIds>
+ <includeScope>test</includeScope>
+ <excludes>**/unwrap.properties</excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-domain</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.cache</groupId>
+ <artifactId>app-domain</artifactId>
+ <version>${jsr107.api.version}</version>
+ <outputDirectory>${domain-lib-dir}</outputDirectory>
+ <destFileName>${domain-jar}</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <systemPropertyVariables>
+ <domainJar>${domain-lib-dir}/${domain-jar}</domainJar>
+
<javax.management.builder.initial>${javax.management.builder.initial}</javax.management.builder.initial>
+
<org.jsr107.tck.management.agentId>${org.jsr107.tck.management.agentId}</org.jsr107.tck.management.agentId>
+
<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>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: commons/proper/jcs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1591557&r1=1591556&r2=1591557&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Thu May 1 07:45:40 2014
@@ -29,6 +29,11 @@
<artifactId>commons-jcs</artifactId>
<packaging>pom</packaging>
<version>2.0-SNAPSHOT</version>
+
+ <!--
+ * Build with -PjcacheTck to run the JSR-107 TCK
+ -->
+
<name>Apache Commons JCS</name>
<url>http://commons.apache.org/proper/commons-jcs/</url>
<description>Apache Commons JCS is a distributed, versatile caching
system.</description>
@@ -134,6 +139,7 @@
<modules>
<module>commons-jcs-core</module>
<module>commons-jcs-jcache</module>
+ <module>commons-jcs-tck-tests</module>
</modules>
<developers>
