From 03fbbedb83288ae605f662433f94078a51b298f4 Mon Sep 17 00:00:00 2001 From: YevhenHrytsai <142490819+YevhenHrytsai@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:45:36 +0300 Subject: [PATCH 1/4] Adoption to Jira 10.0.0-m0009 (#397) Co-authored-by: Yevhen Hrytsai --- .github/workflows/all-tests.yml | 5 ++--- bin/build/prepare-matrices.sh | 19 ------------------- .../pom.xml | 8 +++++++- .../SlackGlobalAdminDataProvider.java | 2 +- .../slack/web/panels/IssueWebPanel.java | 2 +- .../src/main/resources/atlassian-plugin.xml | 5 +++++ .../issuefilter/impl/JqlIssueFilterTest.java | 2 +- .../task/impl/DefaultTaskBuilderTest.java | 2 ++ jira-slack-server-integration/pom.xml | 6 +++--- .../rest/RequestCachingServletFilter.java | 10 ++-------- .../main/resources/admin/configure-slack.vm | 2 +- .../admin/connect/connect-workspace.vm | 2 +- 12 files changed, 26 insertions(+), 39 deletions(-) delete mode 100755 bin/build/prepare-matrices.sh diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 920c64e8..5fedb21a 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -58,13 +58,12 @@ jobs: name: Jira runs-on: ubuntu-20.04 timeout-minutes: 30 - # Disabled until Jira version is available - if: (github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-jira')) && false + if: github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-jira') needs: unit-tests strategy: matrix: java-version: [17] - jira-version: [10.0.0] + jira-version: [10.0.0-m0009] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/bin/build/prepare-matrices.sh b/bin/build/prepare-matrices.sh deleted file mode 100755 index df405495..00000000 --- a/bin/build/prepare-matrices.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -matrix_file='bin/build/java-product-matrix.json' - -# Get slack plugin major common version -pl_common_version=$(. bin/build/get-plugin-major-version.sh common) -if [ $pl_common_version -gt 1 ]; then - matrix_key='current' -# TODO: Remove these flags when new major jira (10.x) is released - echo "skip-jira-its=true" >> $GITHUB_OUTPUT -else - matrix_key='old' -fi -echo "Matrix key - $matrix_key" - -echo "unit-tests-matrix=$(jq --compact-output --arg v "$matrix_key" '.[$v]."unit-tests"' $matrix_file)" >> $GITHUB_OUTPUT -echo "jira-it-matrix=$(jq --compact-output --arg v "$matrix_key" '.[$v]."jira-it"' $matrix_file)" >> $GITHUB_OUTPUT -echo "confluence-it-matrix=$(jq --compact-output --arg v "$matrix_key" '.[$v]."confluence-it"' $matrix_file)" >> $GITHUB_OUTPUT -echo "bitbucket-it-matrix=$(jq --compact-output --arg v "$matrix_key" '.[$v]."bitbucket-it"' $matrix_file)" >> $GITHUB_OUTPUT \ No newline at end of file diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml index 8cdd6a6c..12177c13 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml @@ -395,6 +395,12 @@ ${jvm17.opens} -Xmx2g + + com.atlassian.security:atlassian-secure-random + commons-codec:commons-codec + com.google.code.gson:gson + + com.atlassian.jira @@ -640,7 +646,7 @@ - 8.10.4 + 9.0.3 ${project.basedir}/../.. yyyy-MM-dd'T'HH:mm:ss.SSSZ ${maven.build.timestamp} diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java index 70a488d7..921beee3 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java @@ -98,7 +98,7 @@ private String getProjectsFieldHtml() { .build(); // We pass new JiraWebActionSupport() so the template has access to i18n - final JiraWebActionSupport fakeAction = new JiraWebActionSupport(); + final JiraWebActionSupport fakeAction = new JiraWebActionSupport() {}; ActionContext.getValueStack().pushValue(fakeAction); return projectField.getCreateHtml(null, operationContext, fakeAction, null, displayParameters); } diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/panels/IssueWebPanel.java b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/panels/IssueWebPanel.java index 6487780a..07ad187e 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/panels/IssueWebPanel.java +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/java/com/atlassian/jira/plugins/slack/web/panels/IssueWebPanel.java @@ -1,6 +1,6 @@ package com.atlassian.jira.plugins.slack.web.panels; -import com.atlassian.plugin.web.model.WebPanel; +import com.atlassian.plugin.web.api.model.WebPanel; import com.atlassian.webresource.api.assembler.PageBuilderService; import java.io.IOException; diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/atlassian-plugin.xml b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/atlassian-plugin.xml index 04518ac9..a6ee6a87 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/atlassian-plugin.xml +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/atlassian-plugin.xml @@ -790,4 +790,9 @@ /* REQUEST + + + com.atlassian.jira.plugins.slack.spi.impl.JiraSlackPluginResourceProvider#getPluginKey() + + diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java index db203129..76a0ca8a 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; @PrepareForTest({JqlIssueFilter.class, JqlQueryBuilder.class}) -@PowerMockIgnore("javax.*") +@PowerMockIgnore({"javax.*", "org.xml.*", "org.w3c.*"}) @RunWith(PowerMockRunner.class) public class JqlIssueFilterTest { @Mock diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/task/impl/DefaultTaskBuilderTest.java b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/task/impl/DefaultTaskBuilderTest.java index 8920d302..cdc95366 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/task/impl/DefaultTaskBuilderTest.java +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/com/atlassian/jira/plugins/slack/service/task/impl/DefaultTaskBuilderTest.java @@ -24,6 +24,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -35,6 +36,7 @@ import static org.junit.Assert.assertThat; @PrepareForTest({DefaultTaskBuilder.class, SendNotificationTask.class}) +@PowerMockIgnore({"javax.*", "org.xml.*", "org.w3c.*"}) @RunWith(PowerMockRunner.class) public class DefaultTaskBuilderTest { @Mock diff --git a/jira-slack-server-integration/pom.xml b/jira-slack-server-integration/pom.xml index cab26a93..5ad0c37e 100644 --- a/jira-slack-server-integration/pom.xml +++ b/jira-slack-server-integration/pom.xml @@ -22,12 +22,12 @@ 5.1.3 - 10.0.0-QR-20240423065758 - 8.2.2 + 10.0.0-m0009 + 10.0.3 ${jira.version} - 10.0.0-QR-20240423065758 + 10.0.0-m0009 ${jira.version} diff --git a/slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/rest/RequestCachingServletFilter.java b/slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/rest/RequestCachingServletFilter.java index 8ce42001..36e36501 100644 --- a/slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/rest/RequestCachingServletFilter.java +++ b/slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/rest/RequestCachingServletFilter.java @@ -1,10 +1,10 @@ package com.atlassian.plugins.slack.rest; +import com.atlassian.annotations.security.UnrestrictedAccess; import org.apache.commons.lang3.StringUtils; import javax.servlet.Filter; import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -13,6 +13,7 @@ import static com.github.seratch.jslack.app_backend.SlackSignature.HeaderNames.X_SLACK_SIGNATURE; +@UnrestrictedAccess public class RequestCachingServletFilter implements Filter { private final RequestHolder requestHolder; @@ -20,10 +21,6 @@ public RequestCachingServletFilter(final RequestHolder requestHolder) { this.requestHolder = requestHolder; } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } - @Override public void doFilter(final ServletRequest request, final ServletResponse response, @@ -40,7 +37,4 @@ public void doFilter(final ServletRequest request, chain.doFilter(processedRequest, response); } - @Override - public void destroy() { - } } diff --git a/slack-server-integration-common/src/main/resources/admin/configure-slack.vm b/slack-server-integration-common/src/main/resources/admin/configure-slack.vm index 157d9f9a..f4c9d0b3 100644 --- a/slack-server-integration-common/src/main/resources/admin/configure-slack.vm +++ b/slack-server-integration-common/src/main/resources/admin/configure-slack.vm @@ -1,4 +1,4 @@ -#* @vtlvariable name="webResourceManager" type="com.atlassian.plugin.webresource.api.WebResourceManager" *# +#* @vtlvariable name="webResourceManager" type="com.atlassian.webresource.api.WebResourceManager" *# #* @vtlvariable name="pageBuilderService" type="com.atlassian.webresource.api.assembler.PageBuilderService" *# #* @vtlvariable name="webInterfaceManager" type="com.atlassian.plugin.web.WebInterfaceManager" *# #* @vtlvariable name="i18n" type="com.atlassian.sal.api.message.I18nResolver" *# diff --git a/slack-server-integration-common/src/main/resources/admin/connect/connect-workspace.vm b/slack-server-integration-common/src/main/resources/admin/connect/connect-workspace.vm index ab458519..138fd727 100644 --- a/slack-server-integration-common/src/main/resources/admin/connect/connect-workspace.vm +++ b/slack-server-integration-common/src/main/resources/admin/connect/connect-workspace.vm @@ -1,4 +1,4 @@ -#* @vtlvariable name="webResourceManager" type="com.atlassian.plugin.webresource.api.WebResourceManager" *# +#* @vtlvariable name="webResourceManager" type="com.atlassian.webresource.api.WebResourceManager" *# #* @vtlvariable name="pageBuilderService" type="com.atlassian.webresource.api.assembler.PageBuilderService" *# #* @vtlvariable name="webInterfaceManager" type="com.atlassian.plugin.web.WebInterfaceManager" *# #* @vtlvariable name="i18n" type="com.atlassian.sal.api.message.I18nResolver" *# From 046add6b23dfb94a81ee26a7a19e6443ec41f995 Mon Sep 17 00:00:00 2001 From: YevhenHrytsai <142490819+YevhenHrytsai@users.noreply.github.com> Date: Fri, 9 Aug 2024 22:50:42 +0300 Subject: [PATCH 2/4] JDK 21 support (#398) * JDK 21 support * Bump bitbucket version to 9.0.0 and its AMPS plugin to 9.0.4 * Bump Confluence version to 9.0.1 --------- Co-authored-by: Yevhen Hrytsai --- .github/workflows/all-tests.yml | 6 ++--- bin/release-check/check-release.sh | 24 ++++++++++++++++--- .../pom.xml | 21 ++++++++++------ .../pom.xml | 6 ++--- .../DefaultAttachmentBuilderTest.java | 5 +++- .../jira-8-compat/pom.xml | 2 +- .../pom.xml | 2 +- pom.xml | 4 ++-- slack-server-integration-common/pom.xml | 9 ++++++- 9 files changed, 57 insertions(+), 22 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 5fedb21a..66df05d3 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -32,7 +32,7 @@ jobs: if: "(github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'unit-tests')) && !contains(github.event.head_commit.message, '[skip ci]')" strategy: matrix: - java-version: [17] + java-version: [17, 21] fail-fast: false steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: needs: unit-tests strategy: matrix: - java-version: [17] + java-version: [17, 21] jira-version: [10.0.0-m0009] fail-fast: false steps: @@ -101,7 +101,7 @@ jobs: strategy: matrix: # every version part should be 0 <= <= 255; otherwise Confluence fails to start - java-version: [17] + java-version: [17, 21] confluence-version: [9.0.0-rc2] fail-fast: false steps: diff --git a/bin/release-check/check-release.sh b/bin/release-check/check-release.sh index dd5c9b92..8d9f78d9 100755 --- a/bin/release-check/check-release.sh +++ b/bin/release-check/check-release.sh @@ -47,12 +47,30 @@ esac echo "Determined workflow name: $workflow_name" # RUN TESTS AGAINST SPECIFIC VERSIONS +workflow_links=() +# Bitbucket 9+ does not support Java 21 +if [ $product_type != "bitbucket" ]; then + echo "Running workflow with params: workflow-name=$workflow_name java-version=21 product-version=$product_version" + first_workflow_link=$(start_workflow $workflow_name 21 $product_version) + echo "Pipeline URL: $first_workflow_link" + workflow_links+=("$first_workflow_link") +fi + echo "Running workflow with params: workflow-name=$workflow_name java-version=17 product-version=$product_version" -workflow_link=$(start_workflow $workflow_name 17 $product_version) -echo "Pipeline URL: $workflow_link" +second_workflow_link=$(start_workflow $workflow_name 17 $product_version) +echo "Pipeline URL: $second_workflow_link" +workflow_links+=("$second_workflow_link") + +# Join elements with a multi-character delimiter +function join_by { + local d=${1-} f=${2-} + if shift 2; then + printf %s "$f" "${@/#/$d}" + fi +} # CREATE NEW ISSUE FOR RELEASE echo "Creating a new issue" -new_issue_url=$(RELEASE_LABEL="$release_label" WORKFLOW_LINKS="$workflow_link" . ./create-issue.sh) +new_issue_url=$(RELEASE_LABEL="$release_label" WORKFLOW_LINKS="$(join_by ', ' ${workflow_links[@]})" . ./create-issue.sh) echo "New ticket created: $new_issue_url" diff --git a/bitbucket-slack-server-integration-plugin/pom.xml b/bitbucket-slack-server-integration-plugin/pom.xml index bfcd5bd0..939e9241 100644 --- a/bitbucket-slack-server-integration-plugin/pom.xml +++ b/bitbucket-slack-server-integration-plugin/pom.xml @@ -45,10 +45,11 @@ ${project.groupId}.${project.artifactId} - 9.0.0-eap09 - 9.0.0-eap09 + 9.0.0-eap09 + 9.0.0 + 9.0.0 ${bitbucket.version} - 8.16.1 + 9.0.4 7.0.5 @@ -127,13 +128,13 @@ com.atlassian.bitbucket.server bitbucket-rest-api - ${bitbucket.api.version} + ${bitbucket.rest.api.version} provided com.atlassian.bitbucket.server bitbucket-rest-model - ${bitbucket.api.version} + ${bitbucket.rest.api.version} provided @@ -293,7 +294,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 provided @@ -338,6 +339,12 @@ ${mockito-core.version} test + + net.bytebuddy + byte-buddy + 1.14.18 + test + org.hamcrest hamcrest-library @@ -600,7 +607,7 @@ jvm17 - 17 + [17,) diff --git a/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml b/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml index 4c10d92a..39a6b17b 100755 --- a/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml +++ b/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml @@ -22,10 +22,10 @@ ${project.basedir}/.. - 9.0.0-rc2 + 9.0.1 - 9.0.0-rc2 + 9.0.1 ${confluence.version} 8.9.2 @@ -559,7 +559,7 @@ jvm17 - 17 + [17,) diff --git a/confluence-slack-integration/confluence-slack-server-integration-plugin/src/test/java/com/atlassian/confluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java b/confluence-slack-integration/confluence-slack-server-integration-plugin/src/test/java/com/atlassian/confluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java index fd741a54..f89587c5 100644 --- a/confluence-slack-integration/confluence-slack-server-integration-plugin/src/test/java/com/atlassian/confluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java +++ b/confluence-slack-integration/confluence-slack-server-integration-plugin/src/test/java/com/atlassian/confluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java @@ -200,7 +200,10 @@ public void getSlackPrettyTime_shouldReturnExpectedValue() { when(localeManager.getSiteDefaultLocale()).thenReturn(Locale.ENGLISH); when(timeZoneManager.getDefaultTimeZone()).thenReturn(TimeZone.getTimeZone("America/Chicago")); - String result = target.getSlackPrettyTime(1551985533000L); + // `DateTimeFormatter` whitespace separator may change among JDKs + // Since `equals` method compares each character by its ascii value for equality, + // horizontal whitespace character (\\h) is replaced with a space for consistency + String result = target.getSlackPrettyTime(1551985533000L).replaceAll("\\h", " "); assertThat(result, is("")); } diff --git a/jira-slack-server-integration/jira-8-compat/pom.xml b/jira-slack-server-integration/jira-8-compat/pom.xml index caff1d51..c6d6d55b 100644 --- a/jira-slack-server-integration/jira-8-compat/pom.xml +++ b/jira-slack-server-integration/jira-8-compat/pom.xml @@ -55,7 +55,7 @@ net.bytebuddy byte-buddy - 1.11.22 + 1.14.18 org.hamcrest diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml index 12177c13..fc11d6d5 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml @@ -657,7 +657,7 @@ jvm17 - 17 + [17,) diff --git a/pom.xml b/pom.xml index b68b694e..cf8c01c5 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 commons-codec @@ -334,7 +334,7 @@ jvm17 - 17 + [17,) --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens=java.base/sun.util.locale=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-exports=java.base/sun.security.action=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xml.internal.utils=ALL-UNNAMED --add-exports=java.desktop/sun.font=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED diff --git a/slack-server-integration-common/pom.xml b/slack-server-integration-common/pom.xml index f0a1f063..31ef27f7 100644 --- a/slack-server-integration-common/pom.xml +++ b/slack-server-integration-common/pom.xml @@ -237,7 +237,14 @@ net.bytebuddy byte-buddy - 1.11.22 + 1.14.18 + test + + + org.javassist + javassist + 3.30.2-GA + test joda-time From fc73dd2e69d8392b5d256931b89da00d5f5f6a97 Mon Sep 17 00:00:00 2001 From: YevhenHrytsai <142490819+YevhenHrytsai@users.noreply.github.com> Date: Sun, 11 Aug 2024 00:23:18 +0300 Subject: [PATCH 3/4] Align with latest available products versions (#399) - Bump Confluence AMPS plugin version to 9.0.4 - Bump Jira version to 10.0.0-m0010 - Remove `enforcer.skip=true` flags - Update versions in all-tests.yml - Update README.md Co-authored-by: Yevhen Hrytsai --- .github/workflows/all-tests.yml | 6 +++--- README.md | 8 ++++---- bin/build/run-confluence-its.sh | 3 --- bin/build/run-unit-tests.sh | 4 +--- bin/run-bitbucket.sh | 3 --- bin/run-confluence.sh | 3 --- .../confluence-slack-server-integration-plugin/pom.xml | 7 ++++++- jira-slack-server-integration/pom.xml | 4 ++-- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 66df05d3..c029af25 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -63,7 +63,7 @@ jobs: strategy: matrix: java-version: [17, 21] - jira-version: [10.0.0-m0009] + jira-version: [10.0.0-m0010] fail-fast: false steps: - uses: actions/checkout@v4 @@ -102,7 +102,7 @@ jobs: matrix: # every version part should be 0 <= <= 255; otherwise Confluence fails to start java-version: [17, 21] - confluence-version: [9.0.0-rc2] + confluence-version: [9.0.1] fail-fast: false steps: - uses: actions/checkout@v4 @@ -140,7 +140,7 @@ jobs: strategy: matrix: java-version: [17] - bitbucket-version: [9.0.0-eap09] + bitbucket-version: [9.0.0] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 1f17b4b5..fac5e1c0 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Links to the official documentation are specified on Marketplace pages. Supported products. See [EOL policy](https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html). * `master`/`dev` branch * Jira: 10+ (not released yet) on JDK 17. - * Confluence: 9+ (not released yet) on JDK 17. - * Bitbucket: 9+ (not released yet) on JDK 17. + * Confluence: 9+ on JDK 17. + * Bitbucket: 9+ on JDK 17. * `release-1.x` branch * Jira: 8.15.0 (EOL date: 2 Feb 2023) JDK 8, 11 - 9.5.0 (EOL date: 6 Dec 2024) on JDK 8, 11, 17. @@ -138,12 +138,12 @@ See [all-tests.yml](.github/workflows/all-tests.yml) for more details. A specifi Note: all integration test jobs in default workflow (`all-tests.yml`) are dependent on unit tests, so to run integration tests for specific product pass the respective job's name along with `unit-test` to `jobs` parameter. For example: `unit-tests,integration-tests-jira-8`. -Integration tests for arbitrary verions of the the product and JVM may be run manually using +Integration tests for arbitrary versions of the product and JVM may be run manually using [jira-int-tests.yml](.github/workflows/jira-int-tests.yml), [confluence-int-tests.yml](.github/workflows/confluence-int-tests.yml) and [bitbucket-int-tests.yml](.github/workflows/bitbucket-int-tests.yml). ## Releasing -Release workflow allows to publish new releases to [Atlassian Artifactory](https://packages.atlassian.com/). +Release workflow allows to publish new releases to [GitHub Packages](https://github.com/orgs/atlassian-labs/packages?repo_name=atlassian-slack-integration-server). This action should be usually be run by repo maintainer only. See workflow configuration in [release.yml](.github/workflows/release.yml). # Contributions diff --git a/bin/build/run-confluence-its.sh b/bin/build/run-confluence-its.sh index 15f1c3c7..6d9e05eb 100755 --- a/bin/build/run-confluence-its.sh +++ b/bin/build/run-confluence-its.sh @@ -8,8 +8,6 @@ if [[ ${XVFB_ENABLE} != false ]] ; then export DISPLAY=:20 fi -# TODO: Remove -Denforcer.skip=true after moving from milestone versions - atlas-mvn --batch-mode verify \ ${VERSION_ARG} \ -Dut.test.skip=true \ @@ -20,6 +18,5 @@ atlas-mvn --batch-mode verify \ -Dfailsafe.rerunFailingTestsCount=${RETRY_COUNT:-2} \ -Dfailsafe.forkedProcessExitTimeoutInSeconds=360 \ -Dfailsafe.exitTimeout=360 \ - -Denforcer.skip=true \ -pl confluence-slack-integration/confluence-slack-server-integration-plugin \ "$@" diff --git a/bin/build/run-unit-tests.sh b/bin/build/run-unit-tests.sh index bac3be84..f990a377 100755 --- a/bin/build/run-unit-tests.sh +++ b/bin/build/run-unit-tests.sh @@ -2,7 +2,5 @@ set -ex trap 'set +ex' EXIT -# TODO: Remove -Denforcer.skip=true after moving from milestone versions - atlas-version -atlas-mvn --batch-mode verify -P jacoco -Denforcer.skip=true +atlas-mvn --batch-mode verify -P jacoco diff --git a/bin/run-bitbucket.sh b/bin/run-bitbucket.sh index 5e00524b..4c42b219 100755 --- a/bin/run-bitbucket.sh +++ b/bin/run-bitbucket.sh @@ -7,15 +7,12 @@ trap 'set +ex' EXIT BB_NGROK="$(curl -s "http://127.0.0.1:4040/api/tunnels" | \ jq -r '.tunnels[] | select(.proto == "https") | select (.config.addr|endswith("'"7990"'")) | .public_url[8:]')" -# TODO: Remove -Denforcer.skip=true after moving from milestone versions - ( cd "$( dirname "${BASH_SOURCE[0]}")/.." ; # set env var BB_NGROK to enable HTTPS atlas-mvn bitbucket:debug \ - -Denforcer.skip=true \ -Datlassian.dev.mode=true \ -Dmaven.test.skip=true \ -Dlogging.level.com.atlassian.bitbucket.plugins.slack=TRACE \ diff --git a/bin/run-confluence.sh b/bin/run-confluence.sh index 82e5f771..b01116b4 100755 --- a/bin/run-confluence.sh +++ b/bin/run-confluence.sh @@ -1,11 +1,8 @@ #!/usr/bin/env bash -# TODO: Remove -Denforcer.skip=true after moving from milestone versions - ( cd "$( dirname "${BASH_SOURCE[0]}")/.." ; atlas-mvn confluence:debug \ - -Denforcer.skip=true \ -Datlassian.dev.mode=true \ -Dmaven.test.skip=true \ "$@" \ diff --git a/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml b/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml index 39a6b17b..c1c2386a 100755 --- a/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml +++ b/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml @@ -28,7 +28,7 @@ 9.0.1 ${confluence.version} - 8.9.2 + 9.0.4 @@ -326,6 +326,11 @@ false true + + com.atlassian.security:atlassian-secure-random + com.google.code.gson:gson + + src/main/resources/log4j.properties false diff --git a/jira-slack-server-integration/pom.xml b/jira-slack-server-integration/pom.xml index 5ad0c37e..c773fd9a 100644 --- a/jira-slack-server-integration/pom.xml +++ b/jira-slack-server-integration/pom.xml @@ -22,12 +22,12 @@ 5.1.3 - 10.0.0-m0009 + 10.0.0-m0010 10.0.3 ${jira.version} - 10.0.0-m0009 + 10.0.0-m0010 ${jira.version} From 7d24faf68f6cb7f364bcb76a19b7e6c85977bea9 Mon Sep 17 00:00:00 2001 From: Yevhen Hrytsai <142490819+yevhenhr@users.noreply.github.com> Date: Sat, 7 Sep 2024 15:05:32 +0300 Subject: [PATCH 4/4] Update Jira version to 10.0.0 and fix version regex in the find-latest-releases.sh (#407) Co-authored-by: Yevhen Hrytsai --- .github/workflows/all-tests.yml | 2 +- bin/release-check/find-latest-releases.sh | 2 +- jira-slack-server-integration/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index c029af25..0f0194c6 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -63,7 +63,7 @@ jobs: strategy: matrix: java-version: [17, 21] - jira-version: [10.0.0-m0010] + jira-version: [10.0.0] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/bin/release-check/find-latest-releases.sh b/bin/release-check/find-latest-releases.sh index 975934be..bcba7eeb 100755 --- a/bin/release-check/find-latest-releases.sh +++ b/bin/release-check/find-latest-releases.sh @@ -32,7 +32,7 @@ pac_search_query="https://packages.atlassian.com/maven/${GROUP}/${ARTIFACT}/mave search_response=$(curl -s "${pac_search_query}") # PARSE RESPONSE AND GET AN ARRAY OF VERSIONS THAT CONTAIN ONLY NUMBERS (EXCLUDES SNAPSHOTS AND MILESTONE RELEASES) -latest_releases=$(echo "$search_response" | grep -oE '[0-9][0-9]?\.[0-9]+\.[0-9]+' | grep -oE '[0-9]\.[0-9]+\.[0-9]+') +latest_releases=$(echo "$search_response" | grep -oE '[0-9][0-9]?\.[0-9]+\.[0-9]+' | grep -oE '[0-9][0-9]?\.[0-9]+\.[0-9]+') echo "$latest_releases" diff --git a/jira-slack-server-integration/pom.xml b/jira-slack-server-integration/pom.xml index c773fd9a..2ce7513b 100644 --- a/jira-slack-server-integration/pom.xml +++ b/jira-slack-server-integration/pom.xml @@ -22,12 +22,12 @@ 5.1.3 - 10.0.0-m0010 + 10.0.0 10.0.3 ${jira.version} - 10.0.0-m0010 + 10.0.0 ${jira.version}