You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/04/15 19:49:25 UTC

tomee git commit: Merge issue

Repository: tomee
Updated Branches:
  refs/heads/master de4bd5dbc -> 02ff59e1a


Merge issue


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/02ff59e1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/02ff59e1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/02ff59e1

Branch: refs/heads/master
Commit: 02ff59e1a30e78896ccf0d14b1557a70c085b5d1
Parents: de4bd5d
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Apr 15 18:49:03 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Apr 15 18:49:03 2015 +0100

----------------------------------------------------------------------
 .../org/apache/openejb/arquillian/tests/resource/ResourceTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/02ff59e1/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/java/org/apache/openejb/arquillian/tests/resource/ResourceTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/java/org/apache/openejb/arquillian/tests/resource/ResourceTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/java/org/apache/openejb/arquillian/tests/resource/ResourceTest.java
index 2ea59a4..a43d1ea 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/java/org/apache/openejb/arquillian/tests/resource/ResourceTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/java/org/apache/openejb/arquillian/tests/resource/ResourceTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.openejb.arquillian.tests.resource;
 
-import org.apache.openejb.api.DestroyableResource;
+import org.apache.openejb.api.resource.DestroyableResource;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;