Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align with latest available products versions #399

Merged
merged 1 commit into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/all-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
matrix:
# every version part should be 0 <= <version> <= 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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions bin/build/run-confluence-its.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
"$@"
4 changes: 1 addition & 3 deletions bin/build/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions bin/run-bitbucket.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 0 additions & 3 deletions bin/run-confluence.sh
Original file line number Diff line number Diff line change
@@ -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 \
"$@" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<confluence.version>9.0.1</confluence.version>
<confluence.data.version>${confluence.version}</confluence.data.version>

<confluence.amps.version>8.9.2</confluence.amps.version>
<confluence.amps.version>9.0.4</confluence.amps.version>
<jvm17.opens />
</properties>

Expand Down Expand Up @@ -326,6 +326,11 @@
<forceUpdateCheck>false</forceUpdateCheck>
<skipAllPrompts>true</skipAllPrompts>

<banningExcludes>
<exclude>com.atlassian.security:atlassian-secure-random</exclude>
<exclude>com.google.code.gson:gson</exclude>
</banningExcludes>

<!-- Custom logging config to show logs from plugin classes by default -->
<log4jProperties>src/main/resources/log4j.properties</log4jProperties>
<forceUpdateCheck>false</forceUpdateCheck>
Expand Down
4 changes: 2 additions & 2 deletions jira-slack-server-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<aui.version>5.1.3</aui.version>

<!-- this is the version we will run integration tests against -->
<jira.version>10.0.0-m0009</jira.version>
<jira.version>10.0.0-m0010</jira.version>
<testkit.version>10.0.3</testkit.version>
<jira.test.unit.version>${jira.version}</jira.test.unit.version>

<!-- This is the version the plugin is compiled against -->
<jira.compile.version>10.0.0-m0009</jira.compile.version>
<jira.compile.version>10.0.0-m0010</jira.compile.version>

<jira.pageobjects.version>${jira.version}</jira.pageobjects.version>

Expand Down
Loading