Skip to content

fix: set current sdk version using @project.version@ #154

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

Merged
octonato merged 1 commit into from
Jul 16, 2021
Merged

fix: set current sdk version using @project.version@ #154

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
4 changes: 2 additions & 2 deletions ...rless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.target>11</jdk.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<akkaserverless-sdk.version>0.7.0-beta.10</akkaserverless-sdk.version>
<akkaserverless-sdk.version>@project.version@</akkaserverless-sdk.version>
Copy link
Copy Markdown
Member Author

@octonato octonato Jul 16, 2021

Choose a reason for hiding this comment

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

Actually we had already a solution for this, but it was not being used for the sdk version, but only for the maven-plugin version.

We want sdk, testkit and maven-plugin to use akkaserverless-sdk.version and it's now set using @project.version@.

<akka-grpc.version>1.1.1</akka-grpc.version>
<akka-streams.version>2.6.14</akka-streams.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down Expand Up @@ -206,7 +206,7 @@
<plugin>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<version>@project.version@</version>
<version>${D}{akkaserverless-sdk.version}</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions ...kkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.target>11</jdk.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<akkaserverless-sdk.version>0.7.0-beta.10</akkaserverless-sdk.version>
<akkaserverless-sdk.version>@project.version@</akkaserverless-sdk.version>
<akka-grpc.version>1.1.1</akka-grpc.version>
<akka-streams.version>2.6.14</akka-streams.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down Expand Up @@ -206,7 +206,7 @@
<plugin>
<groupId>com.akkaserverless</groupId>
<artifactId>akkaserverless-maven-plugin</artifactId>
<version>@project.version@</version>
<version>${D}{akkaserverless-sdk.version}</version>
Copy link
Copy Markdown
Contributor

@johanandren johanandren Jul 16, 2021

Choose a reason for hiding this comment

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

${D}?

Copy link
Copy Markdown
Member Author

@octonato octonato Jul 16, 2021

Choose a reason for hiding this comment

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

This is to avoid premature substitution. It's used everywhere in this file whenever we want the archetype to have a ${var}.

However, it may not be needed. I can check it later, but don't want to change more than necessary here.

Copy link
Copy Markdown
Member Author

@octonato octonato Jul 16, 2021

Choose a reason for hiding this comment

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

For instance, like here:

https://github.com/lightbend/akkaserverless-java-sdk/blob/main/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml#L11-L33

Copy link
Copy Markdown
Contributor

@johanandren johanandren Jul 16, 2021

Choose a reason for hiding this comment

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

Trixy!

<executions>
<execution>
<goals>
Expand Down