Merge branch 'development'

Author: hansenmc

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2019 MarkLogic Corporation
+Copyright © 2020 MarkLogic Corporation
 
 This project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic.
 

NOTICE.txt

@@ -1,4 +1,4 @@
-Copyright © 2019 MarkLogic Corporation.
+Copyright © 2020 MarkLogic Corporation.
 
 This project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic.
 

README.md

@@ -1,13 +1,14 @@
+import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id 'com.jfrog.bintray' version '1.8.4'
-    id 'com.github.johnrengelman.shadow' version '2.0.2'
-    id 'com.github.kt3k.coveralls' version '2.8.2'
-    id 'com.marklogic.ml-gradle' version '3.15.1'
+    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.kt3k.coveralls' version '2.9.0'
+    id 'com.marklogic.ml-gradle' version '3.17.0'
     id 'io.github.ddimtirov.codacy' version '0.1.0'
-    id 'org.sonarqube' version '2.6.2'
+    id 'org.sonarqube' version '2.8'
     id 'eclipse'
     id 'idea'
     id 'jacoco'
@@ -16,8 +17,6 @@ plugins {
 }
 
 ext {
-    externalsortinginjavaVersion = '0.3.1'
-
     // we don't need a REST server, only an XCC server
     mlAppDeployer.getCommands().remove(mlAppDeployer.getCommand('DeployRestApiServersCommand'))
     mlAppConfig {
@@ -40,6 +39,10 @@ repositories {
 }
 
 sourceSets {
+    test {
+        // adding main resources from build dir, in order to load HTML with tokens replaced
+        resources.srcDir sourceSets.main.output.resourcesDir
+    }
     integrationTest {
         java {
             compileClasspath += main.output + test.output
@@ -68,32 +71,47 @@ configurations {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-xcc:9.0.9'
-    //we bundle the externalsortinginjava classes with the corb distro as a fat jar
-    compileOnly "com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"
-    shadow "com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"
-    testCompile "com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'org.jasypt:jasypt:1.9.2'
-    testCompile 'com.github.stefanbirkner:system-rules:1.17.1' //facilitates tests for methods that invoke System.exit
+    compile 'com.marklogic:marklogic-xcc:10.0.3'
+    // JavaScript libraries are  bundled in a fat jar for the UI
+    shadow  "org.webjars:angularjs:$angularVersion"
+    compile "org.webjars:angularjs:$angularVersion"
+    shadow  "org.webjars:bootstrap:$bootstrapVersion"
+    compile "org.webjars:bootstrap:$bootstrapVersion"
+    shadow  "org.webjars:jquery:$jqueryVersion"
+    compile "org.webjars:jquery:$jqueryVersion"
+    // externalsortinginjava classes with the corb distro in a fat jar
+    shadow  "com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"
+    compile "com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"
+    testCompile group: 'junit', name: 'junit', version: '4.13'
+    testCompile 'org.jasypt:jasypt:1.9.3'
+    testCompile 'com.github.stefanbirkner:system-rules:1.19.0' //facilitates tests for methods that invoke System.exit
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 
 test {
-    testLogging {
-        events TestLogEvent.STARTED,TestLogEvent.PASSED
-    }
     //we will run Integration and Performance tests in separate tasks
     exclude '**/*IT.class'
     exclude '**/*PT.class'
 }
 
+// perform token replacement in HTML for JavaScript library version paths
+processResources {
+    with copySpec {
+        from ('src/main/resources/web') {
+            include '*.html'
+        }
+        into ('web')
+        filter(ReplaceTokens, tokens: [ANGULAR_VERSION: angularVersion, BOOTSTRAP_VERSION: bootstrapVersion, JQUERY_VERSION: jqueryVersion])
+    }
+}
+
 //disabling, because we want to incorporate externalsortingjava in uber jar and use as the artifact
 jar.enabled = false
 shadowJar {
     configurations = [project.configurations.compile, project.configurations.shadow]
     dependencies {
         include(dependency("com.google.code.externalsortinginjava:externalsortinginjava:$externalsortinginjavaVersion"))
+        include(dependency('org.webjars:.*'))
     }
     //generate same name as the jar task would
     archiveName = "${baseName}-${version}.${extension}"
@@ -132,15 +150,12 @@ jacocoTestReport {
 }
 
 task integrationTest(type: Test, dependsOn: test) {
-    testClassesDir = sourceSets.integrationTest.output.classesDir
+    testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
     filter {
         //include all integration tests
         includeTestsMatching "*IT"
     }
-    testLogging {
-        events TestLogEvent.STARTED,TestLogEvent.PASSED
-    }
     //If you want to ensure that integration tests are run every time when you invoke
     //this task, uncomment the following line.
     //outputs.upToDateWhen { false }
@@ -159,15 +174,12 @@ task integrationTestReport(type: JacocoReport) {
 }
 
 task performanceTest(type: Test) {
-    testClassesDir = sourceSets.performanceTest.output.classesDir
+    testClassesDirs = sourceSets.performanceTest.output.classesDirs
     classpath = sourceSets.performanceTest.runtimeClasspath
     filter {
         //include all performance tests
         includeTestsMatching "*PT"
     }
-    testLogging {
-        events TestLogEvent.STARTED,TestLogEvent.PASSED
-    }
 
     //If you want to ensure that performance tests are run every time when you invoke
     //this task, uncomment the following line.
@@ -190,8 +202,7 @@ tasks.withType(Test) {
     reports.html.destination = file("${reporting.baseDir}/${name}")
     testLogging {
         // set options for log level LIFECYCLE
-        events TestLogEvent.PASSED,
-               TestLogEvent.FAILED,
+        events TestLogEvent.FAILED,
                TestLogEvent.SKIPPED,
                TestLogEvent.STANDARD_OUT
         showExceptions true
@@ -201,8 +212,7 @@ tasks.withType(Test) {
 
         // set options for log level DEBUG and INFO
         debug {
-            events TestLogEvent.PASSED,
-                   TestLogEvent.FAILED,
+            events TestLogEvent.FAILED,
                    TestLogEvent.SKIPPED,
                    TestLogEvent.STANDARD_OUT,
                    TestLogEvent.STANDARD_ERROR

build.gradle

@@ -4,5 +4,9 @@ publishUrl=file:../gh-pages-marklogic-java/releases
 websiteUrl=https://github.com/marklogic-community/corb2
 vcsUrl=https://github.com/marklogic-community/corb2.git
 issueTrackerUrl=https://github.com/marklogic-community/corb2/issues
+angularVersion=1.7.9
+bootstrapVersion=3.4.1
+externalsortinginjavaVersion=0.4.0
+jqueryVersion=3.4.1
 # 2.1.2 First version built and published with Gradle
-version=2.4.5
+version=2.4.6

gradle.properties

@@ -1,4 +1,4 @@
-#Fri Sep 06 22:31:26 EDT 2019
+#Fri Sep 06 23:18:54 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 /*
- * * Copyright (c) 2004-2019 MarkLogic Corporation
+ * * Copyright (c) 2004-2020 MarkLogic Corporation
  * *
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/developer/corb/AbstractContentSourcePool.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2019 MarkLogic Corporation
+ * Copyright (c) 2004-2020 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/developer/corb/AbstractDecrypter.java

@@ -1,5 +1,5 @@
 /*
-  * * Copyright (c) 2004-2019 MarkLogic Corporation
+  * * Copyright (c) 2004-2020 MarkLogic Corporation
   * *
   * * Licensed under the Apache License, Version 2.0 (the "License");
   * * you may not use this file except in compliance with the License.