Skip to content

Commit

Permalink
Align with latest available products versions
Browse files Browse the repository at this point in the history
- Bump Confluence AMPS plugin version to 9.0.4
- Bump Jira version to 10.0.0-m0010
- Remove `enforcer.skip=true` flags
  • Loading branch information
Yevhen Hrytsai committed Aug 9, 2024
1 parent 046add6 commit 068fb60
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 15 deletions.
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

0 comments on commit 068fb60

Please sign in to comment.