Author: jukka
Date: Mon Jul 9 10:02:27 2012
New Revision: 1359014
URL: http://svn.apache.org/viewvc?rev=1359014&view=rev
Log:
OAK-163: Move the JCR TCK back to the integrationTesting profile
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java
(contents, props changed)
- copied, changed from r1358648,
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java
Removed:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java
Modified:
jackrabbit/oak/trunk/.travis.yml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/.travis.yml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/.travis.yml?rev=1359014&r1=1359013&r2=1359014&view=diff
==============================================================================
--- jackrabbit/oak/trunk/.travis.yml (original)
+++ jackrabbit/oak/trunk/.travis.yml Mon Jul 9 10:02:27 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-script: mvn verify
+script: mvn verify -PintegrationTesting
language: java
jdk:
- openjdk6
Copied:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java
(from r1358648,
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java&r1=1358648&r2=1359014&rev=1359014&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java
Mon Jul 9 10:02:27 2012
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.test.JCRTes
/**
* Test suite that includes all test suites from jackrabbit-jcr-tests.
*/
-public class JcrTckTest extends TestCase {
+public class JcrTckIT extends TestCase {
public static Test suite() {
return new JCRTestSuite();
Propchange:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1359014&r1=1359013&r2=1359014&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Jul 9 10:02:27 2012
@@ -188,6 +188,11 @@
<profiles>
<profile>
<id>integrationTesting</id>
+ <activation>
+ <property>
+ <name>env.OAK_INTEGRATION_TESTING</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
