Skip to content

Commit

Permalink
Merge branch 'master' into 0.9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDrogalis
MichaelDrogalis committed Dec 1, 2016
2 parents ccc2ec4 + f904702 commit 46708e6
Show file tree
Hide file tree
Showing 28 changed files with 39 additions and 64 deletions.
3 changes: 1 addition & 2 deletions aggregation/project.clj
View file
Expand Up @@ -4,7 +4,6 @@
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion aspect-orientation/project.clj
View file
Expand Up @@ -6,6 +6,6 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]
[org.onyxplatform/onyx "0.9.15"]
[dire "0.5.2"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion block-on-job-completion/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion catalog-parameters/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
1 change: 1 addition & 0 deletions circle.yml
View file
Expand Up @@ -5,6 +5,7 @@ dependencies:
test:
override:
- ./test_projects.sh:
timeout: 640
parallel: true

machine:
Expand Down
29 changes: 0 additions & 29 deletions circle_runner.sh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion datomic-mysql-transfer/project.clj
View file
Expand Up @@ -7,7 +7,7 @@
[org.clojure/java.jdbc "0.4.2"]
[com.datomic/datomic-free "0.9.5173"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]
[org.onyxplatform/onyx "0.9.15"]
[org.onyxplatform/onyx-datomic "0.9.10.0-beta1"]
[org.onyxplatform/onyx-sql "0.9.10.0-beta1"]
[environ "1.0.1"]
Expand Down
2 changes: 1 addition & 1 deletion filtering/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion fixed-windows/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
7 changes: 4 additions & 3 deletions fixed-windows/src/fixed_windows/core.clj
View file
Expand Up @@ -113,9 +113,10 @@
:trigger/period [1 :seconds]
:trigger/sync ::dump-window!}])

(defn dump-window! [event window-id lower-bound upper-bound state]
(println (format "Window extent %s, [%s - %s] contents: %s"
window-id lower-bound upper-bound state)))
(defn dump-window!
[event window trigger {:keys [lower-bound upper-bound] :as window-data} state]
(println (format "Window extent [%s - %s] contents: %s"
lower-bound upper-bound state)))

(onyx.api/submit-job
peer-config
Expand Down
2 changes: 1 addition & 1 deletion flat-workflow/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion flow-combine/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion flow-exclude-keys/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion flow-predicate-composition/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion flow-short-circuit/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion global-windows/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
7 changes: 4 additions & 3 deletions global-windows/src/global_windows/core.clj
View file
Expand Up @@ -111,9 +111,10 @@
:trigger/threshold [5 :elements]
:trigger/sync ::dump-window!}])

(defn dump-window! [event window-id lower-bound upper-bound state]
(println (format "Window extent %s, [%s - %s] contents: %s"
window-id lower-bound upper-bound state)))
(defn dump-window!
[event window trigger {:keys [lower-bound upper-bound] :as window-data} state]
(println (format "Window extent [%s - %s] contents: %s"
lower-bound upper-bound state)))

(onyx.api/submit-job
peer-config
Expand Down
2 changes: 1 addition & 1 deletion interface-injection/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion kill-job/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion lifecycles/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion max-peers/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion multi-output-workflow/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion parameterized/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
2 changes: 1 addition & 1 deletion session-windows/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
7 changes: 4 additions & 3 deletions session-windows/src/session_windows/core.clj
View file
Expand Up @@ -115,9 +115,10 @@
:trigger/period [1 :seconds]
:trigger/sync ::dump-window!}])

(defn dump-window! [event window-id lower-bound upper-bound state]
(println (format "Window extent %s, [%s - %s] contents: %s"
window-id lower-bound upper-bound state)))
(defn dump-window!
[event window trigger {:keys [lower-bound upper-bound] :as window-data} state]
(println (format "Window extent [%s - %s] contents: %s"
lower-bound upper-bound state)))

(onyx.api/submit-job
peer-config
Expand Down
2 changes: 1 addition & 1 deletion sliding-windows/project.clj
View file
Expand Up @@ -6,5 +6,5 @@
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.async "0.2.371"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.9.14"]]
[org.onyxplatform/onyx "0.9.15"]]
:plugins [[lein-update-dependency "0.1.2"]])
7 changes: 4 additions & 3 deletions sliding-windows/src/sliding_windows/core.clj
View file
Expand Up @@ -114,9 +114,10 @@
:trigger/threshold [5 :elements]
:trigger/sync ::dump-window!}])

(defn dump-window! [event window-id lower-bound upper-bound state]
(println (format "Window extent %s, [%s - %s] contents: %s"
window-id lower-bound upper-bound state)))
(defn dump-window!
[event window trigger {:keys [lower-bound upper-bound] :as window-data} state]
(println (format "Window extent [%s - %s] contents: %s"
lower-bound upper-bound state)))

(onyx.api/submit-job
peer-config
Expand Down
2 changes: 1 addition & 1 deletion test_projects.sh
View file
Expand Up @@ -15,7 +15,7 @@ for DIR in $(ls -d */); do
NSES=$(find src -name "*.clj" |sed s/src\\///|sed s/\\//\\./g|sed s/".clj$"//|sed s/"_"/"-"/g)

for n in $NSES; do
lein exec -ep "(require '[$n])"
lein exec -ep "(require '[$n]) (println \"DONE\") (System/exit 0)"
done
fi
((++i))
Expand Down

0 comments on commit 46708e6

Please sign in to comment.