Update to master branch in Particify Gitlab repository

.gitlab-ci.yml

@@ -1,32 +1,113 @@
 variables:
  OUTPUT_DIR: "*/build"
  GRADLE_USER_HOME: .gradle-user-home
+ GRADLE_OPTS: -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false
+ GRADLE_CLI_OPTS: --no-daemon --console=plain
 
-.gradle_cache: &gradle_cache
- paths:
- - .gradle/
- - $GRADLE_USER_HOME/
+.gradle:
+ image: gradle:6.8-jdk8
+ cache:
+ key: gradle-global-cache
+ paths:
+ - $GRADLE_USER_HOME/caches
 
 compile:
+ extends: .gradle
  stage: build
- tags:
- - gradle
  artifacts:
  paths:
  - $OUTPUT_DIR
- cache: *gradle_cache
  script:
- - gradle xjc assemble
+ - gradle $GRADLE_CLI_OPTS assemble
 
 unit_test:
+ extends: .gradle
  stage: test
- tags:
- - gradle
  dependencies:
  - compile
  artifacts:
  paths:
- - $OUTPUT_DIR
- cache: *gradle_cache
+ - $OUTPUT_DIR/jacoco
+ - $OUTPUT_DIR/reports
+ - $OUTPUT_DIR/test-results
+ reports:
+ junit: $OUTPUT_DIR/test-results/test/TEST-*.xml
+ coverage: '/Code coverage: \d+\.\d+/'
+ script:
+ - gradle $GRADLE_CLI_OPTS test jacocoTestReport -x compileJava -x classes -x jar
+ - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "Instructions covered:", covered, "/", instructions; print "Code coverage:", 100 * covered / instructions "%" }' $OUTPUT_DIR/reports/jacoco/test/jacocoTestReport.csv
+
+maven_publish:
+ extends: .gradle
+ stage: deploy
+ rules:
+ - if: $CI_MERGE_REQUEST_ID
+ when: never
+ # Automatically publish snapshot packages for the master branch
+ - if: $CI_COMMIT_REF_NAME == "master"
+ when: on_success
+ # Publish packages for releases on-demand
+ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^[0-9]+\.[0-9]+$/
+ when: manual
+ # Do not publish packages for topic branches
+ - when: never
+ dependencies:
+ - compile
  script:
- - gradle test
+ - gradle $GRADLE_CLI_OPTS publish -x jar -x war -PgitlabHostUrl=$CI_SERVER_URL -PgitlabProjectId=$CI_PROJECT_ID -PgitlabAuthToken=$CI_JOB_TOKEN
+
+.docker_image:
+ extends: .gradle
+ stage: deploy
+ variables:
+ DOCKER_IMAGE: $CI_REGISTRY/$CI_PROJECT_PATH
+ DOCKER_TAG: $CI_COMMIT_REF_SLUG
+ dependencies:
+ - compile
+ allow_failure: true
+ script:
+ - "echo Creation time for image: `git log -1 --format=%cI`"
+ - "echo Tag for image: $DOCKER_TAG"
+ - 'if [ -n "$DOCKER_ADDITIONAL_TAGS" ]; then echo "Additional tags: $DOCKER_ADDITIONAL_TAGS"; fi'
+ - gradle $GRADLE_CLI_OPTS jib -x classes -x jar -x war
+ -Djib.to.auth.username="$CI_REGISTRY_USER"
+ -Djib.to.auth.password="$CI_REGISTRY_PASSWORD"
+ -Djib.to.image="$DOCKER_IMAGE:$DOCKER_TAG"
+ -Djib.container.creationTime="`git log -1 --format=%cI`"
+ $GRADLE_JIB_OPTS
+
+docker_image:
+ extends: .docker_image
+ rules:
+ - if: $CI_MERGE_REQUEST_ID
+ when: never
+ # Automatically build images for the master branch
+ - if: $CI_COMMIT_REF_NAME == "master"
+ when: on_success
+ # Exclude refs conflicting with Docker tags for releases
+ - if: $CI_COMMIT_REF_NAME == "latest" || $CI_COMMIT_REF_NAME =~ /^v[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^[0-9]+\.[0-9]+$/
+ when: never
+ # Build topic branch images on-demand
+ - when: manual
+ before_script:
+ - DOCKER_ADDITIONAL_TAGS=
+ - GRADLE_JIB_OPTS=
+
+docker_image_release:
+ extends: .docker_image
+ only:
+ - /^v[0-9]+(\.[0-9]+){2}$/
+ except:
+ - branches
+ when: manual
+ before_script:
+ - VERSION=`echo $CI_COMMIT_REF_NAME | cut -c2-`
+ - V_MINOR=`echo $VERSION | cut -d . -f 1,2`
+ - V_MAJOR=`echo $V_MINOR | cut -d . -f 1`
+ - DOCKER_TAG=$VERSION
+ - DOCKER_ADDITIONAL_TAGS=
+ - if [ -n "$TAG_MINOR" ]; then DOCKER_ADDITIONAL_TAGS=$DOCKER_ADDITIONAL_TAGS,$V_MINOR; fi
+ - if [ -n "$TAG_MAJOR" ]; then DOCKER_ADDITIONAL_TAGS=$DOCKER_ADDITIONAL_TAGS,$V_MAJOR; fi
+ - if [ -n "$TAG_LATEST" ]; then DOCKER_ADDITIONAL_TAGS=$DOCKER_ADDITIONAL_TAGS,latest; fi
+ - DOCKER_ADDITIONAL_TAGS=`echo $DOCKER_ADDITIONAL_TAGS | cut -c2-`
+ - if [ -n "$DOCKER_ADDITIONAL_TAGS" ]; then GRADLE_JIB_OPTS=-Djib.to.tags=$DOCKER_ADDITIONAL_TAGS; fi

CHANGELOG.adoc

@@ -0,0 +1,47 @@
+= Changelog
+
+== 1.0.2
+
+This is a maintenance release which only brings libraries up to date to
+fix potential bugs.
+
+== 1.0.1
+
+This is a maintenance release which only brings libraries up to date to
+fix potential bugs.
+
+== 1.0
+
+This is the first stable release of LMS Connector. It introduces a lot
+of changes since the latest pre-release.
+
+=== New Features and Improvements
+* Java 11 is supported.
+* Start and end dates of courses are retrieved from the LMS's and have
+ been added to the API.
+* The configuration file uses YAML format. Its location is set as a
+ Java system property.
+* Optimized SQL queries for performance.
+* The mapping of Moodle user role IDs can be changed in configuration.
+* The client library uses annotations to support caching of course and
+ membership data.
+* Frameworks and libraries have been updated.
+
+=== Bug Fixes
+* A NullPointerException, which was caused by the SQL query for Moodle
+ course memberships in some cases, has been fixed.
+* A compatibility issue with the PostgreSQL JDBC driver has been fixed.
+
+=== Removed Features
+* The deprecated Stud.IP REST API plugin is no longer supported.
+* Ilias integration was removed because its feature set was not
+ consistent with integrations for other LMS's. It might resurface in a
+ future release.
+* Token authentication is no longer supported.
+* LDAP is no longer supported.
+* CORS HTTP headers are no longer set.
+
+=== Contributions
+Lead development:
+Daniel Gerhardt (https://particify.com[Particify]),
+Paul-Christian Volkmer

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2013-2020 Daniel Gerhardt, Paul-Christian Volkmer and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.