Repository: tomee Updated Branches: refs/heads/master ab7571553 -> 8bf647fb9
style Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8bf647fb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8bf647fb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8bf647fb Branch: refs/heads/master Commit: 8bf647fb9cad061b4d1daf8556b76ed7c25be99f Parents: ab75715 Author: Romain manni-Bucau <[email protected]> Authored: Fri Mar 25 09:42:59 2016 +0100 Committer: Romain manni-Bucau <[email protected]> Committed: Fri Mar 25 09:42:59 2016 +0100 ---------------------------------------------------------------------- .../openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java | 1 - .../openejb/arquillian/embedded/EmbeddedTomEEContainer.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8bf647fb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java index bbffb53..8996aa4 100644 --- a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java +++ b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java @@ -25,7 +25,6 @@ import org.jboss.arquillian.config.descriptor.api.Multiline; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/tomee/blob/8bf647fb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java index 8412028..8c3624e 100644 --- a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java +++ b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java @@ -116,10 +116,10 @@ public class EmbeddedTomEEContainer extends TomEEContainer<EmbeddedTomEEConfigur } if (tomeeConfiguration.getRoles() != null) { - configuration.setRoles(new HashMap<>(Map.class.cast(tomeeConfiguration.getRolesAsProperties()))); + configuration.setRoles(new HashMap<String, String>(Map.class.cast(tomeeConfiguration.getRolesAsProperties()))); } if (tomeeConfiguration.getUsers() != null) { - configuration.setUsers(new HashMap<>(Map.class.cast(tomeeConfiguration.getUsersAsProperties()))); + configuration.setUsers(new HashMap<String, String>(Map.class.cast(tomeeConfiguration.getUsersAsProperties()))); } return configuration;
