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

DSL Update #141

Merged
merged 4 commits into from
Jun 21, 2024
Merged

DSL Update #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98c585a
DSL update
SimonCockx Jun 19, 2024
dee7632
Last migrations from master to main
SimonCockx Jun 19, 2024
d84cc61
Updated deps
SimonCockx Jun 19, 2024
d41dabe
Fixed deps
SimonCockx Jun 19, 2024
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
2 changes: 1 addition & 1 deletion codefresh.yml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/regnosys/testing/schemeimport/RosettaResourceWriter.java
View file
Open in desktop
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
Loading