diff --git a/integration-tests/project.clj b/integration-tests/project.clj index 1c3cc2e4..2e03722d 100644 --- a/integration-tests/project.clj +++ b/integration-tests/project.clj @@ -19,7 +19,7 @@ [org.immutant/wildfly _]] :aliases {"all" ^:replace ["do" "clean," "test"]} :modules {:parent nil} - :profiles {:integ-base {:plugins [[lein-immutant "2.0.0"]] + :profiles {:integ-base {:plugins [[lein-immutant "2.1.0-SNAPSHOT"]] :aliases {"test" ^:displace ["immutant" "test"]} :modules {:parent ".."}} :integ-messaging {:test-paths ["../messaging/test"]} diff --git a/project.clj b/project.clj index cc8bad3f..b10f6b0f 100644 --- a/project.clj +++ b/project.clj @@ -93,11 +93,11 @@ environ "1.0.0" ;; org.projectodd.wunderboss "0.9.0" - org.projectodd.wunderboss "1.x.incremental.292" + org.projectodd.wunderboss "1.x.incremental.295" ;; org.projectodd.wunderboss "0.9.1-SNAPSHOT" org.immutant :version - fntest "2.0.7"}} + fntest "2.0.8-SNAPSHOT"}} :release-tasks [["vcs" "assert-committed"] diff --git a/wildfly/project.clj b/wildfly/project.clj index 83b1ad1f..98a9f05b 100644 --- a/wildfly/project.clj +++ b/wildfly/project.clj @@ -19,6 +19,6 @@ :dependencies [[org.immutant/core _] [org.clojure/tools.nrepl "_"] - [org.projectodd.wunderboss/wunderboss-wildfly _]] + [org.projectodd.wunderboss/wunderboss-wildfly-core _]] :profiles {:base {:dependencies []}}) diff --git a/wildfly/src/immutant/wildfly.clj b/wildfly/src/immutant/wildfly.clj index 7eb15edb..d480ba31 100644 --- a/wildfly/src/immutant/wildfly.clj +++ b/wildfly/src/immutant/wildfly.clj @@ -150,12 +150,7 @@ ([host protocol] (format "%s://%s:%s%s" protocol host (http-port) (context-path)))) -(let [in-cluster (delay - (boolean - (ignore-load-failures - (-> ^Class (u/try-import 'org.projectodd.wunderboss.as.ClusterUtils) - (.getMethod "inCluster" nil) - (.invoke nil nil)))))] +(let [in-cluster (delay (invoke-as-util-method "inCluster"))] (defn in-cluster? "Returns true if running inside a cluster" []