Skip to content

Commit 4400b96

Browse files
tanderson-ldtanderson-ld
committed
more tweaks
1 parent 1d4075e commit 4400b96

30 files changed

+119
-28
lines changed

‎.github/ISSUE_TEMPLATE/package-redis-store--bug_report.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: 'Bug report for the java-server-sdk-otel package'
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'package: java-server-sdk-otel, bug'
6+
assignees: ''
7+
---
8+
9+
**Is this a support request?**
10+
This issue tracker is maintained by LaunchDarkly SDK developers and is intended for feedback on the code in this library. If you're not sure whether the problem you are having is specifically related to this library, or to the LaunchDarkly service overall, it may be more appropriate to contact the LaunchDarkly support team; they can help to investigate the problem and will consult the SDK team if necessary. You can submit a support request by going [here](https://support.launchdarkly.com/) and clicking "submit a request", or by emailing [email protected].
11+
12+
Note that issues filed on this issue tracker are publicly accessible. Do not provide any private account information on your issues. If your problem is specific to your account, you should submit a support request as described above.
13+
14+
**Describe the bug**
15+
A clear and concise description of what the bug is.
16+
17+
**To reproduce**
18+
Steps to reproduce the behavior.
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Logs**
24+
If applicable, add any log output related to your problem.
25+
26+
**SDK version**
27+
The version of this SDK that you are using.
28+
29+
**Language version, developer tools**
30+
For instance, Go 1.11 or Ruby 2.5.3. If you are using a language that requires a separate compiler, such as C, please include the name and version of the compiler too.
31+
32+
**OS/platform**
33+
For instance, Ubuntu 16.04, Windows 10, or Android 4.0.3. If your code is running in a browser, please also include the browser type and version.
34+
35+
**Additional context**
36+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/package-redis-store--feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request for the java-server-sdk-redis-store package
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'package: java-server-sdk-redis-store, enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I would love to see the SDK [...does something new...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context about the feature request here.

‎.github/actions/ci/action.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ runs:
2727
distribution: ${{ inputs.java_distribution }}
2828
java-version: ${{ inputs.java_version }}
2929

30+
- name: Setup Redis Service
31+
shell: bash
32+
if: ${{ inputs.workspace_path == 'lib/java-server-sdk-redis-store' }}
33+
run: |
34+
sudo apt-get update -y
35+
sudo apt-get install redis-server -y
36+
sudo service redis-server start
37+
3038
- name: Restore dependencies
3139
shell: bash
3240
id: restore

‎.github/workflows/java-server-sdk-redis.yml renamed to ‎.github/workflows/java-server-sdk-redis-store.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: java-server-sdk-redis
1+
name: java-server-sdk-redis-store
22

33
on:
44
push:
@@ -11,29 +11,24 @@ on:
1111
- '**.md'
1212

1313
jobs:
14-
build-test-java-server-sdk-redis:
14+
build-test-java-server-sdk-redis-store:
1515
strategy:
1616
matrix:
1717
jedis-version: [2.9.0, 3.0.0]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v3
2121

22-
- run: |
23-
sudo apt-get update -y
24-
sudo apt-get install redis-server -y
25-
sudo service redis-server start
26-
2722
- name: Edit build.gradle to change Jedis version
2823
shell: bash
2924
run: |
30-
cd lib/java-server-sdk-redis
25+
cd lib/java-server-sdk-redis-store
3126
sed -i.bak 's#"jedis":.*"[0-9.]*"#"jedis":"${{ matrix.jedis-version }}"#' build.gradle
3227
3328
- name: Shared CI Steps
3429
uses: ./.github/actions/ci
3530
with:
36-
workspace_path: 'lib/java-server-sdk-redis'
31+
workspace_path: 'lib/java-server-sdk-redis-store'
3732
java_version: 8
3833

3934
build-test-java-server-sdk-windows:
@@ -58,11 +53,11 @@ jobs:
5853
- name: Edit build.gradle to change Jedis version
5954
shell: bash
6055
run: |
61-
cd lib/java-server-sdk-redis
56+
cd lib/java-server-sdk-redis-store
6257
sed -i.bak 's#"jedis":.*"[0-9.]*"#"jedis":"${{ matrix.jedis-version }}"#' build.gradle
6358
6459
- name: Shared CI Steps
6560
uses: ./.github/actions/ci
6661
with:
67-
workspace_path: 'lib/java-server-sdk-redis'
62+
workspace_path: 'lib/java-server-sdk-redis-store'
6863
java_version: 8

‎.github/workflows/manual-publish-docs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ on:
66
required: true
77
type: choice
88
options:
9-
- lib/java-server-sdk-otel
109
- lib/shared/common
1110
- lib/shared/internal
1211
- lib/sdk/server
12+
- lib/java-server-sdk-otel
13+
- lib/java-server-sdk-redis-store
1314
dry_run:
1415
description: 'Is this a dry run. If so no docs will be published.'
1516
type: boolean

‎.github/workflows/manual-publish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ on:
77
required: true
88
type: choice
99
options:
10-
- lib/java-server-sdk-otel
1110
- lib/shared/common
1211
- lib/shared/internal
1312
- lib/sdk/server
13+
- lib/java-server-sdk-otel
14+
- lib/java-server-sdk-redis-store
1415
prerelease:
1516
description: 'Is this a prerelease.'
1617
type: boolean

‎.github/workflows/release-please.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
outputs:
13-
package-server-sdk-otel-released: ${{ steps.release.outputs['lib/java-server-sdk-otel--release_created'] }}
1413
package-sdk-common-released: ${{ steps.release.outputs['lib/java-sdk-common--release_created'] }}
1514
package-sdk-internal-released: ${{ steps.release.outputs['lib/java-sdk-internal--release_created'] }}
1615
package-server-sdk-released: ${{ steps.release.outputs['lib/java-server-sdk--release_created'] }}
16+
package-server-sdk-otel-released: ${{ steps.release.outputs['lib/java-server-sdk-otel--release_created'] }}
17+
package-server-sdk-redis-store-released: ${{ steps.release.outputs['lib/java-server-sdk-redis-store--release_created'] }}
1718

1819
steps:
1920
- uses: google-github-actions/release-please-action@v4
@@ -86,6 +87,38 @@ jobs:
8687
aws_role: ${{ vars.AWS_ROLE_ARN }}
8788
token: ${{ secrets.GITHUB_TOKEN }}
8889

90+
release-server-sdk-redis-store:
91+
runs-on: ubuntu-latest
92+
needs: release-please
93+
permissions:
94+
id-token: write
95+
contents: write
96+
pull-requests: write
97+
if: ${{ needs.release-please.outputs.package-server-sdk-redis-store-released == 'true'}}
98+
steps:
99+
- uses: actions/checkout@v4
100+
101+
- uses: launchdarkly/gh-actions/actions/[email protected]
102+
name: Get secrets
103+
with:
104+
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
105+
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
106+
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
107+
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
108+
109+
- uses: ./.github/actions/full-release
110+
with:
111+
workspace_path: lib/java-server-sdk-redis-store
112+
dry_run: false
113+
prerelease: false
114+
code_signing_keyring: 'code-signing-keyring.gpg'
115+
signing_key_id: ${{ env.SIGNING_KEY_ID }}
116+
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
117+
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
118+
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
119+
aws_role: ${{ vars.AWS_ROLE_ARN }}
120+
token: ${{ secrets.GITHUB_TOKEN }}
121+
89122
release-sdk-internal:
90123
runs-on: ubuntu-latest
91124
needs: release-please

‎.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lib/java-server-sdk-otel": "0.1.0",
3-
"lib/java-server-sdk-redis": "3.0.0",
3+
"lib/java-server-sdk-redis-store": "3.0.0",
44
"lib/shared/common": "2.1.1",
55
"lib/shared/internal": "1.3.0",
66
"lib/sdk/server": "7.7.0"

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This includes shared libraries, used by SDKs and other tools, as well as SDKs.
1717
| Other Packages | API Docs | maven | issues | tests |
1818
| ---------------------------------------------------------------------------- |--------------------------------------------------------------| ---------------------------------------------------------- | ------------------------------------- | ------------------------------------------------------------- |
1919
| [@launchdarkly/java-server-sdk-otel](lib/java-server-sdk-otel/README.md) | [![Documentation][server-otel-docs-badge]][server-otel-docs-link] | [![maven][server-otel-maven-badge]][server-otel-maven-link] | [Issues][server-otel-issues] | [![Actions Status][server-otel-ci-badge]][server-otel-ci-link] |
20-
| [@launchdarkly/java-server-sdk-redis](lib/java-server-sdk-redis/README.md) | [![Documentation][server-redis-docs-badge]][server-redis-docs-link] | [![maven][server-redis-maven-badge]][server-redis-maven-link] | [Issues][server-redis-issues] | [![Actions Status][server-redis-ci-badge]][server-redis-ci-link] |
20+
| [@launchdarkly/java-server-sdk-redis-store](lib/java-server-sdk-redis-store/README.md) | [![Documentation][server-redis-docs-badge]][server-redis-docs-link] | [![maven][server-redis-maven-badge]][server-redis-maven-link] | [Issues][server-redis-issues] | [![Actions Status][server-redis-ci-badge]][server-redis-ci-link] |
2121

2222
## Organization
2323

@@ -72,14 +72,14 @@ We encourage pull requests and other contributions from the community. Check out
7272
[server-otel-docs-badge]: https://img.shields.io/static/v1?label=GitHub+Pages&message=API+reference&color=00add8
7373
[server-otel-docs-link]: https://launchdarkly.github.io/java-core/lib/java-server-sdk-otel/
7474

75-
[//]: # 'java-server-sdk-redis'
76-
[server-redis-issues]: https://github.com/launchdarkly/java-core/issues?q=is%3Aissue+is%3Aopen+label%3A%22package%3A+java-server-sdk-redis%22+
77-
[server-redis-maven-badge]: https://img.shields.io/maven-central/v/com.launchdarkly/launchdarkly-java-server-sdk-redis
78-
[server-redis-maven-link]: https://central.sonatype.com/artifact/com.launchdarkly/launchdarkly-java-server-sdk-redis
79-
[server-redis-ci-badge]: https://github.com/launchdarkly/java-core/actions/workflows/java-server-sdk-redis.yml/badge.svg
80-
[server-redis-ci-link]: https://github.com/launchdarkly/java-core/actions/workflows/java-server-sdk-redis.yml
75+
[//]: # 'java-server-sdk-redis-store'
76+
[server-redis-issues]: https://github.com/launchdarkly/java-core/issues?q=is%3Aissue+is%3Aopen+label%3A%22package%3A+java-server-sdk-redis-store%22+
77+
[server-redis-maven-badge]: https://img.shields.io/maven-central/v/com.launchdarkly/launchdarkly-java-server-sdk-redis-store
78+
[server-redis-maven-link]: https://central.sonatype.com/artifact/com.launchdarkly/launchdarkly-java-server-sdk-redis-store
79+
[server-redis-ci-badge]: https://github.com/launchdarkly/java-core/actions/workflows/java-server-sdk-redis-store.yml/badge.svg
80+
[server-redis-ci-link]: https://github.com/launchdarkly/java-core/actions/workflows/java-server-sdk-redis-store.yml
8181
[server-redis-docs-badge]: https://img.shields.io/static/v1?label=GitHub+Pages&message=API+reference&color=00add8
82-
[server-redis-docs-link]: https://launchdarkly.github.io/java-core/lib/java-server-sdk-redis/
82+
[server-redis-docs-link]: https://launchdarkly.github.io/java-core/lib/java-server-sdk-redis-store/
8383

8484
[//]: # 'java-sdk-internal'
8585
[sdk-internal-issues]: https://github.com/launchdarkly/java-core/issues?q=is%3Aissue+is%3Aopen+label%3A%22package%3A+java-sdk-internal%22+

‎lib/java-server-sdk-redis/CHANGELOG.md renamed to ‎lib/java-server-sdk-redis-store/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
All notable changes to the LaunchDarkly Java SDK Redis integration will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
44

55
## [3.0.0] - 2022-12-07
6-
This release corresponds to the 6.0.0 release of the LaunchDarkly Java SDK. Any application code that is being updated to use the 6.0.0 SDK, and was using a 2.x version of `launchdarkly-java-server-sdk-redis`, should now use a 3.x version instead.
6+
This release corresponds to the 6.0.0 release of the LaunchDarkly Java SDK. Any application code that is being updated to use the 6.0.0 SDK, and was using a 2.x version of `launchdarkly-java-server-sdk-redis-store`, should now use a 3.x version instead.
77

88
There are no functional differences in the behavior of the Redis integration; the differences are only related to changes in the usage of interface types for configuration in the SDK.
99

0 commit comments

Comments
 (0)