Merge branch 'main' into strip-auth-key

Author: daniel-jones-dev

.github/workflows/run_ci.yml

@@ -110,7 +110,7 @@ jobs:
 #           export DEEPL_PROXY_URL=http://deepl-mock:3001
 #           export DEEPL_MOCK_PROXY_SERVER_PORT=3001
 #         fi
-#         ./gradlew test
+#         ./gradlew test -DrunV1ApiTests=true
 #     - name: Stop mock proxy server
 #       if: ${{ matrix.use-mock-server == 'use mock server' }}
 #       run: docker stop deepl-mock-proxy

.gitlab-ci.yml

@@ -6,6 +6,8 @@ include:
   - project: 'deepl/ops/ci-cd-infrastructure/gitlab-ci-lib'
     file:
       - '/templates/.secret-detection.yml'
+      - '/templates/.gitlab-release.yml'
+  - template: Security/SAST.gitlab-ci.yml
 
 # Global --------------------------
 
@@ -15,6 +17,7 @@ image: eclipse-temurin:17-alpine
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
   JAVA_TOOL_OPTIONS: ""
+  GITLAB_ADVANCED_SAST_ENABLED: 'true'
 
 workflow:
   rules:
@@ -77,6 +80,22 @@ secret_detection:
   rules:
     - if: $CI_MERGE_REQUEST_ID
 
+gitlab-advanced-sast:
+  stage: check
+  rules:
+    - when: always
+  variables:
+    SAST_EXCLUDED_PATHS: '$DEFAULT_SAST_EXCLUDED_PATHS'
+    GIT_STRATEGY: clone
+
+semgrep-sast:
+  stage: check
+  rules:
+    - when: always
+  variables:
+    SAST_EXCLUDED_PATHS: '$DEFAULT_SAST_EXCLUDED_PATHS'
+    GIT_STRATEGY: clone
+
 # stage: build ----------------------
 
 .build_base:
@@ -128,7 +147,7 @@ build_manual:
         export DEEPL_PROXY_URL=http://deepl-mock:3001
         export DEEPL_MOCK_PROXY_SERVER_PORT=3001
       fi
-    - ./gradlew test
+    - ./gradlew test -DrunV1ApiTests=true
   artifacts:
     paths:
       - deepl-java/build/reports/tests/test
@@ -207,3 +226,9 @@ publish_manual:
     - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
   script:
     - ./gradlew publish
+
+gitlab release:
+  stage: publish
+  extends: .create_gitlab_release
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'

CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Added
+<!-- * add to here -->
+### Changed
+<!-- * add to here -->
+
+
+## [1.10.1] - 2025-06-18
+### Fixed
+* Fixed `DeepLClient::deleteMultilingualGlossary(String glossaryId)` being package private, made it public instead.
+  * Thanks to [MTSxoff](https://github.com/MTSxoff) for the report in [#68](https://github.com/DeepLcom/deepl-java/issues/68) and the fix in [#69](https://github.com/DeepLcom/deepl-java/pull/69).
+
+
+## [1.10.0] - 2025-04-30
+### Added
+* Added support for the /v3 Multilingual Glossary APIs in the client library
+  while providing backwards compatability for the previous /v2 Glossary
+  endpoints. Please refer to the README or
+  [upgrading_to_multilingual_glossaries.md](upgrading_to_multilingual_glossaries.md)
+  for usage instructions.
+* Added Ukrainian language code
+
+
+## [1.9.0] - 2025-02-21
+### Added
+* Allow specifying the API version to use. This is mostly for users who have an
+  API subscription that includes an API key for CAT tool usage, who need to use
+  the v1 API.
+
 
 ## [1.8.1] - 2025-02-07
 ### Fixed
@@ -143,6 +172,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Initial version.
 
 
+[Unreleased]: https://github.com/DeepLcom/deepl-java/compare/v1.10.1...HEAD
+[1.10.1]: https://github.com/DeepLcom/deepl-java/compare/v1.10.0...v1.10.1
+[1.10.0]: https://github.com/DeepLcom/deepl-java/compare/v1.9.0...v1.10.0
+[1.9.0]: https://github.com/DeepLcom/deepl-java/compare/v1.8.1...v1.9.0
 [1.8.1]: https://github.com/DeepLcom/deepl-java/compare/v1.8.0...v1.8.1
 [1.8.0]: https://github.com/DeepLcom/deepl-java/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/DeepLcom/deepl-java/compare/v1.6.0...v1.7.0