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

config as java code #1051

Merged
merged 21 commits into from
Oct 2, 2024
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
12 changes: 5 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
For documentation on how to update this changelog,
please see [changelog_updates.md](docs/dev/changelog_updates.md).


## [x.x.x] - UNRELEASED

### Overview
Expand All @@ -12,12 +11,14 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).

#### Major Changes

- Moved Catalog Crawler to the Authority Portal
- Removed Catalog Crawler as it will be added to the Authority Portal to prevent circular dependencies ([#1052](https://github.com/sovity/edc-ce/pull/1052))

#### Minor Changes

#### Patch Changes

- Refactoring: Config as Java Code ([#1051](https://github.com/sovity/edc-ce/pull/1051))

### Deployment Migration Notes

_No special deployment migration steps required_
Expand All @@ -30,7 +31,6 @@ _No special deployment migration steps required_
- MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{{ VERSION }}`
- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}`


## [10.4.1] - 2024-09-26

### Overview
Expand Down Expand Up @@ -73,7 +73,6 @@ _No special deployment migration steps required_
- Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:10.4.1`
- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.1.5`


## [10.4.0] - 2024-09-18

### Overview
Expand All @@ -98,7 +97,6 @@ UI and Wrapper API improvements.
- Fixed time restriction upper bound "local day to datetime" conversion issues
([#815](https://github.com/sovity/edc-ui/issues/815))


### Deployment Migration Notes

_No special deployment migration steps required_
Expand All @@ -113,7 +111,6 @@ _No special deployment migration steps required_
- Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:10.4.0`
- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.1.4`


## [10.3.0] - 2024-09-04

### Overview
Expand Down Expand Up @@ -191,6 +188,7 @@ This is a replacement for redacted release `10.1.0` with a few additional bug fi
##### logging-house-client extension

If the extension is to be switched off, the following must now be set, as the extension is now activated by default when integrated:

- `EDC_LOGGINGHOUSE_EXTENSION_ENABLED: 'false'`

#### Compatible Versions
Expand Down Expand Up @@ -226,7 +224,7 @@ MDS 2.2 release
#### Major Changes

- Complex policies using AND, OR and XONE:
- Complex policy support in the Connector UI.
- Complex policy support in the Connector UI.
- The `UiPolicy` model has been adjusted to support complex expressions including `AND`, `OR` and `XONE`.
- The `createPolicyDefinition` has been marked as deprecated in favor of the new `createPolicyDefinitionV2` endpoint that supports complex policies.
- Removed the recently rushed `createPolicyDefinitionUseCase` endpoint in favor of the new `createPolicyDefinitionV2` endpoint.
Expand Down
21 changes: 8 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ val getJars by tasks.registering(Copy::class) {
outputs.upToDateWhen { false } //always download

from(downloadArtifact)
// strip away the version string
.rename { s ->
s.replace("-${identityHubVersion}", "")
.replace("-${registrationServiceVersion}", "")
.replace("-all", "")
}
// strip away the version string
.rename { s ->
s.replace("-${identityHubVersion}", "")
.replace("-${registrationServiceVersion}", "")
.replace("-all", "")
}
into(layout.projectDirectory.dir("libs/cli-tools"))
}

Expand Down Expand Up @@ -101,7 +101,8 @@ allprojects {
}
}
maven {
url = uri("https://pkgs.dev.azure.com/sovity/41799556-91c8-4df6-8ddb-4471d6f15953/_packaging/core-edc/maven/v1")
url =
uri("https://pkgs.dev.azure.com/sovity/41799556-91c8-4df6-8ddb-4471d6f15953/_packaging/core-edc/maven/v1")
name = "AzureRepo"
}
}
Expand Down Expand Up @@ -134,11 +135,5 @@ subprojects {

java {
withSourcesJar()
withJavadocJar()
}

tasks.withType<Javadoc> {
val fullOptions = options as StandardJavadocDocletOptions
fullOptions.addStringOption("Xdoclint:none", "-quiet")
}
}
30 changes: 30 additions & 0 deletions config/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

plugins {
`java-library`
`maven-publish`
}

dependencies {
annotationProcessor(libs.lombok)
compileOnly(libs.lombok)

api(libs.edc.boot)

testAnnotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junitJupiter)
testImplementation(libs.assertj.core)
testImplementation(libs.junit.api)
testRuntimeOnly(libs.junit.engine)
}

group = libs.versions.sovityEdcGroup.get()

publishing {
publications {
create<MavenPublication>(project.name) {
from(components["java"])
}
}
}
Loading
Loading