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

Commit 3f66b7b

Browse files
author
Scott Stafford
committed
#280 - consolidate core and infrastructure packages, remove infrastructure
1 parent c7e5812 commit 3f66b7b

File tree

50 files changed

+9
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+9
-375
lines changed

‎core/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
apply plugin: "com.jfrog.bintray"
22

33
dependencies {
4-
//core doesn't depend on infrastructure but want to grab both jars when importing MSB
5-
compile project(":infrastructure")
6-
74
// For the CommandLineInterface main program
85
compile "net.sf.jopt-simple:jopt-simple:5.0.1"
96

107
compile "org.springframework.batch:spring-batch-core:$springBatchVersion"
118
compile "com.marklogic:marklogic-client-api:4.0.3"
129
compile "com.marklogic:ml-javaclient-util:3.2.0"
10+
compile "org.apache.commons:commons-lang3:3.5"
1311

1412
testCompile "org.springframework.batch:spring-batch-test:$springBatchVersion"
1513
testCompile "com.marklogic:ml-junit:3.0.0"

‎infrastructure/src/main/java/com/marklogic/spring/batch/columnmap/ColumnMapSerializer.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/columnmap/ColumnMapSerializer.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/columnmap/DefaultStaxColumnMapSerializer.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/columnmap/DefaultStaxColumnMapSerializer.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/columnmap/JacksonColumnMapSerializer.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/columnmap/JacksonColumnMapSerializer.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/columnmap/XmlStringColumnMapSerializer.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/columnmap/XmlStringColumnMapSerializer.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/item/listener/SimpleChunkListener.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/item/listener/SimpleChunkListener.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/item/processor/AbstractMarkLogicItemProcessor.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/item/processor/AbstractMarkLogicItemProcessor.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/item/processor/ColumnMapProcessor.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/item/processor/ColumnMapProcessor.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/item/processor/MarkLogicItemProcessor.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/item/processor/MarkLogicItemProcessor.java‎

File renamed without changes.

‎infrastructure/src/main/java/com/marklogic/spring/batch/item/processor/ResourceToDocumentWriteOperationItemProcessor.java‎ renamed to ‎core/src/main/java/com/marklogic/spring/batch/item/processor/ResourceToDocumentWriteOperationItemProcessor.java‎

File renamed without changes.

0 commit comments

Comments
 (0)