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

Mark 3.27.0 #167

Merged
merged 5 commits into from
Jun 12, 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
23 changes: 7 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,17 @@ jobs:
matrix:
jira-version: ["8.20.0", "9.4.0", "9.8.0", "9.11.0"]
env:
JIRA_SOFTWARE_VERSION: ${{ matrix.jira-version }}
JIRA_VERSION: ${{ matrix.jira-version }}
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
uses: actions/checkout@v4
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build
uses: gradle/gradle-build-action@v2
with:
gradle-version: wrapper
arguments: build
- name: Upload test reports
if: always()
uses: actions/upload-artifact@v2
with:
name: test-reports
path: build/reports/tests
run: ./gradlew build
- name: Upload diagnoses
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.jira-version }}-diagnoses
path: build/diagnoses
Expand All @@ -56,7 +47,7 @@ jobs:
if: github.event.inputs.release == 'yes'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Get publish token
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ Adding a requirement of a major version of a dependency is breaking a contract.
Dropping a requirement of a major version of a dependency is a new contract.

## [Unreleased]
[Unreleased]: https://github.com/atlassian/jira-actions/compare/release-3.26.0...master
[Unreleased]: https://github.com/atlassian/jira-actions/compare/release-3.27.0...master

## [3.27.0] - 2023-01-12
[3.27.0]: https://github.com/atlassian/jira-actions/compare/release-3.26.0...release-3.27.0

### Added
- Add `RecordedPerformanceEntries.timeOrigin`. Help with [JPERF-1454].
Expand Down
13 changes: 6 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ configurations.all {
dependencies {
api("com.github.stephenc.jcip:jcip-annotations:1.0-1")
api(webdriver("selenium-api"))
api("com.atlassian.performance:selenium-js:[1.0.0,2.0.0)")
api("com.atlassian.performance:selenium-js:[1.0.0, 2.0.0)")
api("javax.json:javax.json-api:1.1")

implementation(webdriver("selenium-support"))
implementation(webdriver("selenium-chrome-driver"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
implementation("org.glassfish:javax.json:1.1")
implementation("org.apache.commons:commons-math3:3.6.1")
implementation("com.atlassian.performance.tools:concurrency:[1.0.0,2.0.0)")
implementation("com.atlassian.performance.tools:concurrency:[1.0.0, 2.0.0)")
listOf(
"api",
"core",
Expand All @@ -56,11 +56,10 @@ dependencies {
).map { module ->
"org.apache.logging.log4j:log4j-$module:$log4jVersion"
}.forEach { implementation(it) }
testCompile("org.assertj:assertj-core:3.11.0")
testCompile("com.atlassian.performance.tools:io:[1.0.0,2.0.0)")
testCompile("com.atlassian.performance.tools:docker-infrastructure:0.3.7")
testCompile("junit:junit:[4.12, 5.0.0)")
testCompile("org.testcontainers:testcontainers:[1.17.1,2.0.0)")
testImplementation("org.assertj:assertj-core:3.11.0")
testImplementation("com.atlassian.performance.tools:io:[1.0.0, 2.0.0)")
testImplementation("com.atlassian.performance.tools:docker-infrastructure:0.3.7")
testImplementation("junit:junit:[4.12, 5.0.0)")
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance:selenium-js:1.0.1
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.code.findbugs:jsr305:1.3.9
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependency-locks/default.lockfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:jvm-tasks:1.3.0
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:jvm-tasks:1.4.0
com.atlassian.performance:selenium-js:1.0.1
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.code.findbugs:jsr305:1.3.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:jvm-tasks:1.3.0
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:jvm-tasks:1.4.0
com.atlassian.performance:selenium-js:1.0.1
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.code.findbugs:jsr305:1.3.9
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:jvm-tasks:1.3.0
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:jvm-tasks:1.4.0
com.atlassian.performance:selenium-js:1.0.1
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.code.findbugs:jsr305:1.3.9
Expand Down
37 changes: 0 additions & 37 deletions gradle/dependency-locks/testApiDependenciesMetadata.lockfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.google.code.findbugs:jsr305:1.3.9
com.google.errorprone:error_prone_annotations:2.1.3
com.google.guava:guava:25.0-jre
com.google.j2objc:j2objc-annotations:1.1
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
junit:junit:4.13.2
net.bytebuddy:byte-buddy:1.8.15
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
org.apache.commons:commons-exec:1.3
org.apache.logging.log4j:log4j-api:2.17.2
org.apache.logging.log4j:log4j-core:2.17.2
org.apache.logging.log4j:log4j-slf4j-impl:2.17.2
org.assertj:assertj-core:3.11.0
org.checkerframework:checker-compat-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.seleniumhq.selenium:selenium-api:3.141.59
org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
org.seleniumhq.selenium:selenium-remote-driver:3.141.59
org.seleniumhq.selenium:selenium-support:3.141.59
org.slf4j:slf4j-api:1.7.25
org.testcontainers:selenium:1.17.5
org.testcontainers:testcontainers:1.17.5
37 changes: 0 additions & 37 deletions gradle/dependency-locks/testCompile.lockfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.google.code.findbugs:jsr305:1.3.9
com.google.errorprone:error_prone_annotations:2.1.3
com.google.guava:guava:25.0-jre
com.google.j2objc:j2objc-annotations:1.1
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
junit:junit:4.13.2
net.bytebuddy:byte-buddy:1.8.15
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
org.apache.commons:commons-exec:1.3
org.apache.logging.log4j:log4j-api:2.17.2
org.apache.logging.log4j:log4j-core:2.17.2
org.apache.logging.log4j:log4j-slf4j-impl:2.17.2
org.assertj:assertj-core:3.11.0
org.checkerframework:checker-compat-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.seleniumhq.selenium:selenium-api:3.141.59
org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
org.seleniumhq.selenium:selenium-remote-driver:3.141.59
org.seleniumhq.selenium:selenium-support:3.141.59
org.slf4j:slf4j-api:1.7.25
org.testcontainers:selenium:1.17.5
org.testcontainers:testcontainers:1.17.5
10 changes: 1 addition & 9 deletions gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.atlassian.performance:selenium-js:1.0.1
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.3.3
com.github.docker-java:docker-java-transport-zerodep:3.3.3
com.github.docker-java:docker-java-transport:3.3.3
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.code.findbugs:jsr305:1.3.9
com.google.errorprone:error_prone_annotations:2.1.3
Expand All @@ -19,8 +15,6 @@ com.squareup.okio:okio:1.14.0
javax.json:javax.json-api:1.1
junit:junit:4.13.2
net.bytebuddy:byte-buddy:1.8.15
net.java.dev.jna:jna:5.12.1
org.apache.commons:commons-compress:1.24.0
org.apache.commons:commons-exec:1.3
org.apache.commons:commons-math3:3.6.1
org.apache.logging.log4j:log4j-api:2.17.2
Expand All @@ -37,10 +31,8 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.seleniumhq.selenium:selenium-api:3.141.59
org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
org.seleniumhq.selenium:selenium-remote-driver:3.141.59
org.seleniumhq.selenium:selenium-support:3.141.59
org.slf4j:slf4j-api:1.7.25
org.testcontainers:testcontainers:1.19.1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.atlassian.performance.tools:jvm-tasks:1.3.0
com.atlassian.performance.tools:jvm-tasks:1.4.0
com.atlassian.performance:selenium-js:1.0.1
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand Down
37 changes: 0 additions & 37 deletions gradle/dependency-locks/testRuntime.lockfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.google.code.findbugs:jsr305:1.3.9
com.google.errorprone:error_prone_annotations:2.1.3
com.google.guava:guava:25.0-jre
com.google.j2objc:j2objc-annotations:1.1
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
junit:junit:4.13.2
net.bytebuddy:byte-buddy:1.8.15
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
org.apache.commons:commons-exec:1.3
org.apache.logging.log4j:log4j-api:2.17.2
org.apache.logging.log4j:log4j-core:2.17.2
org.apache.logging.log4j:log4j-slf4j-impl:2.17.2
org.assertj:assertj-core:3.11.0
org.checkerframework:checker-compat-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.seleniumhq.selenium:selenium-api:3.141.59
org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
org.seleniumhq.selenium:selenium-remote-driver:3.141.59
org.seleniumhq.selenium:selenium-support:3.141.59
org.slf4j:slf4j-api:1.7.25
org.testcontainers:selenium:1.17.5
org.testcontainers:testcontainers:1.17.5
4 changes: 2 additions & 2 deletions gradle/dependency-locks/testRuntimeClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.atlassian.performance.tools:concurrency:1.2.1
com.atlassian.performance.tools:concurrency:1.3.0
com.atlassian.performance.tools:docker-infrastructure:0.3.7
com.atlassian.performance.tools:io:1.2.0
com.atlassian.performance.tools:jvm-tasks:1.3.0
com.atlassian.performance.tools:jvm-tasks:1.4.0
com.atlassian.performance:selenium-js:1.0.1
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ class RecordedPerformanceEntries internal constructor(
val navigations: List<PerformanceNavigationTiming>,
val resources: List<PerformanceResourceTiming>,
val elements: List<PerformanceElementTiming>,
/**
* @since 3.27.0
*/
val timeOrigin: Instant?
) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import java.time.ZonedDateTime
abstract class AbstractJiraCoreScenario {
private val logger: Logger = LogManager.getLogger(this::class.java)

protected val jiraVersion = System.getenv("JIRA_SOFTWARE_VERSION") ?: "8.0.0"
protected val jiraVersion = System.getenv("JIRA_VERSION") ?: "8.0.0"

fun shouldRunScenarioWithoutErrors(jira: Jira, driver: RemoteWebDriver, rng: SeededRandom) {
logger.info("Testing Jira $jiraVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RichTextEditorIT {

@Test
fun shouldRunScenarioWithoutErrors() {
val version = System.getenv("JIRA_SOFTWARE_VERSION") ?: "8.0.0"
val version = System.getenv("JIRA_VERSION") ?: "8.0.0"
logger.info("Testing Jira $version")
val scenario = JiraEditScenario()
val metrics = mutableListOf<ActionMetric>()
Expand Down
Loading