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.

Sign up for GitHub

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

Renamings of Java artifacts #204

Merged
merged 1 commit into from
Oct 11, 2023
+9 −17
Merged

Renamings of Java artifacts #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions services/java-services/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ plugins {
}

dependencies {
implementation(libs.restate.sdk.core)
implementation(libs.restate.sdk.blocking)
implementation(libs.restate.sdk.vertx)
implementation(libs.restate.sdk.java.blocking)
implementation(libs.restate.sdk.http.vertx)
implementation(libs.restate.sdk.jackson)

implementation(project(":contracts"))
Expand All @@ -25,9 +24,6 @@ dependencies {
implementation(platform(libs.jackson.bom))
implementation(libs.jackson.core)
implementation(libs.jackson.databind)

implementation(platform(libs.vertx.bom))
implementation(libs.vertx.core)
}

jib {
Expand Down
6 changes: 2 additions & 4 deletions services/java-services/src/main/java/dev/restate/e2e/services/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import dev.restate.e2e.services.singletoncounter.SingletonCounterGrpc;
import dev.restate.e2e.services.upgradetest.UpgradeTestService;
import dev.restate.e2e.services.upgradetest.UpgradeTestServiceGrpc;
import dev.restate.sdk.vertx.RestateHttpEndpointBuilder;
import io.vertx.core.Vertx;
import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
import java.util.Objects;

public class Main {
Expand All @@ -32,8 +31,7 @@ public static void main(String[] args) {
System.getenv("SERVICES"),
"SERVICES env variable needs to specify which service to run.");

RestateHttpEndpointBuilder restateHttpEndpointBuilder =
RestateHttpEndpointBuilder.builder(Vertx.vertx());
RestateHttpEndpointBuilder restateHttpEndpointBuilder = RestateHttpEndpointBuilder.builder();
for (String service : env.split(",")) {
switch (service.trim()) {
case ListServiceGrpc.SERVICE_NAME:
Expand Down
12 changes: 5 additions & 7 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ dependencyResolutionManagement {

// Libraries
library("restate-sdk-core", "dev.restate.sdk", "sdk-core").versionRef("restate")
library("restate-sdk-blocking", "dev.restate.sdk", "sdk-blocking").versionRef("restate")
library("restate-sdk-java-blocking", "dev.restate.sdk", "sdk-java-blocking")
.versionRef("restate")
library("restate-sdk-jackson", "dev.restate.sdk", "sdk-serde-jackson").versionRef("restate")
library("restate-sdk-vertx", "dev.restate.sdk", "sdk-vertx").versionRef("restate")
library("restate-sdk-http-vertx", "dev.restate.sdk", "sdk-http-vertx").versionRef("restate")

library("protoc", "com.google.protobuf", "protoc").versionRef("protobuf")
library("protobuf-java", "com.google.protobuf", "protobuf-java").versionRef("protobuf")
Expand All @@ -56,9 +57,6 @@ dependencyResolutionManagement {
// Replace javax.annotations-api with tomcat annotations
library("javax-annotation-api", "org.apache.tomcat", "annotations-api").version("6.0.53")

library("vertx-bom", "io.vertx:vertx-stack-depchain:4.4.5")
library("vertx-core", "io.vertx", "vertx-core").withoutVersion()

library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef("jackson")
library("jackson-core", "com.fasterxml.jackson.core", "jackson-core").withoutVersion()
library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").withoutVersion()
Expand Down Expand Up @@ -95,8 +93,8 @@ if (!System.getenv("JAVA_SDK_LOCAL_BUILD").isNullOrEmpty()) {
includeBuild("../sdk-java") {
dependencySubstitution {
substitute(module("dev.restate.sdk:sdk-core")).using(project(":sdk-core"))
substitute(module("dev.restate.sdk:sdk-blocking")).using(project(":sdk-blocking"))
substitute(module("dev.restate.sdk:sdk-vertx")).using(project(":sdk-vertx"))
substitute(module("dev.restate.sdk:sdk-java-blocking")).using(project(":sdk-java-blocking"))
substitute(module("dev.restate.sdk:sdk-http-vertx")).using(project(":sdk-http-vertx"))
substitute(module("dev.restate.sdk:sdk-serde-jackson")).using(project(":sdk-serde-jackson"))
}
}
Expand Down
Loading