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

chore: update run configs and EDC version #388

Merged
merged 1 commit into from
Nov 22, 2024
Merged

chore: update run configs and EDC version #388

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
3 changes: 2 additions & 1 deletion .run/Connector Consumer Corp.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Connector Consumer Corp" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="temurin-22" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not to set it to 23? LTS is not a requirement for a project that meant to stay up-to-date

<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="envFilePaths">
<option value="$PROJECT_DIR$/deployment/assets/env/consumer_connector.env" />
</option>
<option name="MAIN_CLASS_NAME" value="org.eclipse.edc.boot.system.runtime.BaseRuntime" />
<module name="mvd.launchers.runtime-embedded.main" />
<option name="PROGRAM_PARAMETERS" value="--log-level=debug" />
<method v="2">
<option name="Make" enabled="true" />
</method>
Expand Down
2 changes: 1 addition & 1 deletion .run/Connector _provider-manufacturing_.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Connector &quot;provider-manufacturing&quot;" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="temurin-22" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="envFilePaths">
<option value="$PROJECT_DIR$/deployment/assets/env/provider_connector_manufacturing.env" />
Expand Down
2 changes: 1 addition & 1 deletion .run/IdentityHub Consumer Corp.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IdentityHub Consumer Corp" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="temurin-22" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="envFilePaths">
<option value="$PROJECT_DIR$/deployment/assets/env/consumer_identityhub.env" />
Expand Down
2 changes: 1 addition & 1 deletion .run/Provider Catalog Server.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Provider Catalog Server" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="temurin-22" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="envFilePaths">
<option value="$PROJECT_DIR$/deployment/assets/env/provider_catalogserver.env" />
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ buildscript {
}
}

val annotationProcessorVersion: String by project
val edcGradlePluginsVersion: String by project

allprojects {
apply(plugin = "${group}.edc-build")

// configure which version of the annotation processor to use. defaults to the same version as the plugin
configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
outputDirectory.set(project.layout.buildDirectory.asFile)
processorVersion.set(annotationProcessorVersion)
processorVersion.set(edcGradlePluginsVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could also be not set, by default it will be same as the project version (0.11.0-SNAPSHOT)

}

configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
group=org.eclipse.edc
version=0.10.0-SNAPSHOT
version=0.11.0-SNAPSHOT

edcGradlePluginsVersion=0.10.0-SNAPSHOT
annotationProcessorVersion=0.10.0-SNAPSHOT
edcGradlePluginsVersion=0.11.0-SNAPSHOT
Loading