diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d496f82..19f9d9e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -66,10 +66,10 @@ jobs: while ! mysqladmin ping -h"${{ env.MYSQL_HOST }}" -P"${{ env.MYSQL_PORT }}" --silent; do sleep 1 done - - name: Set up JDK 11 # Installs java 11 + - name: Set up JDK 17 # Installs java 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: MySQL Setup (SUDO) # Sets ONLY_FULL_GROUP_BY flag and gives runner privileges over database run: | sudo mysql -e "SET GLOBAL sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));" -h ${{ env.MYSQL_HOST }} -P ${{ env.MYSQL_PORT }} -p${{ env.MYSQL_ROOT_PASSWORD }}; diff --git a/CHANGELOG.md b/CHANGELOG.md index 8923cd2..ea60087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to irida-galaxy-importer will be documeted in this file. +## 2.2.0 +* Removed log-file parameter and un hidden output parameter +* Updated IRIDA's integration test java version from 11 to 17 + ## 2.1.0 * Added in support for importing IRIDA files that are not available locally (i.e. in the cloud) * Switched from travisCI tests to Github Actions diff --git a/irida_import/irida_import.xml.sample b/irida_import/irida_import.xml.sample index ffa3a30..36e265f 100644 --- a/irida_import/irida_import.xml.sample +++ b/irida_import/irida_import.xml.sample @@ -1,10 +1,9 @@ - + server @@ -15,8 +14,7 @@ - diff --git a/irida_import/tests/integration/create_client.sql b/irida_import/tests/integration/create_client.sql index 6b9d0e9..f7b86ff 100644 --- a/irida_import/tests/integration/create_client.sql +++ b/irida_import/tests/integration/create_client.sql @@ -9,4 +9,4 @@ INSERT INTO client_details_grant_types (client_details_id,grant_value) VALUES (2 INSERT INTO client_details_scope (client_details_id,scope) VALUES (2,"read"); -- user -- password encryption of `password1` -INSERT INTO user (`createdDate`, `modifiedDate`, `email`, `firstName`, `lastName`, `locale`, `password`, `phoneNumber`, `username`, `enabled`, `system_role`, `credentialsNonExpired`) VALUES (now(), now() , 'jeffrey.thiessen@phac-aspc.gc.ca', 'Jeffrey', 'Thiessen', 'en', '$2a$10$yvzFLxWA9m2wNQmHpJtWT.MRZv8qV8Mo3EMB6HTkDnUbi9aBrbWWW', '0000', 'jeff', 1, 'ROLE_ADMIN', 1); +INSERT INTO user (`createdDate`, `modifiedDate`, `email`, `firstName`, `lastName`, `locale`, `password`, `phoneNumber`, `username`, `enabled`, `system_role`, `credentialsNonExpired`, `user_type`) VALUES (now(), now() , 'jeffrey.thiessen@phac-aspc.gc.ca', 'Jeffrey', 'Thiessen', 'en', '$2a$10$yvzFLxWA9m2wNQmHpJtWT.MRZv8qV8Mo3EMB6HTkDnUbi9aBrbWWW', '0000', 'jeff', 1, 'ROLE_ADMIN', 1, 'TYPE_LOCAL');