Skip to content

Commit

Permalink
DSL Update (#141)
Browse files Browse the repository at this point in the history
* DSL update

* Last migrations from master to main

* Updated deps

* Fixed deps
  • Loading branch information
SimonCockx authored Jun 21, 2024
1 parent 23771e8 commit aaec9b7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion codefresh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ steps:
variableDefined: "${{TAG_REPO}} == false"
skipNextBuild: "${{SKIP_NEXT_BUILD}} == false"
commands:
- codefresh run REGnosys/rosetta-components/rosetta-components --branch master --detach
- codefresh run REGnosys/rosetta-components/rosetta-components --branch main --detach
12 changes: 3 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<java.enforced.version>[17,18)</java.enforced.version>
<maven.compiler.release>11</maven.compiler.release>

<rosetta.dsl.version>9.11.2</rosetta.dsl.version>
<rosetta.dsl.version>9.12.0</rosetta.dsl.version>
<rosetta.common.version>0.0.0.main-SNAPSHOT</rosetta.common.version>

<xtext.version>2.27.0</xtext.version>
Expand All @@ -111,9 +111,8 @@

<!-- test -->
<junit.version>5.9.1</junit.version>
<junit-platform-commons.version>1.9.1</junit-platform-commons.version>
<mockito.version>5.1.1</mockito.version>
<logback.version>1.4.7</logback.version>
<mockito.version>5.12.0</mockito.version>
<logback.version>1.5.6</logback.version>

<!-- plugins -->
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
Expand Down Expand Up @@ -248,11 +247,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>${junit-platform-commons.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Map<String, String> generateRosettaFiles(Collection<Resource> resources)
return results;
}

// This is required because the branch gets generated as the version, so you would get 'version "0.0.0.master"'
// This is required because the branch gets generated as the version, so you would get 'version "0.0.0.main-SNAPSHOT"'
public static String rewriteProjectVersion(String out) {
return out.replaceAll("version \".*?\"", "version \"\\${project.version}\"");
}
Expand Down

0 comments on commit aaec9b7

Please sign in to comment.