Skip to content
This repository was archived by the owner on May 27, 2023. It is now read-only.

Commit 5ce600a

Browse files
source-csource-c
committed
Merge branch 'trunk' into master
2 parents 3ca0d86 + 4a6f444 commit 5ce600a

File tree

4 files changed

+45
-24
lines changed

4 files changed

+45
-24
lines changed

‎README.adoc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ Config is java .properties file:
144144
|api.port |integer |http server port, default is 8000
145145
|api.auth.username |string |basic auth username, if auth required
146146
|api.auth.password |string |basic auth password, if auth required
147-
|db |string |which storage to use, "pg" or "mysql". Options from `jdbc.*` will be merged with corresponding options |
148-
|pg.host |string |postgresql host, default is "localhost" (from jdbc.host) |
149-
|pg.port |integer |postgresql port, default is 5432 |
150-
|pg.database |string |postgresql database, default is "edi" (from jdbc.database) |
151-
|pg.user |string |postgresql user |
152-
|pg.password |string |postgresql password |
153-
|mysql.host |string |mysql host, default is "localhost" (from jdbc.host) |
154-
|mysql.port |integer |mysql port, default is 3306 |
155-
|mysql.database |string |mysql database, default is "edi" (from jdbc.database) |
156-
|mysql.user |string |mysql user |
157-
|mysql.password |string |mysql password |
147+
|db |string |which storage to use, "pg" or "mysql". Options from `jdbc.*` will be merged with corresponding options
148+
|pg.host |string |postgresql host, default is "localhost" (from jdbc.host)
149+
|pg.port |integer |postgresql port, default is 5432
150+
|pg.database |string |postgresql database, default is "edi" (from jdbc.database)
151+
|pg.user |string |postgresql user
152+
|pg.password |string |postgresql password
153+
|mysql.host |string |mysql host, default is "localhost" (from jdbc.host)
154+
|mysql.port |integer |mysql port, default is 3306
155+
|mysql.database |string |mysql database, default is "edi" (from jdbc.database)
156+
|mysql.user |string |mysql user
157+
|mysql.password |string |mysql password
158158
|===
159159

160160
See link:resources/edi-receiver.properties[edi-receiver.properties] for defaults and more options.

‎project.clj‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@
33
:url "https://tbt-post.net/"
44
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
55
:url "https://www.eclipse.org/legal/epl-2.0/"}
6-
:dependencies [[org.clojure/clojure "1.10.1"]
6+
:dependencies [[org.clojure/clojure "1.10.2"]
77
[org.clojure/tools.cli "1.0.194"]
88
[org.clojure/tools.cli "1.0.194"]
9-
[cheshire "5.10.0"]
9+
[cheshire "5.10.0"
10+
:exclusions [com.fasterxml.jackson.core/jackson-core
11+
com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
12+
com.fasterxml.jackson.dataformat/jackson-dataformat-smile]]
13+
[com.fasterxml.jackson.core/jackson-core "2.12.1"]
14+
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.12.1"]
15+
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.12.1"]
16+
1017
[org.clojure/java.data "1.0.86"]
1118

1219
;; jdbc
13-
[org.clojure/java.jdbc "0.7.11"]
20+
[org.clojure/java.jdbc "0.7.12"]
1421
[com.mchange/c3p0 "0.9.5.5"]
1522
[org.postgresql/postgresql "42.2.18"]
16-
[mysql/mysql-connector-java "8.0.22"]
23+
[mysql/mysql-connector-java "8.0.23"]
1724

1825
;; HTTP client
1926
[org.eclipse.jetty/jetty-client "9.4.18.v20190429"] ; same version as pedestal.jetty uses
@@ -72,11 +79,19 @@
7279
; Note: With reitit 0.5.11 have compile error:
7380
; ClassNotFoundException: com.fasterxml.jackson.core.util.JacksonFeature
7481
; error may be related with update to jsonista 0.3.0 with jackson 2.12.0
75-
[metosin/reitit "0.5.10"]
76-
[metosin/reitit-pedestal "0.5.10"]
82+
[metosin/reitit "0.5.12"
83+
:exclusions [com.fasterxml.jackson.core/jackson-databind]]
84+
[com.fasterxml.jackson.core/jackson-databind "2.12.1"]
85+
[metosin/reitit-pedestal "0.5.12"]
7786

7887
;; Kafka
79-
[net.tbt-post/clj-kafka-x "0.4.1"]
88+
[net.tbt-post/clj-kafka-x "0.5.0"
89+
:exclusions [com.fasterxml.jackson.dataformat/jackson-dataformat-csv
90+
com.fasterxml.jackson.datatype/jackson-datatype-jdk8
91+
com.fasterxml.jackson.module/jackson-module-scala_2.12]]
92+
[com.fasterxml.jackson.dataformat/jackson-dataformat-csv "2.12.1"]
93+
[com.fasterxml.jackson.datatype/jackson-datatype-jdk8 "2.12.1"]
94+
[com.fasterxml.jackson.module/jackson-module-scala_2.12 "2.12.1"]
8095

8196
;; SMTP
8297
[com.sun.mail/javax.mail "1.6.2"]]}}

‎resources/edi-receiver.VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.2
1+
0.4.3

‎src/common/edi/common/db/models.clj‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@
8989
:operation {:type :text}
9090
:correction_id {:type :uuid}
9191
:msg_for {:type :uuid}
92-
:group {:type :uuid :alias :grp})
92+
:group {:type :uuid :alias :grp}
93+
:integration {:type :text}
94+
:transit {:type :boolean})
9395

9496
:refill_payment (array-map :sender {:type :text :required true}
9597
:timestamp {:type :timestamp :required true :alias :ts},
@@ -135,7 +137,7 @@
135137

136138
:wms_registry_announcement (array-map :source {:type :text :required true}
137139
:timestamp {:type :timestamp :required true :alias :ts},
138-
:generated {:type :integer :required true :alias :gener}
140+
:generated {:type :bigint :required true :alias :gener}
139141
:serial {:type :bigint :required true}
140142
:uid {:type :uuid :required true}
141143
:userial {:type :uuid :required true}
@@ -175,7 +177,7 @@
175177
:group {:type :uuid :alias :grp})})
176178

177179

178-
(def version 7)
180+
(def version 9)
179181
(def migrations {1 {:order_payment [[:add-column :operation {:type :text}]
180182
[:add-column :correction_id {:type :uuid}]]}
181183
2 {:event_parcel_change_state [[:add-column :external_ref {:type :text}]]}
@@ -210,7 +212,9 @@
210212
:wms_item_announcement [[:add-column :grp {:type :uuid}]]
211213
:wms_registry_announcement [[:add-column :grp {:type :uuid}]]
212214
:wms_stocktaking_message [[:add-column :grp {:type :uuid}]]
213-
:bms_contragent_update [[:add-column :grp {:type :uuid}]]}})
215+
:bms_contragent_update [[:add-column :grp {:type :uuid}]]}
216+
8 {:order_payment [[:add-column :integration {:type :text}]]}
217+
9 {:order_payment [[:add-column :transit {:type :boolean}]]}})
214218

215219

216220
; migrations example
@@ -236,7 +240,9 @@
236240
4 "edi#v0.1.4"
237241
5 "edi#v0.2.0"
238242
6 "edi#v0.2.1"
239-
7 "edi#v0.2.2"})
243+
7 "edi#v0.2.2"
244+
8 "edi#v0.2.3"
245+
9 "edi#v0.2.4"})
240246

241247
(def tbtapi-docs-ref (tbtapi-docs-refs version))
242248

0 commit comments

Comments
 (0)