From 1ebf41ea75fac30bc0a602d37298e03f9dcd97be Mon Sep 17 00:00:00 2001 From: Stefan Eberl Date: Thu, 22 Apr 2021 14:42:05 +0200 Subject: [PATCH] Pull request #204: Pump version to 2.3.0-SNAPSHOT Merge in OP/openkit-java from feature/ONE-54799-pump-version-to-2.3.0-SNAPSHOT to main * commit 'd090fd59b8ee9d4aa8912d868fc29623dac3a4d4': Pump version to 2.3.0-SNAPSHOT GitOrigin-RevId: a7cc215f447a5d0bb5945fe05eb24045157068bb --- CHANGELOG.md | 5 ++++- docs/example.md | 4 ++-- docs/installing.md | 6 +++--- docs/supported_versions.md | 1 + docs/upgrade_guide.md | 4 ++++ .../com/dynatrace/openkit/protocol/ProtocolConstants.java | 2 +- version.properties | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 476895f5..baee0a2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # OpenKit Java Changelog -## [Unreleased](https://github.com/Dynatrace/openkit-java/compare/v2.1.0...HEAD) +## [Unreleased](https://github.com/Dynatrace/openkit-java/compare/v2.2.0...HEAD) + +## 2.2.0 [Release date: 2021-04-22] +[GitHub Releases](https://github.com/Dynatrace/openkit-java/releases/tag/v2.2.0) ### Added - Support cost control configured in the Dynatrace UI. diff --git a/docs/example.md b/docs/example.md index 5976e31f..e3ffd30d 100644 --- a/docs/example.md +++ b/docs/example.md @@ -54,8 +54,8 @@ customize OpenKit. This includes device specific information like operating syst | Method Name | Description | Default Value | | ------------- | ------------- | ---------- | -| `withApplicationVersion` | sets the application version | `"2.2.0"` | -| `withOperatingSystem` | sets the operating system name | `"OpenKit 2.2.0"` | +| `withApplicationVersion` | sets the application version | `"2.3.0"` | +| `withOperatingSystem` | sets the operating system name | `"OpenKit 2.3.0"` | | `withManufacturer` | sets the manufacturer | `"Dynatrace"` | | `withModelID` | sets the model id | `"OpenKitDevice"` | | `withDataCollectionLevel` | sets the data collection level | `DataCollectionLevel.USER_BEHAVIOR` | diff --git a/docs/installing.md b/docs/installing.md index 308951a1..bbb2d015 100644 --- a/docs/installing.md +++ b/docs/installing.md @@ -4,13 +4,13 @@ OpenKit Java requires a Java Runtime Environment (JRE) 6, 7, 8 or 11. ## Obtaining OpenKit Java -OpenKit is available as Maven package on [JCenter][jcenter] and should be used via Maven, Gradle or Ivy. +OpenKit is available as Maven package on [Mavencentral][mvncentral] and should be used via Maven, Gradle or Ivy. An alternative way, if automatic dependency management is not possible, is to obtain the jar file from [GitHub Releases][gh-releases]. ## Updating OpenKit Java -The recommended approach to update OpenKit is via Maven, Gradle or Ivy from [JCenter][jcenter]. +The recommended approach to update OpenKit is via Maven, Gradle or Ivy from [Mavencentral][mvncentral]. An alternative way, if automatic dependency management is not possible, is manually updating the jar file from [GitHub Releases][gh-releases]. @@ -19,6 +19,6 @@ the jar file from [GitHub Releases][gh-releases]. GitHub offers the possibility to receive notifications for new releases. Detailed instructions are available on the [Watching and unwatching releases for a repository][gh-release-notification] page. -[jcenter]: https://bintray.com/dynatrace/openkit/com.dynatrace.openkit +[mvncentral]: https://search.maven.org/artifact/com.dynatrace.openkit/openkit-java [gh-releases]: https://github.com/Dynatrace/openkit-java/releases [gh-release-notification]: https://help.github.com/en/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-releases-for-a-repository \ No newline at end of file diff --git a/docs/supported_versions.md b/docs/supported_versions.md index cc458fba..3b442803 100644 --- a/docs/supported_versions.md +++ b/docs/supported_versions.md @@ -9,6 +9,7 @@ Example: Version `1.4.3` supersedes `1.4.2` and therefore only `1.4.3` will be m ## Active maintenance | Version | Bug fixes | Security fixes | Remarks | |---------|:------------------:|:------------------:|------------------| +| 2.2.X | :heavy_check_mark: | :heavy_check_mark: | | | 2.1.X | :heavy_check_mark: | :heavy_check_mark: | | | 2.0.X | :heavy_check_mark: | :heavy_check_mark: | | | 1.4.X | :heavy_check_mark: | :heavy_check_mark: | | diff --git a/docs/upgrade_guide.md b/docs/upgrade_guide.md index defef7fd..166dfc6c 100644 --- a/docs/upgrade_guide.md +++ b/docs/upgrade_guide.md @@ -1,5 +1,9 @@ # Upgrade guide for OpenKit Java +## OpenKit Java 2.1 to 2.2 +There are no breaking API changes and upgrading is straightforward, by [updating][update] the library +to the latest 2.2 release. + ## OpenKit Java 2.0 to 2.1 There are no breaking API changes and upgrading is straightforward, by [updating][update] the library to the latest 2.1 release. diff --git a/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java b/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java index 5f22d905..30278f04 100644 --- a/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java +++ b/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java @@ -19,7 +19,7 @@ public class ProtocolConstants { // version constants - public static final String OPENKIT_VERSION = "8.208.20200"; + public static final String OPENKIT_VERSION = "8.217.20300"; public static final int PROTOCOL_VERSION = 3; public static final int PLATFORM_TYPE_OPENKIT = 1; public static final String AGENT_TECHNOLOGY_TYPE = "okjava"; diff --git a/version.properties b/version.properties index 41fd7e15..6cdf9518 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -version=2.2.0-SNAPSHOT \ No newline at end of file +version=2.3.0-SNAPSHOT \ No newline at end of file