Merge pull request #209 from bugsnag/release/v3.7.1

.buildkite/pipeline.yml

@@ -11,7 +11,8 @@ steps:
     plugins:
       - docker-compose#v3.7.0:
           run: java-common
-    command: './gradlew :bugsnag:assemble :bugsnag-spring:javax:assemble :bugsnag-spring:assemble'
+    artifact_paths: maven-repository.zip
+    command: 'scripts/build-test-repository.sh'
 
   - label: ':docker: Run JVM tests'
     key: 'java-jvm-tests'
@@ -23,34 +24,52 @@ steps:
 
   - label: ':docker: Mazerunner java8 tests batch 1'
     key: 'java-mazerunner-tests-1'
+    depends_on: 'java-jvm-build'
     timeout_in_minutes: 30
     plugins:
       - docker-compose#v3.7.0:
           run: java8-mazerunner
-    command: 'bundle exec maze-runner --exclude=features/[^a-m].*.feature'
+      - artifacts#v1.9.0:
+          download: "maven-repository.zip"
+    command:
+      - 'features/scripts/assemble-fixtures.sh'
+      - 'bundle exec maze-runner --exclude=features/[^a-m].*.feature'
 
   - label: ':docker: Mazerunner java8 tests batch 2'
     key: 'java-mazerunner-tests-2'
+    depends_on: 'java-jvm-build'
     timeout_in_minutes: 30
     plugins:
       - docker-compose#v3.7.0:
-          pull: java8-mazerunner
           run: java8-mazerunner
-    command: 'bundle exec maze-runner --exclude=features/[^n-z].*.feature'
+      - artifacts#v1.9.0:
+          download: "maven-repository.zip"
+    command:
+      - 'features/scripts/assemble-fixtures.sh'
+      - 'bundle exec maze-runner --exclude=features/[^n-z].*.feature'
 
   - label: ':docker: Mazerunner java17 tests batch 1'
     key: 'java-mazerunner-tests-3'
+    depends_on: 'java-jvm-build'
     timeout_in_minutes: 30
     plugins:
       - docker-compose#v3.7.0:
           run: java17-mazerunner
-    command: 'bundle exec maze-runner --exclude=features/[^a-m].*.feature'
+      - artifacts#v1.9.0:
+          download: "maven-repository.zip"
+    command:
+      - 'features/scripts/assemble-fixtures.sh'
+      - 'bundle exec maze-runner --exclude=features/[^a-m].*.feature'
 
   - label: ':docker: Mazerunner java17 tests batch 2'
     key: 'java-mazerunner-tests-4'
+    depends_on: 'java-jvm-build'
     timeout_in_minutes: 30
     plugins:
       - docker-compose#v3.7.0:
-          pull: java17-mazerunner
           run: java17-mazerunner
-    command: 'bundle exec maze-runner --exclude=features/[^n-z].*.feature'
+      - artifacts#v1.9.0:
+          download: "maven-repository.zip"
+    command:
+      - 'features/scripts/assemble-fixtures.sh'
+      - 'bundle exec maze-runner --exclude=features/[^n-z].*.feature'

CHANGELOG.md

@@ -1,13 +1,27 @@
 # Changelog
 
-## 3.7.0 (2023-06-07)
+## 3.7.1 (2023-10-25)
+
+* Restore `BugsnagServletContainerInitializer` and `BugsnagServletRequestListener` to the `com.bugsnag.servlet` package.
+  These classes are deprecated in favour of the new `com.bugsnag.servlet.javax.` package, but are also compatible (`c.b.s.BugsnagServletRequestListener extends c.b.s.javax.BugsnagServletRequestListener`). This
+  fixes [issue #195](https://github.com/bugsnag/bugsnag-java/issues/195).
+  [#199](https://github.com/bugsnag/bugsnag-java/pull/199)
+
+* Corrected JVM version requirements for Gradle projects (fixing [issue 196](https://github.com/bugsnag/bugsnag-java/issues/196))
+  [#197](https://github.com/bugsnag/bugsnag-java/pull/197)
+
+## 3.7.0 (2023-06-12)
 
 * Support Spring 6 / Spring Boot 3
   [#191](https://github.com/bugsnag/bugsnag-java/pull/191)
 
 * Bump Jackson from 2.13.3 for critical vulnerability fixes
   [#184](https://github.com/bugsnag/bugsnag-java/pull/184)
 
+### Known Issues
+
+* v3.7.0 of `bugsnag-spring` declares the wrong jdk version as a dependency, meaning it is incompatible with Java < 17. If you are using earlier versions use v3.6.4.
+
 ## 3.6.4 (2022-07-12)
 
 * Support log messages that use `{}` formatting

CONTRIBUTING.md

@@ -82,11 +82,6 @@ Create a Sonatype account:
 1. Ask an existing contributor (likely Simon) to confirm in the ticket
 1. Wait for Sonatype them to confirm the approval
 
-Create a [Bintray](https://bintray.com) account:
-
-1. Create an account
-1. Request access to the [Bugsnag organization](https://bintray.com/bugsnag)
-
 ### 2. Configure the prerequisites
 
 1. Create your [PGP Signatures](http://central.sonatype.org/pages/working-with-pgp-signatures.html)
@@ -99,10 +94,6 @@ Create a [Bintray](https://bintray.com) account:
 
    nexusUsername=your-sonatype-username
    nexusPassword=your-sonatype-password
-
-   # Your credentials for https://bintray.com
-   bintray_user=your-bintray-username
-   bintray_api_key=your-bintray-api-key
    ```
 
 ### 3. Making a release
@@ -111,30 +102,45 @@ Create a [Bintray](https://bintray.com) account:
 - [ ] Does the build pass on the CI server?
 - [ ] Are all Docs PRs ready to go?
 - [ ] Has all new functionality been manually tested on a release build?
-  - [ ] Ensure the example app sends an unhandled error
-  - [ ] Ensure the example app sends a handled error
+    - [ ] Ensure the example app sends an unhandled error
+    - [ ] Ensure the example app sends a handled error
 - [ ] Have the installation instructions been updated on the [dashboard](https://github.com/bugsnag/bugsnag-website/tree/master/app/views/dashboard/projects/install) as well as the [docs site](https://github.com/bugsnag/docs.bugsnag.com)?
 - [ ] Do the installation instructions work for a manual integration?
 
 #### Making the release
-1. Merge any remaining PRs to master, ensuring the commit message matches the release tag (e.g. v4.0.0)
-1. Update the CHANGELOG.md file with any changes
-1. Update the version number by running `make VERSION=[number] bump`
-1. Commit the changes
-1. Create a release build:
-   * `./gradlew -Preleasing=true clean release`
-     - enter the release version (e.g. `1.2.0`)
-     - accept the default development version
-1. Create a release in GitHub, attaching the changelog entry and build artifacts
-1. Upload the archives to Sonatype Nexus and Bintray:
-   * `./gradlew -Preleasing=true uploadArchives bintrayUpload`
-1. "Promote" the build on Maven Central:
-   * `./gradlew -Preleasing=true closeAndReleaseRepository`
-1. Update the documentation (integration guide, quick start):
-   * Update the version numbers of the dependencies listed in the manual
-     integration guide.
-   * For a major version change, update the version numbers in the integration
-     instructions on docs.bugsnag.com and the quick start guides on the website.
+To start a release:
+
+- decide on a version number
+- create a new release branch from `next` with the version number in the branch name
+  `git checkout -b release/vX.Y.Z`
+- Pull the release branch and update it locally:
+    - [ ] Update the version number with `make VERSION=[number] bump`
+    - [ ] Update the version number and date in the changelog
+    - [ ] Inspect the updated CHANGELOG, and version files to ensure they are correct
+- Commit the changes with the release tag as the commit message (e.g. v4.0.0)
+- Create a release build and upload to the sonatype staging repository:
+    - `./gradlew -Preleasing=true clean publishAllPublicationsToSonatypeRepository`
+    - Verify that the artefacts are uploaded to sonatype - ensure that JARs, POMs and JAVADOCs are present for each module.
+    - Test the Sonatype artefacts in the example app by adding the newly created 'combugsnag-XXXX' repository to the build.gradle: maven {url "https://oss.sonatype.org/service/local/repositories/combugsnag-XXXX/content/"}
+- Once you are happy, make a PR from your release branch to `master` entitled `Release vX.Y.Z`
+- Get the release PR reviewed – all code changes should have been reviewed already, this should be a review of the integration of all changes to be shipped and the changelog
+- Once merged:
+    - Pull the latest changes (checking out `master` if necessary)
+    - Create a release build and upload to sonatype:
+        - `./gradlew -Preleasing=true clean publishAllPublicationsToSonatypeRepository`
+    - Release to GitHub:
+        - [ ] Create *and tag* the release from `master` on [GitHub Releases](https://github.com/bugsnag/bugsnag-android/releases), attaching the changelog entry and build artifacts
+    - Checkout `master` and pull the latest changes
+    - "Promote" the release build on Maven Central:
+        - Go to the [sonatype open source dashboard](https://oss.sonatype.org/index.html#stagingRepositories)
+        - Click the search box at the top right, and type “com.bugsnag”
+        - Select the com.bugsnag staging repository
+        - Ensure that JARs, POMs and JAVADOCs are present for each module
+        - Click the “close” button in the toolbar, no message
+        - Click the “refresh” button
+        - Select the com.bugsnag closed repository
+        - Click the “release” button in the toolbar
+    - Merge outstanding docs PRs related to this release
 
 #### Post-release Checklist
 - [ ] Have all Docs PRs been merged?

Gemfile.lock

@@ -1,18 +1,20 @@
 GIT
   remote: https://github.com/bugsnag/maze-runner
-  revision: 734405a801012be706f5e190e472fb02dd83b264
-  tag: v7.10.2
+  revision: 4456b8ddf7053e8dfdec39f14fed444ec93c0578
+  tag: v7.24.0
   specs:
-    bugsnag-maze-runner (7.10.2)
+    bugsnag-maze-runner (7.24.0)
       appium_lib (~> 12.0.0)
       appium_lib_core (~> 5.4.0)
       bugsnag (~> 6.24)
       cucumber (~> 7.1)
       cucumber-expressions (~> 6.0.0)
       curb (~> 0.9.6)
+      dogstatsd-ruby (~> 5.5.0)
       json_schemer (~> 0.2.24)
       optimist (~> 3.0.1)
       os (~> 1.0.0)
+      rack (~> 2.2)
       rake (~> 12.3.3)
       rubyzip (~> 2.3.2)
       selenium-webdriver (~> 4.0)
@@ -29,11 +31,11 @@ GEM
     appium_lib_core (5.4.0)
       faye-websocket (~> 0.11.0)
       selenium-webdriver (~> 4.2, < 4.6)
-    bugsnag (6.25.1)
+    bugsnag (6.26.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -67,49 +69,57 @@ GEM
       cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
+    dogstatsd-ruby (5.5.0)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     eventmachine (1.2.7)
-    faye-websocket (0.11.1)
+    faye-websocket (0.11.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.15.5)
     hana (1.3.7)
-    json_schemer (0.2.24)
+    json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
       uri_template (~> 0.7)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_portile2 (2.8.1)
+    mime-types-data (3.2023.0808)
+    mini_portile2 (2.8.4)
     multi_test (0.1.2)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     optimist (3.0.1)
     os (1.0.1)
     power_assert (2.0.3)
-    racc (1.6.2)
+    racc (1.7.1)
+    rack (2.2.8)
     rake (12.3.3)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rubyzip (2.3.2)
     selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sys-uname (1.2.2)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
+    sys-uname (1.2.3)
       ffi (~> 1.1)
-    test-unit (3.5.7)
+    test-unit (3.5.9)
       power_assert
     tomlrb (2.0.3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     uri_template (0.7.0)
     webrick (1.7.0)
     websocket (1.2.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)