Skip to content
Merged
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
14 changes: 7 additions & 7 deletions azurefunctions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ plugins {
id 'java-library'
id 'maven-publish'
id 'signing'
id 'com.github.spotbugs' version '5.2.1'
id 'com.github.spotbugs' version '6.4.8'
}

group 'com.microsoft'
version = '1.6.3'
archivesBaseName = 'durabletask-azure-functions'

def protocVersion = '3.12.0'
def protocVersion = '3.25.8'

repositories {
maven {
Expand All @@ -19,9 +19,9 @@ repositories {

dependencies {
api project(':client')
implementation group: 'com.microsoft.azure.functions', name: 'azure-functions-java-library', version: '3.0.0'
implementation group: 'com.microsoft.azure.functions', name: 'azure-functions-java-library', version: '3.2.3'
implementation "com.google.protobuf:protobuf-java:${protocVersion}"
compileOnly "com.microsoft.azure.functions:azure-functions-java-spi:1.0.0"
compileOnly "com.microsoft.azure.functions:azure-functions-java-spi:1.1.0"
}

sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -88,9 +88,9 @@ java {
}

spotbugs {
toolVersion = '4.9.2'
effort = 'max'
reportLevel = 'high'
toolVersion = '4.9.8'
effort = com.github.spotbugs.snom.Effort.valueOf('MAX')
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
ignoreFailures = true
excludeFilter = file('spotbugs-exclude.xml')
}
Expand Down
27 changes: 14 additions & 13 deletions azuremanaged/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

plugins {
id 'java'
id 'com.google.protobuf' version '0.8.16'
id 'com.google.protobuf' version '0.9.6'
id 'idea'
id 'maven-publish'
id 'signing'
id 'com.github.spotbugs' version '5.2.1'
id 'com.github.spotbugs' version '6.4.8'
}

archivesBaseName = 'durabletask-azuremanaged'
group 'com.microsoft'
version = '1.6.3'

def grpcVersion = '1.59.0'
def azureCoreVersion = '1.45.0'
def azureIdentityVersion = '1.11.1'
def grpcVersion = '1.78.0'
def azureCoreVersion = '1.57.1'
def azureIdentityVersion = '1.18.1'
// When build on local, you need to set this value to your local jdk11 directory.
// Java11 is used to compile and run all the tests.
def PATH_TO_TEST_JAVA_RUNTIME = System.env.JDK_11 ?: System.getProperty("java.home")
Expand All @@ -40,12 +40,13 @@ dependencies {
implementation "com.azure:azure-identity:${azureIdentityVersion}"

// Test dependencies
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
testImplementation 'org.mockito:mockito-core:5.3.1'
testImplementation 'org.mockito:mockito-junit-jupiter:5.3.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.14.2'
testImplementation 'org.mockito:mockito-core:5.21.0'
testImplementation 'org.mockito:mockito-junit-jupiter:5.21.0'
testImplementation "io.grpc:grpc-netty:${grpcVersion}"
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.2'
}

compileJava {
Expand Down Expand Up @@ -123,9 +124,9 @@ java {
}

spotbugs {
toolVersion = '4.9.2'
effort = 'max'
reportLevel = 'high'
toolVersion = '4.9.8'
effort = com.github.spotbugs.snom.Effort.valueOf('MAX')
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
ignoreFailures = true
excludeFilter = file('spotbugs-exclude.xml')
}
Expand Down
27 changes: 14 additions & 13 deletions client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.16'
id 'com.google.protobuf' version '0.9.6'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
id 'maven-publish'
id 'signing'
id 'com.github.spotbugs' version '5.2.1'
id 'org.gradle.test-retry' version '1.4.1'
id 'com.github.spotbugs' version '6.4.8'
id 'org.gradle.test-retry' version '1.6.4'
}

group 'com.microsoft'
version = '1.6.3'
archivesBaseName = 'durabletask-client'

def grpcVersion = '1.59.0'
def protocVersion = '3.12.0'
def jacksonVersion = '2.15.3'
def openTelemetryVersion = '1.25.0'
def azureCoreVersion = '1.45.0'
def azureIdentityVersion = '1.11.1'
def grpcVersion = '1.78.0'
def protocVersion = '3.25.8'
def jacksonVersion = '2.18.3'
def openTelemetryVersion = '1.58.0'
def azureCoreVersion = '1.57.1'
def azureIdentityVersion = '1.18.1'
// When build on local, you need to set this value to your local jdk11 directory.
// Java11 is used to compile and run all the tests.
// Example for Windows: C:/Program Files/Java/openjdk-11.0.12_7/
Expand All @@ -41,8 +41,9 @@ dependencies {
implementation "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
implementation "io.opentelemetry:opentelemetry-context:${openTelemetryVersion}"

testImplementation(platform('org.junit:junit-bom:5.7.2'))
testImplementation(platform('org.junit:junit-bom:5.14.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
testImplementation project(':azuremanaged')
testImplementation "com.azure:azure-core:${azureCoreVersion}"
testImplementation "com.azure:azure-identity:${azureIdentityVersion}"
Expand Down Expand Up @@ -204,9 +205,9 @@ java {
}

spotbugs {
toolVersion = '4.9.2'
effort = 'max'
reportLevel = 'high'
toolVersion = '4.9.8'
effort = com.github.spotbugs.snom.Effort.valueOf('MAX')
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
ignoreFailures = true
excludeFilter = file('spotbugs-exclude.xml')
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class IntegrationTestBase {
private ManagedChannel clientChannel;

@AfterEach
private void shutdown() {
void shutdown() {
if (this.server != null) {
this.server.stop();
this.server = null;
Expand Down
12 changes: 7 additions & 5 deletions endtoendtests/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.microsoft.azure.azurefunctions" version "1.11.1"
id "com.microsoft.azure.azurefunctions" version "1.16.1"
}

group 'com.durabletask.endtoend'
Expand All @@ -18,10 +18,12 @@ dependencies {
implementation project(':client')
implementation project(':azurefunctions')

implementation 'com.microsoft.azure.functions:azure-functions-java-library:3.1.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
testImplementation 'io.rest-assured:rest-assured:5.3.0'
testImplementation 'io.rest-assured:json-path:5.3.0'
implementation 'com.microsoft.azure.functions:azure-functions-java-library:3.2.3'
testImplementation platform('org.junit:junit-bom:5.14.2')
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'io.rest-assured:rest-assured:5.5.7'
testImplementation 'io.rest-assured:json-path:5.5.7'

}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 7 additions & 5 deletions samples-azure-functions/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.microsoft.azure.azurefunctions" version "1.11.1"
id "com.microsoft.azure.azurefunctions" version "1.16.1"
}

group 'com.functions'
Expand All @@ -18,10 +18,12 @@ dependencies {
implementation project(':client')
implementation project(':azurefunctions')

implementation 'com.microsoft.azure.functions:azure-functions-java-library:3.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
testImplementation 'io.rest-assured:rest-assured:5.3.0'
testImplementation 'io.rest-assured:json-path:5.3.0'
implementation 'com.microsoft.azure.functions:azure-functions-java-library:3.2.3'
testImplementation platform('org.junit:junit-bom:5.14.2')
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'io.rest-assured:rest-assured:5.5.7'
testImplementation 'io.rest-assured:json-path:5.5.7'

}

Expand Down
12 changes: 6 additions & 6 deletions samples/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.18'
id 'java'
}

group 'io.durabletask'
version = '0.1.0'
def grpcVersion = '1.59.0'
def grpcVersion = '1.78.0'
archivesBaseName = 'durabletask-samples'

bootJar {
Expand All @@ -22,16 +22,16 @@ dependencies {
implementation project(':azuremanaged')

implementation 'org.springframework.boot:spring-boot-starter-web'
implementation platform("org.springframework.boot:spring-boot-dependencies:2.5.2")
implementation platform("org.springframework.boot:spring-boot-dependencies:2.7.18")
implementation 'org.springframework.boot:spring-boot-starter'

// https://github.com/grpc/grpc-java#download
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
implementation "io.grpc:grpc-stub:${grpcVersion}"
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
implementation 'com.azure:azure-identity:1.15.0'
implementation 'com.azure:azure-identity:1.18.1'

// install lombok
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.42'
compileOnly 'org.projectlombok:lombok:1.18.42'
}
Loading