Added gradle config to release source JARs. Added new and/or functionality to QueryDsl.

Author: MrMatthewLayton

build.gradle

@@ -40,8 +40,8 @@ buildscript {
     }
 }
 
-group 'io.onixlabs'
-version '3.0.0-rc1'
+group getProperty('group')
+version getProperty('version')
 
 subprojects {
     repositories {
@@ -73,6 +73,11 @@ subprojects {
         }
     }
 
+    task sourceJar(type: Jar) {
+        from sourceSets.main.allSource
+        archiveClassifier = "sources"
+    }
+
     jar {
         exclude '**/log4j2*.xml'
     }

onixlabs-corda-core-contract/build.gradle

@@ -49,6 +49,7 @@ publishing {
             groupId = project.parent.group
             version = project.parent.version
             artifactId = 'onixlabs-corda-core-contract'
+            artifact sourceJar
             from components.java
         }
     }

onixlabs-corda-core-integration/build.gradle

@@ -32,6 +32,7 @@ publishing {
             groupId = project.parent.group
             version = project.parent.version
             artifactId = 'onixlabs-corda-core-integration'
+            artifact sourceJar
             from components.java
         }
     }

onixlabs-corda-core-workflow/build.gradle

@@ -52,6 +52,7 @@ publishing {
             groupId = project.parent.group
             version = project.parent.version
             artifactId = 'onixlabs-corda-core-workflow'
+            artifact sourceJar
             from components.java
         }
     }

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/services/QueryDsl.kt

@@ -410,6 +410,16 @@ class QueryDsl<T : ContractState> internal constructor(
         criteria = criteria.and(criteriaToAdd.updateQueryCriteria())
     }
 
+    /**
+     * Applies a sub-query to the current query criteria using logical AND.
+     *
+     * @param queryCriteria The sub-query criteria which will be appended to the current query criteria.
+     */
+    @QueryDslContext
+    fun and(queryCriteria: QueryCriteria) {
+        criteria = criteria.and(queryCriteria)
+    }
+
     /**
      * Applies a sub-query to the current query criteria using logical AND.
      *
@@ -419,7 +429,17 @@ class QueryDsl<T : ContractState> internal constructor(
     fun and(action: QueryDsl<T>.() -> Unit) {
         val query = QueryDsl<T>(VaultQueryCriteria().updateQueryCriteria(), paging, sorting)
         action(query)
-        criteria = criteria.and(query.criteria)
+        and(query.criteria)
+    }
+
+    /**
+     * Applies a sub-query to the current query criteria using logical OR.
+     *
+     * @param queryCriteria The sub-query criteria which will be appended to the current query criteria.
+     */
+    @QueryDslContext
+    fun or(queryCriteria: QueryCriteria) {
+        criteria = criteria.or(queryCriteria)
     }
 
     /**
@@ -431,7 +451,7 @@ class QueryDsl<T : ContractState> internal constructor(
     fun or(action: QueryDsl<T>.() -> Unit) {
         val query = QueryDsl<T>(VaultQueryCriteria().updateQueryCriteria(), paging, sorting)
         action(query)
-        criteria = criteria.or(query.criteria)
+        or(query.criteria)
     }
 
     /**