diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml index c3efb5f..3f7c499 100644 --- a/.github/workflows/build-dev-release.yml +++ b/.github/workflows/build-dev-release.yml @@ -4,8 +4,10 @@ on: workflow_dispatch jobs: build: - uses: th2-net/.github/.github/workflows/compound-java.yml@main + uses: th2-net/.github/.github/workflows/compound-java.yml@integration-tests # FIXME: switch to main branch with: + integration-test-enabled: true + integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']" build-target: 'Docker' devRelease: true createTag: true diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index e7333cf..2d2d714 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -4,8 +4,10 @@ on: workflow_dispatch jobs: build: - uses: th2-net/.github/.github/workflows/compound-java.yml@main + uses: th2-net/.github/.github/workflows/compound-java.yml@integration-tests # FIXME: switch to main branch with: + integration-test-enabled: true + integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']" build-target: 'Docker' devRelease: false createTag: true diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml index 8779a7a..eb3569d 100644 --- a/.github/workflows/build-sanpshot.yml +++ b/.github/workflows/build-sanpshot.yml @@ -11,8 +11,12 @@ on: jobs: build-job: - uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main + uses: th2-net/.github/.github/workflows/compound-java-dev.yml@integration-tests # FIXME: switch to main branch with: + integration-test-enabled: true + scanner-enabled: false + strict-scanner: false + integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']" build-target: 'Docker' docker-username: ${{ github.actor }} secrets: diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml deleted file mode 100644 index e037f04..0000000 --- a/.github/workflows/integration-tests.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Run integration tests for cradle admin tool" - -on: - push: - branches: - - '*' - -jobs: - tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 'zulu' '11' - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: '11' - - name: Setup Gradle - uses: gradle/gradle-build-action@v3 - - name: Build with Gradle - run: ./gradlew --info clean integrationTest - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: integration-test-results - path: build/reports/tests/integrationTest/ diff --git a/README.md b/README.md index 9b05453..5e2ddbb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# th2-cradle-admin 1.11.2 +# th2-cradle-admin 2.0.0 The th2-cradle-admin is a set of projects for managing books and pages in th2 storage. @@ -70,6 +70,11 @@ spec: ## Release notes: +### 2.0.0-dev +* Updated: + * migrated to jetty: `11.0.24` + * Cradle API to `5.4.4-dev` + ### 1.11.2-dev * Included scripts for REST API interaction and installed required utils into docker image diff --git a/build.gradle b/build.gradle index 55cfe11..55e15f9 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ subprojects { implementation(libs.cradle.cassandra) implementation "org.slf4j:slf4j-api" - testImplementation(libs.junit.jupiter.integration) + testImplementation(libs.th2.junit.jupiter.integration) testImplementation(libs.mockito.core) testImplementation(libs.mockito.junit.jupiter) @@ -60,6 +60,8 @@ subprojects { tasks.register('integrationTest', Test) { group = 'verification' + systemProperty 'datastax-java-driver.advanced.connection.init-query-timeout', '5 seconds' + systemProperty 'datastax-java-driver.basic.request.timeout', '10 seconds' useJUnitPlatform { includeTags('integration') } diff --git a/cradle-admin-tool-http/README.md b/cradle-admin-tool-http/README.md index 8a5c771..8336dd3 100644 --- a/cradle-admin-tool-http/README.md +++ b/cradle-admin-tool-http/README.md @@ -1,4 +1,4 @@ -# cradle-admin-tool-http (1.11.1-dev) +# cradle-admin-tool-http (2.0.0-dev) Service which allows user to manage books/pages via RestAPI requests. - The first page in a book can be created only if start time is more than current time. - After the first page all new pages must have start time more than current time + `bookRefreshIntervalMillis` * 2 @@ -76,6 +76,13 @@ Help: ## Release notes +### 2.0.0-dev +* Updated: + * migrated to jetty: `11.0.24` + * th2-gradle-plugin: `0.1.6` (th2-bom: `4.9.0`) + * Cradle API to `5.4.4-dev` + * jackson-datatype-jsr310: `2.18.2` + ### 1.11.1-dev + Updated: diff --git a/cradle-admin-tool-http/build.gradle b/cradle-admin-tool-http/build.gradle index 47c6beb..cfb6c27 100644 --- a/cradle-admin-tool-http/build.gradle +++ b/cradle-admin-tool-http/build.gradle @@ -1,6 +1,6 @@ plugins { id 'application' - id 'com.exactpro.th2.gradle.component' + alias(libs.plugins.th2.component) } dependencies { @@ -18,8 +18,6 @@ dependencies { implementation 'org.apache.commons:commons-lang3' testImplementation project(':cradle-admin-tool-test') - //noinspection DependencyNotationArgument - testImplementation group: "org.eclipse.jetty", name: "jetty-http", classifier: "tests" testImplementation "org.eclipse.jetty:jetty-util" } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/HttpServer.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/HttpServer.java index 2a3c456..3c421b1 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/HttpServer.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/HttpServer.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2023 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,12 +12,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http; import com.exactpro.cradle.CradleStorage; -import com.exactpro.th2.cradle.adm.http.servlets.*; +import com.exactpro.th2.cradle.adm.http.servlets.GetBookInfoServlet; +import com.exactpro.th2.cradle.adm.http.servlets.GetBookServlet; +import com.exactpro.th2.cradle.adm.http.servlets.ListAllBookSchemasServlet; +import com.exactpro.th2.cradle.adm.http.servlets.NewBookServlet; +import com.exactpro.th2.cradle.adm.http.servlets.NewPageServlet; +import com.exactpro.th2.cradle.adm.http.servlets.RemovePageServlet; +import com.exactpro.th2.cradle.adm.http.servlets.UpdatePageServlet; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -28,11 +34,12 @@ public class HttpServer implements AutoCloseable { - private static final Logger logger = LoggerFactory.getLogger(HttpServer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HttpServer.class); private final Configuration configuration; private final CradleStorage storage; protected Server server; + protected ServerConnector serverConnector; public HttpServer(Configuration configuration, CradleStorage storage) { this.configuration = configuration; @@ -42,7 +49,7 @@ public HttpServer(Configuration configuration, CradleStorage storage) { protected void createServer() { this.server = new Server(); - ServerConnector serverConnector = new ServerConnector(this.server); + serverConnector = new ServerConnector(this.server); serverConnector.setHost(configuration.getIp()); serverConnector.setPort(configuration.getPort()); @@ -63,11 +70,20 @@ public void run() throws Exception { servletHandler.addServletWithMapping(new ServletHolder(new UpdatePageServlet(storage)), "/update-page"); server.start(); - logger.info("server started: http://{}:{}/", configuration.getIp(), configuration.getPort()); + LOGGER.info("server started: http://{}:{}/", configuration.getIp(), configuration.getPort()); } @Override - public void close() throws Exception { - server.stop(); + public void close() { + try { + server.stop(); + } catch (Exception e) { + LOGGER.error("Stop server failure", e); + } + try { + serverConnector.close(); + } catch (Exception e) { + LOGGER.error("Close server connector failure", e); + } } } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/InvalidQueryException.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/InvalidQueryException.java deleted file mode 100644 index fe56b9e..0000000 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/InvalidQueryException.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - ******************************************************************************/ - -package com.exactpro.th2.cradle.adm.http; - -public class InvalidQueryException { -} diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetAllBooksHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetAllBooksHttpMode.java index 26cb32f..80dd425 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetAllBooksHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetAllBooksHttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2022-2022 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; @@ -21,8 +21,7 @@ import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder; import com.exactpro.th2.cradle.adm.modes.GetAllBooksMode; import com.exactpro.th2.cradle.adm.params.GetAllBooksParams; - -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class GetAllBooksHttpMode extends GetAllBooksMode implements HttpMode { @@ -32,8 +31,7 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetBookInfoHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetBookInfoHttpMode.java index a23912f..7277bb3 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetBookInfoHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetBookInfoHttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2022-2022 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; @@ -23,7 +23,7 @@ import com.exactpro.th2.cradle.adm.params.GetBookInfoParams; import com.exactpro.th2.cradle.adm.results.BooksListInfo; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class GetBookInfoHttpMode extends GetBookInfoMode implements HttpMode { @@ -33,9 +33,8 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } @Override diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/HttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/HttpMode.java index f67d838..45318e2 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/HttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/HttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,19 +12,19 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder; +import jakarta.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequest; public interface HttpMode { HttpParamBuilder createParamsBuilder(); - boolean initParams(HttpServletRequest commandLine) throws InvalidConfigurationException; + void initParams(HttpServletRequest commandLine) throws InvalidConfigurationException; default T getParams(HttpServletRequest commandLine) throws InvalidConfigurationException { var builder = createParamsBuilder(); diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/ListAllBookSchemasHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/ListAllBookSchemasHttpMode.java index ea0323d..f4043f7 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/ListAllBookSchemasHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/ListAllBookSchemasHttpMode.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.modes; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; @@ -7,7 +23,7 @@ import com.exactpro.th2.cradle.adm.params.NoParams; import com.exactpro.th2.cradle.adm.results.BookSchemaInfo; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ListAllBookSchemasHttpMode extends ListAllBookSchemasMode implements HttpMode { @@ -22,8 +38,7 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest commandLine) throws InvalidConfigurationException { + public void initParams(HttpServletRequest commandLine) throws InvalidConfigurationException { this.param = getParams(commandLine); - return true; } } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewBookCreationHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewBookCreationHttpMode.java index 57ad0ad..0281e06 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewBookCreationHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewBookCreationHttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; @@ -21,10 +21,8 @@ import com.exactpro.th2.cradle.adm.http.params.NewBookCreationParamsBuilder; import com.exactpro.th2.cradle.adm.modes.NewBookCreationMode; import com.exactpro.th2.cradle.adm.params.NewBookCreationParams; -import com.exactpro.th2.cradle.adm.results.SimpleResult; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; +import jakarta.servlet.http.HttpServletRequest; public class NewBookCreationHttpMode extends NewBookCreationMode implements HttpMode { @@ -34,8 +32,7 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewPageCreationHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewPageCreationHttpMode.java index c57574c..ff8432f 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewPageCreationHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/NewPageCreationHttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,25 +12,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; -import com.exactpro.cradle.BookId; -import com.exactpro.cradle.BookInfo; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder; -import com.exactpro.th2.cradle.adm.http.params.NewBookCreationParamsBuilder; import com.exactpro.th2.cradle.adm.http.params.NewPageCreationParamsBuilder; -import com.exactpro.th2.cradle.adm.modes.NewBookCreationMode; import com.exactpro.th2.cradle.adm.modes.NewPageCreationMode; -import com.exactpro.th2.cradle.adm.params.NewBookCreationParams; import com.exactpro.th2.cradle.adm.params.NewPageParams; import com.exactpro.th2.cradle.adm.results.SimpleResult; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.util.Collection; +import jakarta.servlet.http.HttpServletRequest; public class NewPageCreationHttpMode extends NewPageCreationMode implements HttpMode { @@ -40,9 +33,8 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } @Override diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/RemovePageHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/RemovePageHttpMode.java index f8f7dee..804f612 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/RemovePageHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/RemovePageHttpMode.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2022-2022 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,20 +12,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.modes; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder; -import com.exactpro.th2.cradle.adm.http.params.NewPageCreationParamsBuilder; import com.exactpro.th2.cradle.adm.http.params.RemovePageParamsBuilder; import com.exactpro.th2.cradle.adm.modes.RemovePageMode; -import com.exactpro.th2.cradle.adm.params.NewPageParams; import com.exactpro.th2.cradle.adm.params.RemovePageParams; import com.exactpro.th2.cradle.adm.results.SimpleResult; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class RemovePageHttpMode extends RemovePageMode implements HttpMode { @@ -35,9 +33,8 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } @Override diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/UpdatePageHttpMode.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/UpdatePageHttpMode.java index c85b29e..cf5e0b4 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/UpdatePageHttpMode.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/UpdatePageHttpMode.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.modes; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; @@ -6,7 +22,7 @@ import com.exactpro.th2.cradle.adm.modes.UpdatePageMode; import com.exactpro.th2.cradle.adm.params.UpdatePageParams; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class UpdatePageHttpMode extends UpdatePageMode implements HttpMode { @Override @@ -15,8 +31,7 @@ public HttpParamBuilder createParamsBuilder() { } @Override - public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException { + public void initParams(HttpServletRequest req) throws InvalidConfigurationException { this.param = getParams(req); - return true; } } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetAllBooksParamBuilder.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetAllBooksParamBuilder.java index 62138ad..943cdca 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetAllBooksParamBuilder.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetAllBooksParamBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.params; import com.exactpro.th2.cradle.adm.params.GetAllBooksParams; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetBookInfoParamsBuilder.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetBookInfoParamsBuilder.java index 7593a48..8adbc9c 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetBookInfoParamsBuilder.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/GetBookInfoParamsBuilder.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2022-2022 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,15 +12,14 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.params; import com.exactpro.th2.cradle.adm.params.GetBookInfoParams; import com.exactpro.th2.cradle.adm.params.ParamUtils; -import com.exactpro.th2.cradle.adm.params.RemovePageParams; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Map; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/HttpParamBuilder.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/HttpParamBuilder.java index 995c721..31d5ab3 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/HttpParamBuilder.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/HttpParamBuilder.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,14 +12,14 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.params; import com.exactpro.th2.cradle.adm.InvalidConfigurationException; import com.exactpro.th2.cradle.adm.http.servlets.ServletUtils; +import jakarta.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/NoParamsBuilder.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/NoParamsBuilder.java index 4554b53..592076a 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/NoParamsBuilder.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/NoParamsBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.params; import com.exactpro.th2.cradle.adm.params.NoParams; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/UpdatePageParamsBuilder.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/UpdatePageParamsBuilder.java index daefb98..21fe38a 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/UpdatePageParamsBuilder.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/params/UpdatePageParamsBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.params; import com.exactpro.cradle.BookId; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookInfoServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookInfoServlet.java index d32861d..a55a623 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookInfoServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookInfoServlet.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,35 +12,17 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; -import com.exactpro.th2.cradle.adm.http.modes.GetAllBooksHttpMode; import com.exactpro.th2.cradle.adm.http.modes.GetBookInfoHttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; -import com.exactpro.th2.cradle.adm.modes.GetAllBooksMode; -import com.exactpro.th2.cradle.adm.results.BooksListInfo; -import com.exactpro.th2.cradle.adm.results.ResultBookInfo; -import com.exactpro.th2.cradle.adm.results.SimpleResult; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import org.eclipse.jetty.http.HttpStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.List; public class GetBookInfoServlet extends GetBookServlet { - private static final Logger logger = LoggerFactory.getLogger(GetBookInfoServlet.class); - - public GetBookInfoServlet(CradleStorage storage) { + public GetBookInfoServlet(CradleStorage storage) { super(storage); } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookServlet.java index 153276a..ff67756 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/GetBookServlet.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,25 +12,24 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; import com.exactpro.th2.cradle.adm.http.modes.GetAllBooksHttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; -import com.exactpro.th2.cradle.adm.modes.GetAllBooksMode; import com.exactpro.th2.cradle.adm.results.BooksListInfo; import com.exactpro.th2.cradle.adm.results.ResultBookInfo; import com.exactpro.th2.cradle.adm.results.SimpleResult; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.List; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ListAllBookSchemasServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ListAllBookSchemasServlet.java index 6450387..4a91d36 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ListAllBookSchemasServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ListAllBookSchemasServlet.java @@ -1,13 +1,26 @@ +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; import com.exactpro.th2.cradle.adm.http.modes.ListAllBookSchemasHttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ListAllBookSchemasServlet extends SimpleHttpServlet{ - private static final Logger logger = LoggerFactory.getLogger(ListAllBookSchemasServlet.class); public ListAllBookSchemasServlet(CradleStorage storage) { super(storage); diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewBookServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewBookServlet.java index 4d1b7c2..4d79969 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewBookServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewBookServlet.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,22 +12,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; import com.exactpro.th2.cradle.adm.http.modes.NewBookCreationHttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class NewBookServlet extends SimpleHttpServlet { - private static final Logger logger = LoggerFactory.getLogger(NewBookServlet.class); - - public NewBookServlet(CradleStorage storage) { + public NewBookServlet(CradleStorage storage) { super(storage); } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewPageServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewPageServlet.java index 2a3a9d0..5a48a85 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewPageServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/NewPageServlet.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,22 +12,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; import com.exactpro.th2.cradle.adm.http.modes.NewPageCreationHttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class NewPageServlet extends SimpleHttpServlet { - private static final Logger logger = LoggerFactory.getLogger(NewBookServlet.class); - - public NewPageServlet(CradleStorage storage) { + public NewPageServlet(CradleStorage storage) { super(storage); } diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ServletUtils.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ServletUtils.java index c97f6f2..7e4c433 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ServletUtils.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/ServletUtils.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,11 +12,12 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; + import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/SimpleHttpServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/SimpleHttpServlet.java index 12623d0..d0b7933 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/SimpleHttpServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/SimpleHttpServlet.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +/* + * Copyright 2021-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package com.exactpro.th2.cradle.adm.http.servlets; @@ -21,13 +21,13 @@ import com.exactpro.th2.cradle.adm.http.modes.HttpMode; import com.exactpro.th2.cradle.adm.modes.AbstractMode; import com.exactpro.th2.cradle.adm.results.SimpleResult; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/UpdatePageServlet.java b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/UpdatePageServlet.java index c1cd5d8..79f9283 100644 --- a/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/UpdatePageServlet.java +++ b/cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/servlets/UpdatePageServlet.java @@ -1,3 +1,18 @@ +/* + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.exactpro.th2.cradle.adm.http.servlets; import com.exactpro.cradle.CradleStorage; diff --git a/gradle.properties b/gradle.properties index 3bcf055..573e6c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -release_version = 1.11.2 \ No newline at end of file +release_version = 2.0.0 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa3047a..be4d101 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,15 +5,15 @@ cradle = "5.4.3-dev" [libraries] th2-common = { group = "com.exactpro.th2", name = "common", version = "5.14.0-dev" } +th2-junit-jupiter-integration = { group = "com.exactpro.th2", name = "junit-jupiter-integration", version = "0.0.1" } cradle-cassandra = { group = "com.exactpro.th2", name = "cradle-cassandra", version.ref = "cradle" } cradle-core = { group = "com.exactpro.th2", name = "cradle-core", version.ref = "cradle" } -junit-jupiter-integration = { group = "com.exactpro.th2", name = "junit-jupiter-integration", version = "0.0.1" } jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version = "2.18.2" } commons-cli = { group = "commons-cli", name = "commons-cli", version = "1.9.0" } junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.12.0" } mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" } -jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "9.4.56.v20240826" } +jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "11.0.24" } [plugins] th2-base = { id = "com.exactpro.th2.gradle.base", version.ref = "th2-plugin" }