Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded gradle and a few other dependencies #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ignore:
'snyk:lic:maven:org.gnu:gnu-crypto:GPL-3.0':
- '*':
reason: Library Exception allows non-free use of gnu-crypto
expires: 2024-11-07T11:38:28.614Z
expires: 2025-06-30T11:38:28.614Z
SNYK-JAVA-ORGJSON-5488379:
- '*':
reason: https://github.com/snyk/gradle-plugin/pull/24
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ Add a dependency to com.aerospike:aerospike-connect-inbound-sdk.
<dependency>
<groupId>com.aerospike</groupId>
<artifactId>aerospike-connect-inbound-sdk</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>
```

See this example [pom.xml](examples/kafka/pom.xml).
See this example of [pom.xml](examples/kafka/pom.xml).

### Gradle

#### Kotlin DSL

```kotlin
dependencies {
api("com.aerospike:aerospike-connect-inbound-sdk:1.2.0")
api("com.aerospike:aerospike-connect-inbound-sdk:1.3.0")
}
```

#### Groovy

```groovy
dependencies {
api "com.aerospike:aerospike-connect-inbound-sdk:1.2.0"
api "com.aerospike:aerospike-connect-inbound-sdk:1.3.0"
}
```
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ allprojects {
pluginManager.withPlugin("jacoco") {
// If this project has the plugin applied, configure the tool version.
jacoco {
toolVersion = "0.8.10"
toolVersion = "0.8.11"
}
}

Expand All @@ -62,26 +62,26 @@ allprojects {

dependencies {
// TODO: Investigate. Snyk fails on older version of this dependency.
"dataFiles"("org.json:json:20231013")
"dataFiles"("org.json:json:20240303")
}

group = "com.aerospike"

// Common dependency versions.
extra["aerospikeClientVersion"] = "7.2.0"
extra["jacksonVersion"] = "2.15.3"
extra["aerospikeClientVersion"] = "8.1.0"
extra["jacksonVersion"] = "2.17.0"

dependencies {
// Lombok for its @Generated annotation that jacoco ignores
val lombokVersion = "1.18.30"
val lombokVersion = "1.18.32"
"compileOnly"("org.projectlombok:lombok:$lombokVersion")
"annotationProcessor"("org.projectlombok:lombok:$lombokVersion")

// JSR 305 for annotations
"compileOnly"("com.google.code.findbugs:jsr305:3.0.2")

// Aerospike Java Client
"compileOnly"("com.aerospike:aerospike-client:${project.extra["aerospikeClientVersion"]}")
"compileOnly"("com.aerospike:aerospike-client-jdk8:${project.extra["aerospikeClientVersion"]}")

// Jackson annotation
"compileOnly"("com.fasterxml.jackson.core:jackson-annotations:${project.extra["jacksonVersion"]}")
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ repositories {
}

dependencies {
api("net.researchgate:gradle-release:2.6.0")
api("io.snyk.gradle.plugin.snykplugin:io.snyk.gradle.plugin.snykplugin.gradle.plugin:0.5")
api("net.researchgate:gradle-release:2.8.1")
api("io.snyk.gradle.plugin.snykplugin:io.snyk.gradle.plugin.snykplugin.gradle.plugin:0.5.1")
}
2 changes: 1 addition & 1 deletion examples/kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>3.6.1</version>
<version>3.9.0</version>
</dependency>
</dependencies>

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
20 changes: 2 additions & 18 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
#
#
# Copyright 2012-2021 Aerospike, Inc.
#
# Portions may be licensed to Aerospike, Inc. under one or more contributor
# license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading