Author: tv
Date: Tue Apr 29 20:12:56 2014
New Revision: 1591082
URL: http://svn.apache.org/r1591082
Log:
Apply patch from JCS-120
Modified:
commons/proper/jcs/trunk/commons-jcs-tck-tests/ (props changed)
commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
Propchange: commons/proper/jcs/trunk/commons-jcs-tck-tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 29 20:12:56 2014
@@ -3,3 +3,5 @@ target
*.iml
.classpath
.project
+
+.settings
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=1591082&r1=1591081&r2=1591082&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml Tue Apr 29 20:12:56
2014
@@ -1,3 +1,22 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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/xsd/maven-4.0.0.xsd";>
@@ -15,7 +34,6 @@
-Dorg.jsr107.tck.management.agentId=MBeanServerJCS
-Djavax.management.builder.initial=org.apache.commons.jcs.jcache.jmx.ConfigurableMBeanServerIdBuilder
-->
- <groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache-tck</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache TCK</name>
@@ -39,44 +57,6 @@
</properties>
<dependencies>
- <!-- just cause now we compile even main jcs build but not needed for tcks
-->
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.7.3.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- end of jcs dependencies "forced" == block can be removed once
jcache/tck in another module -->
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>commons-jcs-core</artifactId>
@@ -94,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
Modified:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/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?rev=1591082&r1=1591081&r2=1591082&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs/jcache/OWBBeanProvider.java
Tue Apr 29 20:12:56 2014
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.commons.jcs.jcache;
import org.apache.webbeans.config.WebBeansContext;
@@ -8,7 +26,6 @@ import javax.cache.annotation.BeanProvid
import javax.enterprise.inject.spi.Bean;
import java.util.Set;
-// TODO: move it over a tck module and remove owb dependency in main pom
public class OWBBeanProvider implements BeanProvider {
private final BeanManagerImpl bm;
Modified:
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList?rev=1591082&r1=1591081&r2=1591082&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
(original)
+++
commons/proper/jcs/trunk/commons-jcs-tck-tests/src/test/resources/ExcludeList
Tue Apr 29 20:12:56 2014
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
# for tck this test needs to be excluded
org.jsr107.tck.CachingTest#dummyTest
