diff --git a/.gitignore b/.gitignore
index 8afdcc1b9e..f35a1af429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
### Gradle ###
.gradle
build/
@@ -236,97 +233,3 @@ fabric.properties
# Sonarlint plugin
.idea/sonarlint
-=======
->>>>>>> RB
-# Binaries
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.war
-*.ear
-*.sar
-*.class
-
-# Maven
-target/
-
-# eclipse project file
-.settings/
-.classpath
-.project
-
-
-# IntelliJ project files
-*.iml
-*.iws
-*.ipr
-.idea/
-
-
-
-# NetBeans specific
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c65826db88..ebe8da4553 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,11 +6,15 @@
-
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d985..24dce4c262 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,11 +1,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -16,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
deleted file mode 100644
index cdd79598ea..0000000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
deleted file mode 100644
index 6c2a7607f1..0000000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
deleted file mode 100644
index cec24931ef..0000000000
--- a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml
deleted file mode 100644
index c7e234c123..0000000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml
deleted file mode 100644
index a0c169abac..0000000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml
deleted file mode 100644
index 7a30e6e396..0000000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
deleted file mode 100644
index ebfe0a8655..0000000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml
deleted file mode 100644
index 7ee7fe0883..0000000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
deleted file mode 100644
index f854ab00fd..0000000000
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
deleted file mode 100644
index 56193163f3..0000000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1127..0000000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
deleted file mode 100644
index 78dbe458d4..0000000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml
deleted file mode 100644
index cc01e3f539..0000000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml
deleted file mode 100644
index f198e4bb85..0000000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml
deleted file mode 100644
index cde8a482a9..0000000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml
deleted file mode 100644
index 3391deb2a7..0000000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml
deleted file mode 100644
index f3bb7f6b81..0000000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
deleted file mode 100644
index af41e3b617..0000000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
deleted file mode 100644
index fbc1b1635a..0000000000
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
deleted file mode 100644
index 2f93a6301e..0000000000
--- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
deleted file mode 100644
index 1b644dd840..0000000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 17e19eb41d..4ec2a1b534 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,5 +7,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index da24bb41a5..d33d98704d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,12 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3edc2ca039..995cf9a46c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,39 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13,6 +45,11 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
@@ -81,6 +105,7 @@
+
1618147556538
diff --git a/build.gradle b/build.gradle
index 7508bd9444..537be052f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,6 @@ plugins {
id 'org.asciidoctor.convert' version '1.5.8'
id 'io.spring.nohttp' version '0.0.3.RELEASE'
id 'de.undercouch.download' version '4.0.0'
- id 'com.gradle.build-scan' version '2.4.2'
id "com.jfrog.artifactory" version '4.9.8' apply false
id "io.freefair.aspectj" version "4.1.1" apply false
id "com.github.ben-manes.versions" version "0.24.0"
diff --git a/lang-tutorial.iml b/lang-tutorial.iml
deleted file mode 100644
index 2792130f76..0000000000
--- a/lang-tutorial.iml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 22c7a2ee1b..7487ab15c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,331 +1,272 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-
- 4.0.0
-=======
->>>>>>> RB
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-4.0.0
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
- com.ossez
- lang-tutorial
- 0.0.1
+ 4.0.0
-
-
- 1.8
- UTF-8
- UTF-8
+ com.ossez
+ lang-tutorial
+ 0.0.1
-
- 1.7.12
- 2.2
+
+
+ 1.8
+ UTF-8
+ UTF-8
+
+
+ 1.7.12
+ 2.2
-
- 4.3.5.Final
+
+ 4.3.5.Final
-
- 4.3.1.Final
+
+ 4.3.1.Final
-
- 7.0.42
- 2.6.8
- 2.3.2
+
+ 7.0.42
+ 2.6.8
+ 2.3.2
-
- 4.11
- 1.3
+
+ 4.11
+ 1.3
-
- 1.9.0
+
+ 1.9.0
-
+
-
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-
-
- com.ossez
- reoc-common
- 0.0.1
-=======
->>>>>>> RB
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
- 2.11.0
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
-
+
+
-
-
- org.apache.commons
- commons-compress
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
- 1.10
-
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.11.0
+
-
- org.apache.velocity
- velocity
- 1.6
-
-=======
->>>>>>> RB
- 1.19
-
+
+
+ org.apache.commons
+ commons-compress
+ 1.10
+
-
- org.apache.commons
- commons-math3
- 3.6.1
-
-
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
-
- antlr
- antlr
- 2.7.6
-
+
+ org.apache.velocity
+ velocity
+ 1.7
+
-
- dom4j
- dom4j
- 1.6.1
-
-
- commons-cli
- commons-cli
- 1.2
-
-
- org.apache.velocity
- velocity-tools
- 2.0
-
+
+ org.apache.commons
+ commons-math3
+ 3.6.1
+
-
- jaxen
- jaxen
- 1.1.6
-
+
+ antlr
+ antlr
+ 2.7.6
+
-
- javax.persistence
- persistence-api
- 1.0.2
-
-
- com.google.guava
- guava
- 17.0
-
-
- com.google.gdata
- core
- 1.47.1
-
+
+ dom4j
+ dom4j
+ 1.6.1
+
+
+ commons-cli
+ commons-cli
+ 1.2
+
+
+ org.apache.velocity
+ velocity-tools
+ 2.0
+
-
- org.ow2.orchestra.eclipse.birt
- org.ow2.orchestra.eclipse.birt.core
- 3.7.0
-
-
- org.ow2.orchestra.eclipse.birt
- org.ow2.orchestra.eclipse.birt.report.engine
- 3.7.0
-
-
- commons-net
- commons-net
- 2.0
-
+
+ jaxen
+ jaxen
+ 1.1.6
+
-
- com.mchange
- mchange-commons-java
- 0.2.9
-
+
+ javax.persistence
+ persistence-api
+ 1.0.2
+
+
+ com.google.guava
+ guava
+ 17.0
+
+
+ com.google.gdata
+ core
+ 1.47.1
+
-
- junit
- junit
- 4.12
-
-
- org.jasypt
- jasypt
- 1.5
-
+
+ org.ow2.orchestra.eclipse.birt
+ org.ow2.orchestra.eclipse.birt.core
+ 3.7.0
+
+
+ org.ow2.orchestra.eclipse.birt
+ org.ow2.orchestra.eclipse.birt.report.engine
+ 3.7.0
+
+
+ commons-net
+ commons-net
+ 2.0
+
-
- httpunit
- httpunit
- 1.7
-
-
- net.sf.jazzy
- jazzy
- 0.5.2-rtext-1.4.1
-
-
- net.sf.json-lib
- json-lib
- 2.4
- jdk15
-
-
- rome
- rome
- 0.9
-
+
+ com.mchange
+ mchange-commons-java
+ 0.2.9
+
-
- org.apache.httpcomponents
- httpmime
- 4.5.1
-
+
+ junit
+ junit
+ 4.12
+
+
+ org.jasypt
+ jasypt
+ 1.5
+
-
- org.jsoup
- jsoup
- 1.7.2
-
+
+ httpunit
+ httpunit
+ 1.7
+
+
+ net.sf.jazzy
+ jazzy
+ 0.5.2-rtext-1.4.1
+
+
+ net.sf.json-lib
+ json-lib
+ 2.4
+ jdk15
+
+
+ rome
+ rome
+ 0.9
+
-
- net.lingala.zip4j
- zip4j
- 1.3.2
-
+
+ org.apache.httpcomponents
+ httpmime
+ 4.5.1
+
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-
-
- com.ossez.rets-io
- rets-io-client
- 0.1.0
-
+
+ org.jsoup
+ jsoup
+ 1.7.2
+
-=======
->>>>>>> RB
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
-
+
+ net.lingala.zip4j
+ zip4j
+ 1.3.2
+
-
- package
-
-
- maven-compiler-plugin
- 3.1
-
- ${java.version}
- ${java.version}
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.12.4
-
- true
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.6
-
-
-
- com.ossez.reoc.rets.Main
- true
- lib/
-
-
-
+
-
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.7.0
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.7.0
+ test
+
+
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.6
-
+
+ package
+
+
+ maven-compiler-plugin
+ 3.1
+
+ ${java.version}
+ ${java.version}
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.12.4
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.6
+
+
+
+ com.ossez.reoc.rets.Main
+ true
+ lib/
+
+
+
-
- package
-
- single
-
-
- src/assembly/zipAssembly.xml
- reoc-rets
-
-
- com.ossez.reoc.rets.Main
-
-
- ./
-
-
+
-
-
-
-
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.6
+
-
-
-<<<<<<< HEAD
+
+ package
+
+ single
+
+
+ src/assembly/zipAssembly.xml
+ reoc-rets
+
+
+ com.ossez.reoc.rets.Main
+
+
+ ./
+
+
+
+
+
+
+
+
+
+
-=======
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB
diff --git a/settings.gradle b/settings.gradle
index ea3756f713..6e4af261a9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,6 +20,6 @@ rootProject.name = "cwiki-us-demo-tutorials"
rootProject.children.each { project ->
project.buildFileName = "${project.name}.gradle"
assert project.projectDir.isDirectory()
- assert project.buildFile.exists()
- assert project.buildFile.isFile()
+// assert project.buildFile.exists()
+// assert project.buildFile.isFile()
}