Merge branch '4.0'

.travis.yml

@@ -9,14 +9,11 @@ env:
       #travis encrypt -r gchq/event-logging GH_USER_AND_TOKEN="*****"
       #where ***** is '<github username>:<github personal access token>'
       #Required for curling the gh api to get the source of the latest event-logging release
-    #- secure:"fWX4zkuQcHCHMjadg+3Fr13C4m9hwEMWqR1s9mmuxoU9cqV5n1Vv9Gj7gimc82UHgpaRwlfLOfdoLIvQRdUslH8DxrT16dmXnUnmm0NHEDCTC1t/19jExQNRi+jN8vB+KuvVztVTHEoBVb4SY15ca23JQKNMxv7hiC1C6ng5e+d90LWFj3xgaZzhjm3rBy3VlYbymWjhAEX+owncvdWQ8MEoLTgJYQ3uK+xG5rwtAt3Xc4YCbsTXteTdhnZ53WnPYTdZZ6yEegmv+PciBMnl5ypWyCmFvpHl9wMJ3VQRsv6ToI8rdfkIgrCs+mQ1pUrpV3IbR/JgL/uAmu6NW3GuIrLjv83ekvqdFCd9pQmh21JYemtj3Cxd8TJThCevlwP406+LUCZs13ysnbQsaf7PTnpUhiZs6xazWtj273HVGqYKAORfxkReax03V9AWuEyhxUk4e1QqpSwoX/nZ5Txyi6WfFkUJcuW/QgDKpacT7w5yD3ivkwxsCE1O2bn2rR+trG/Xz8dFH1D5uHGTBJD0mTvdjEsCI/lm/59sPgAYwiryJ/mD2wpGsgTJ9ucQD69j2jXeiph/UQ38H0qrl3QdPc5qlxjyZGPKpV7gl6TmXfMHf17SMR+6VKaGcg58MvYyaNNki8CC76ICJToOJY3v5VwL5CYLbBkdrxJeMqscN1w="
       #travis encrypt -r gchq/event-logging GH_USER_AND_TOKEN="<github personal access token>"
-      #Required for curling the gh api to get the source of the latest event-logging release
     #- secure: "TOKbp0kSCBHm6xZHpmj28ZUPC4LpbZItn15Dcyk8sQ9EcYkFdwGEpD/qqkdA+9+GRCFIBmfvfHE1D5qKWICze5IYDgAgAabaDG3zygQ/W7WAyvVSO+4go6ZTZAhm/I/vJ6cwub47aYeV+OO4g+lZcTkWJpwBdJxRsXXFCXU5VRSoBc2hn2wUZuMpdyOpLb6Gs9QpJSnpRbOcXNIupJEc9t1LoO8dvXyJEL4sYLD1YiFammdDW+q/deaevTUJrsvXs1E8lSjyf/qZsUrJqYyzrnV2c2dPb/i/z2QYajPuJv5BlCjVFIROPV+JLepDDAMZGsjaXSNl8AxhYF2lXnQoTMCK8fkaINh2opGwhp7ksOXbpUM5B/x6bORl2wou75dsboMmzycQ08NlwzBrVZ7Lv33a3j02G5cwXKxkoP07VLixqaheOsEEJUINjQNrOuopqQA9v3jBecOBXIPs/SfJCTbu1/s9lFV9Vj5Lghn1VoHoG3n9dS9xPy9BDAf1dJCNNpfL+hDtVA9kx7haZ5Az2ueBMnrRF8TZJizyKvlK+EbXYayTGyxgNlHb6cUuQY0FcFzNnGPcxCvOaw0DW2gicFt1Flz7DYtjdj0037ExSIIm7EA1i9ucP5p/U5JASM66glE5IvnCREMzVZXxflhhEUUqbQ3lexvcZMoIgAl4ink="
 #    - secure: "Dj0AtkItxitrOijaZc/STz/3oUyGBNaB6k3yhgZI3Fw2MDHqqV073nr5xWPawrP2AyQmRE8zRgrvLH7ZpjBcQiJnC2qYBho8Ap5ZpwtQJ6XMpPvKhlG9mXl8CQ31n0gukxJj3jSJn/+R3MPNYPxCUcQ87wOMnveY+0bJhWpfbsJKN/2OMpIc2yie2MUcJ9OpzeSfx/LekxZsTsNai6gMwB6l4l44gB2sBRPL5I3a6UFQHNS1+Z5qrlYraS2KvL2X20nfGG2SpbVfaJneNqISjPUKIsNfR1LYre/nJDSWxCpYjZfuqt6OoH9yUg/jmmKt6Y3+mF4x8/GavOs76ImBeaqBWX/esuyAQEOCfW2pcv2r6EdpGA9BQMCOi1SoEAiJC2kND4Sy+HtEkZ0xVBrAvFT/2v1F5BPu9POzsfw55R5RbwDrBO+N4zMaPtxlo7eUEJ+vPKxOgVJrU9qEIR/GEnwv3z5FXT1YxkmksWjxuXLxZlCO0NHYfB4uwdogmhD9B8dk+ZeF1fee7U088ytsvAk89cQde0CZm9n4by98gwmcopUzyQSuYaxhQHoI9sV9hCaFNwlMXwd39vO8Zbi6Wvf2upAzkgDBwG0SWMDFXppcfT7zxcYQMlouDsFpDLXqnEYTdqEJtSgSLoMCq+LXITzc+FaKu8I127USQIcikwY="
 
 
-
 install: echo "skip 'gradle assemble' step to speed up build"
 
 script: ./travis.script.sh

CHANGELOG.md

@@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-
 ## [v5.0-beta.16_schema-v4.0-beta.3] - 2021-04-23
 
 * Change maven coordinates to `uk.gov.gchq.eventlogging:event-logging` and publish on maven central instead of bintray.
@@ -130,71 +129,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 * Issue **6** : Fix hard coded success value in EventLoggingUtil.createOutcome().
 
-* Revert to Java 8
-
-
-## [v4.0.7_schema-v3.2.4] - 2018-09-07
-
-* Update to Java 10
-
-* Issue **gchq/event-logging-schema#33** : Add content to `ClassificationComplexType` to support richer protective marking schemes
-
-
-## [v4.0.5_schema-v3.2.4] - 2018-09-05
-
-* Added automatic module name for Java 9 builds.
-
-
-## [v3.2.4_schema-v3.2.4] - 2018-05-30
-
-* Fix for log receiver class name.
-
-
-## [v3.2.3_schema-v3.2.4] - 2018-05-22
-
-
-## [v3.2.1_schema-v3.2.4] - 2018-02-15
-
-### Changed
-
-* Uplifted schema to v3.2.4
-
-* Add _-client_ to the end of the `id` attribute value on the `schema` element.
-
+* Revert to java 8
 
-## [v3.2.0_schema-v3.2.0] - 2017-12-21
-
-### Added
-
-* Issue **gchq/event-logging-schema#23** : Add optional `Coordinates` object to the `Location` class to capture latitude/longitude
-
-### Changed
-
-* Uplifted schema to v3.2.0
-
-
-## [v3.1.2_schema-v3.1.2] - 2017-11-28
-
-### Added
-
-* Add Bintray deployment
-
-
-## [v3.1.1_schema-v3.1.2] - 2017-11-14
-
-### Added
-
-* Add sources and javadoc jars
-
-### Changed
-
-* Uplift schema to v3.1.2
-
-* Change build to Gradle
-
-
-## [v3.1.0] - 2017-04-05
-Intial open source release
 
 [Unreleased]: https://github.com/gchq/event-logging/compare/v5.0-beta.16_schema-v4.0-beta.3...HEAD
 [v5.0-beta.16_schema-v4.0-beta.3]: https://github.com/gchq/event-logging/compare/v5.0-beta.15_schema-v4.0-beta.1...v5.0-beta.16_schema-v4.0-beta.3
@@ -213,4 +149,3 @@ Intial open source release
 [v5.0-beta.3_schema-v4.0-beta.1]: https://github.com/gchq/event-logging/compare/v5.0-beta.2_schema-v4.0-beta.1...v5.0-beta.3_schema-v4.0-beta.1
 [v5.0-beta.2_schema-v4.0-beta.1]: https://github.com/gchq/event-logging/compare/v5.0-beta.1_schema-v4.0-beta.1...v5.0-beta.2_schema-v4.0-beta.1
 [v5.0-beta.1_schema-v4.0-beta.1]: https://github.com/gchq/event-logging/compare/v4.0.7_schema-v3.2.4...v5.0-beta.1_schema-v4.0-beta.1
-

build.gradle

@@ -6,6 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath group: 'ca.cutterslade.gradle', name: 'gradle-dependency-analyze', version: '1.5.2'
     }
 }
@@ -68,13 +69,12 @@ ext.getMajorVersion = { versionStr ->
 def eventLoggingSchemaVer = "v4.0-beta.3"
 // *****************************************************************************
 
-
 // Set this to the last release of this repo on this branch, or earlier branches
 // It is used to diff the current jaxb code against the last release so you can
 // see if/how the java model has changed following schema changes or changes
 // to the jaxb code generation.
 // *****************************************************************************
-ext.previousReleaseVersion = "v5.0-beta.15_schema-v4.0-beta.3"
+ext.previousReleaseVersion = "v5.0-beta.16_schema-v4.0-beta.3"
 // *****************************************************************************
 
 
@@ -178,7 +178,6 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'ca.cutterslade.analyze'
     apply plugin: 'idea'
-    //apply plugin: "org.javamodularity.moduleplugin"
 
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -236,7 +235,6 @@ subprojects {
             jcenter()
         }
 
-
         // These commented blocks are for compiling on j9+
         //compileJava {
             //inputs.property("moduleName", moduleName)

diffAgainstLatestRelease.sh

@@ -31,7 +31,14 @@ main() {
   fi
 
   local workingDir=${1}
+
+  # The version tag in github (with a v prefix)
   local prevVersionTag="${2}"
+
+  # Remove the v prefix to get the maven version
+  local mavenVersion=
+  # shellcheck disable=SC2001
+  mavenVersion="$(echo "${prevVersionTag}" | sed 's/^v//' )"
   echo -e "${BLUE}Working directory: ${YELLOW}${workingDir}${NC}"
 
   echo -e "${BLUE}Comparing current JAXB code to release:" \
@@ -46,7 +53,7 @@ main() {
   fi
 
   local apiUrl="${API_URL_BASE}/${prevVersionTag}"
-  local prevVersionJar="event-logging-${prevVersionTag}-sources.jar"
+  local prevVersionJar="event-logging-${mavenVersion}-sources.jar"
 
   echo -e "${BLUE}Using API URL: ${YELLOW}${apiUrl}${NC}"
   echo -e "${BLUE}Searching for file: ${YELLOW}${prevVersionJar}${NC}"
@@ -66,6 +73,9 @@ main() {
     curl -sIL "${extraCurlArgs[@]}" "${apiUrl}"
   fi
 
+
+    curl -s "${extraCurlArgs[@]}" "${apiUrl}"
+
   # Call the github API to git the json for the latest release, 
   # then extract the sources jar binary url from it
   local sourcesJarUrl