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
11 changes: 5 additions & 6 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ plugins {
// Root project needs repositories too — spotless (applied here) resolves
// the palantir-java-format artifact at the root level.
repositories {
mavenCentral()
// mavenLocal first: a locally-published conductor-ai (same version) must win
// over Central so an in-place patched build is picked up.
mavenLocal()
mavenCentral()
}

// ── Version catalog ──────────────────────────────────────────────
ext {
// TARGET branch: worker secrets use TaskDef.runtimeMetadata (conductor-oss PR #1255), so the
// server references TaskDef.setRuntimeMetadata and must build against a conductor that has it.
// Pinned to the local runtimemeta build (superset of 3.32.0-rc.3); revert to a published version
// once PR #1255 ships. (The interim on feature/embedded-secret-toggle builds against 3.32.0-rc.3.)
conductorVersion = '3.32.0-rc.5'
lombokVersion = '1.18.42'
log4jVersion = '2.24.3'
Expand Down Expand Up @@ -46,8 +44,9 @@ subprojects {
}

repositories {
mavenCentral()
// mavenLocal first: locally-published conductor-ai patch wins over Central.
mavenLocal()
mavenCentral()
}

configurations.all {
Expand Down
1 change: 1 addition & 0 deletions server/conductor-agentspan-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'org.springframework.retry:spring-retry'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
implementation 'org.springframework.boot:spring-boot-starter-log4j2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,15 @@
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableScheduling;

import com.netflix.conductor.core.execution.tasks.Join;

import lombok.RequiredArgsConstructor;

@SpringBootApplication(
exclude = {DataSourceAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
@EnableScheduling
@ComponentScan(
// Conductor engine packages only — AgentSpan beans (dev.agentspan.runtime) are
// contributed by AgentSpanAutoConfiguration via the auto-configuration imports file.
basePackages = {"com.netflix.conductor", "io.orkes.conductor", "org.conductoross.conductor"},
excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = Join.class))
@ComponentScan(basePackages = {"com.netflix.conductor", "io.orkes.conductor", "org.conductoross.conductor"})
@RequiredArgsConstructor
public class AgentRuntime implements ApplicationRunner {

Expand Down

This file was deleted.

Loading
Loading