Skip to content

Commit

Permalink
refactor: centralize edc version (#752)
Browse files Browse the repository at this point in the history
  • Loading branch information
wolf4ood authored Sep 6, 2023
1 parent cc20afb commit c45c6aa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 4 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,14 @@ plugins {
val txScmConnection: String by project
val txWebsiteUrl: String by project
val txScmUrl: String by project
val annotationProcessorVersion: String by project
val metaModelVersion: String by project
val edcVersion = libs.versions.edc

buildscript {
repositories {
mavenLocal()
}
dependencies {
val edcGradlePluginsVersion: String by project
classpath("org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin:${edcGradlePluginsVersion}")
classpath(libs.edc.build.plugin)
}
}

Expand Down Expand Up @@ -78,7 +76,7 @@ allprojects {

// configure which version of the annotation processor to use. defaults to the same version as the plugin
configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
processorVersion.set(annotationProcessorVersion)
processorVersion.set(edcVersion)
outputDirectory.set(project.buildDir)
// uncomment the following lines to enable the Autodoc-2-Markdown converter
// only available with EDC 0.2.1 SNAPSHOT
Expand All @@ -89,7 +87,7 @@ allprojects {
configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
versions {
// override default dependency versions here
metaModel.set(metaModelVersion)
metaModel.set(edcVersion)

}
pom {
Expand Down
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
group=org.eclipse.tractusx.edc
version=0.5.2-SNAPSHOT
# configure the build:
annotationProcessorVersion=0.2.1
edcGradlePluginsVersion=0.2.1
metaModelVersion=0.2.1
txScmConnection=scm:git:[email protected]:eclipse-tractusx/tractusx-edc.git
txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ edc-jwt-core = { module = "org.eclipse.edc:jwt-core", version.ref = "edc" }
edc-spi-oauth2 = { module = "org.eclipse.edc:oauth2-spi", version.ref = "edc" }
edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" }
edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
edc-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
Expand Down

0 comments on commit c45c6aa

Please sign in to comment.