Skip to content

Commit

Permalink
Revert "[release] Prepare and release 3.6.0-M3" and disable tests
Browse files Browse the repository at this point in the history
This reverts commit 47c145e.
  • Loading branch information
chemicL committed Sep 13, 2023
1 parent 47c145e commit c6e3291
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ jobs:
#output: versionType, fullVersion
#fails if versionType is BAD, which interrupts the workflow
run: ./gradlew qualifyVersionGha
- name: run checks
id: checks
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
with:
arguments: check -Pjunit-tags=!slow -x jcstress
# - name: run checks
# id: checks
# uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
# with:
# arguments: check -Pjunit-tags=!slow -x jcstress

slowerChecks:
# similar limitations as in prepare, but we parallelize slower tests here
Expand Down Expand Up @@ -81,11 +81,11 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- name: run slower tests
id: slowerTests
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
with:
arguments: reactor-core:test -Pjunit-tags=slow
# - name: run slower tests
# id: slowerTests
# uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
# with:
# arguments: reactor-core:test -Pjunit-tags=slow

#deploy the snapshot artifacts to Artifactory
deploySnapshot:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ repositories {
}
dependencies {
compile "io.projectreactor:reactor-core:3.6.0-M3"
testCompile "io.projectreactor:reactor-test:3.6.0-M3"
compile "io.projectreactor:reactor-core:3.6.0-M2"
testCompile "io.projectreactor:reactor-test:3.6.0-M2"
// Alternatively, use the following for latest snapshot artifacts in this line
// compile "io.projectreactor:reactor-core:3.6.0-SNAPSHOT"
// testCompile "io.projectreactor:reactor-test:3.6.0-SNAPSHOT"
// Optionally, use `reactor-tools` to help debugging reactor code
// implementation "io.projectreactor:reactor-tools:3.6.0-M3"
// implementation "io.projectreactor:reactor-tools:3.6.0-M2"
}
```

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=3.6.0-M3
bomVersion=2023.0.0-M3
metricsMicrometerVersion=1.1.0-M3
version=3.6.0-SNAPSHOT
bomVersion=2023.0.0-M2
metricsMicrometerVersion=1.1.0-SNAPSHOT
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ baselinePerfExtra = "3.5.1"
# Other shared versions
asciidoctor = "3.3.2"
#note that some micrometer artifacts like context-propagation has a different version directly set in libraries below
micrometer = "1.12.0-M3"
micrometer = "1.12.0-SNAPSHOT"
kotlin = "1.5.32"
reactiveStreams = "1.0.4"

Expand All @@ -27,9 +27,9 @@ micrometer-commons = { module = "io.micrometer:micrometer-commons" }
micrometer-core = { module = "io.micrometer:micrometer-core" }
micrometer-contextPropagation102 = "io.micrometer:context-propagation:1.0.2"
micrometer-contextPropagation = "io.micrometer:context-propagation:1.0.5"
micrometer-docsGenerator = { module = "io.micrometer:micrometer-docs-generator", version = "1.0.2"}
micrometer-docsGenerator = { module = "io.micrometer:micrometer-docs-generator", version = "1.0.3-SNAPSHOT"}
micrometer-observation-test = { module = "io.micrometer:micrometer-observation-test" }
micrometer-tracing-test = "io.micrometer:micrometer-tracing-integration-test:1.2.0-M2"
micrometer-tracing-test = "io.micrometer:micrometer-tracing-integration-test:1.2.0-SNAPSHOT"
micrometer-test = { module = "io.micrometer:micrometer-test" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
reactiveStreams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactiveStreams" }
Expand Down

0 comments on commit c6e3291

Please sign in to comment.