Skip to content

Commit

Permalink
Pull request #204: Pump version to 2.3.0-SNAPSHOT
Browse files Browse the repository at this point in the history
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
  • Loading branch information
stefaneberl authored and openkitdt committed Apr 22, 2021
1 parent 416a470 commit 1ebf41e
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions docs/example.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions docs/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand All @@ -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
1 change: 1 addition & 0 deletions docs/supported_versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: | |
Expand Down
4 changes: 4 additions & 0 deletions docs/upgrade_guide.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2.2.0-SNAPSHOT
version=2.3.0-SNAPSHOT

0 comments on commit 1ebf41e

Please sign in to comment.