Skip to content

Commit 52842d4

Browse files
build: update plugins and repos (#224)
* build: update plugins and repos * chore: update plugins
1 parent 32efd42 commit 52842d4

File tree

15 files changed

+239
-174
lines changed

15 files changed

+239
-174
lines changed

.github/workflows/pr-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1515
- name: Check out code
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
ref: ${{github.event.pull_request.head.ref}}
1919
repository: ${{github.event.pull_request.head.repo.full_name}}

.github/workflows/pr-test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77

88
jobs:
99
test:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1313
- name: Check out code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
1717

@@ -60,7 +60,9 @@ jobs:
6060
github_token: ${{ secrets.GITHUB_TOKEN }}
6161
files: ./**/build/test-results/**/*.xml
6262
dependency-check:
63-
runs-on: ubuntu-22.04
63+
runs-on: ubuntu-24.04
6464
steps:
6565
- name: Dependency Check
66-
uses: hypertrace/github-actions/dependency-check@main
66+
uses: hypertrace/github-actions/dependency-check@main
67+
with:
68+
nvd-api-key: ${{ secrets.NVD_API_KEY }}

.github/workflows/publish.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88

99
jobs:
1010
publish-artifacts:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1414
- name: Check out code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818

@@ -21,8 +21,6 @@ jobs:
2121
with:
2222
args: publish
2323
env:
24-
ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }}
25-
ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }}
26-
ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }}
27-
28-
24+
ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }}
25+
ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }}
26+
ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }}

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
###### org.hypertrace.core.documentstore
44

5-
[![CircleCI](https://circleci.com/gh/hypertrace/document-store.svg?style=svg)](https://circleci.com/gh/hypertrace/document-store)
6-
75
A library that provides an interface for performing CRUD operations for the document-oriented store. Currently, it also provides an implementation for mongo.

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension
22
import org.hypertrace.gradle.publishing.License
33

44
plugins {
5-
id("org.hypertrace.repository-plugin") version "0.4.0"
6-
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
7-
id("org.hypertrace.publish-plugin") version "1.0.2" apply false
8-
id("org.hypertrace.code-style-plugin") version "1.1.0" apply false
9-
id("org.owasp.dependencycheck") version "8.4.3"
5+
id("org.hypertrace.repository-plugin") version "0.5.0"
6+
id("org.hypertrace.ci-utils-plugin") version "0.4.0"
7+
id("org.hypertrace.publish-plugin") version "1.1.1" apply false
8+
id("org.hypertrace.code-style-plugin") version "2.1.2" apply false
9+
id("org.owasp.dependencycheck") version "12.1.0"
1010
}
1111

1212
subprojects {

document-store/src/integrationTest/java/org/hypertrace/core/documentstore/utils/Utils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class Utils {
4040
public static final String MONGO_LAST_UPDATE_TIME_KEY = "_lastUpdateTime";
4141
public static final String MONGO_LAST_UPDATED_TIME_KEY = "lastUpdatedTime";
4242
public static final String MONGO_CREATED_TIME_KEY = "createdTime";
43+
4344
/** Postgres related time fields */
4445
public static final String POSTGRES_UPDATED_AT = "updated_at";
4546

document-store/src/main/java/org/hypertrace/core/documentstore/Collection.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ CloseableIterator<Document> query(
188188
*/
189189
boolean deleteAll();
190190

191-
/** @return the number of documents in the collection */
191+
/**
192+
* @return the number of documents in the collection
193+
*/
192194
long count();
193195

194196
/**

document-store/src/main/java/org/hypertrace/core/documentstore/DatastoreProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public class DatastoreProvider {
2929
entry(DatabaseType.MONGO, MongoTypesafeDatastoreConfigAdapter::new),
3030
entry(DatabaseType.POSTGRES, PostgresTypesafeDatastoreConfigAdapter::new));
3131

32-
/** @deprecated Use {@link DatastoreProvider#getDatastore(DatastoreConfig)} instead */
32+
/**
33+
* @deprecated Use {@link DatastoreProvider#getDatastore(DatastoreConfig)} instead
34+
*/
3335
@Deprecated
3436
public static Datastore getDatastore(String type, Config config) {
3537
return Optional.ofNullable(type)

document-store/src/main/java/org/hypertrace/core/documentstore/expression/operators/AggregationOperator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
public enum AggregationOperator {
44
AVG,
55
COUNT,
6-
/** @deprecated Use {@link AggregationOperator#DISTINCT_ARRAY} instead. */
6+
/**
7+
* @deprecated Use {@link AggregationOperator#DISTINCT_ARRAY} instead.
8+
*/
79
@Deprecated(forRemoval = true)
810
DISTINCT,
911
DISTINCT_ARRAY, // This operator generates an array of distinct values

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/PostgresDatastore.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ public PostgresDatastore(@NonNull final DatastoreConfig datastoreConfig) {
6565
}
6666
}
6767

68-
/** @return Returns Tables for a particular database */
68+
/**
69+
* @return Returns Tables for a particular database
70+
*/
6971
@Override
7072
public Set<String> listCollections() {
7173
// Relevant bits of the table metadata schema:

0 commit comments

Comments
 (0)