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

Jump to bottom

Update DSL to version 9.12.4 #147

Merged
merged 4 commits into from
Jul 1, 2024
Merged

Update DSL to version 9.12.4 #147

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
ac1ab94
Update DSL to version 9.12.4
hugohills-regnosys Jun 27, 2024
830ed93
Re-add dependencies
hugohills-regnosys Jun 28, 2024
5991f56
Update licenses
hugohills-regnosys Jun 28, 2024
3ef86c3
Merge branch 'main' into dsl9124-3
hugohills-regnosys Jul 1, 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
8 changes: 8 additions & 0 deletions .github/workflows/license-scanning.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ env:
licenses/license/name!='CDDL 1.1' and
not(contains(licenses/license/url, '://oss.oracle.com/licenses/CDDL+GPL-1.1')) and

licenses/license/name!='GPL2 w/ CPE' and
not(contains(licenses/license/url, '://glassfish.java.net/public/CDDL+GPL_1_1')) and

licenses/license/name!='CDDL+GPL License' and
not(contains(licenses/license/url, '://glassfish.java.net/public/CDDL+GPL_1_1')) and
licenses/license/name!='Dual license consisting of the CDDL v1.1 and GPL v2' and
not(contains(licenses/license/url, '://glassfish.dev.java.net/public/CDDL+GPL_1_1')) and

licenses/license/name!='Public Domain'
"
REPORT_PATH: "target/generated-resources"
Expand Down
24 changes: 21 additions & 3 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.12.3</rosetta.dsl.version>
<rosetta.dsl.version>9.12.4</rosetta.dsl.version>
<rosetta.common.version>0.0.0.main-SNAPSHOT</rosetta.common.version>

<xtext.version>2.27.0</xtext.version>
Expand All @@ -112,6 +112,7 @@
<!-- test -->
<junit.version>5.9.1</junit.version>
<mockito.version>5.12.0</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<logback.version>1.5.6</logback.version>

<!-- plugins -->
Expand All @@ -128,8 +129,8 @@
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>

</properties>

<profiles>
<profile>
<id>gpg</id>
Expand Down Expand Up @@ -232,6 +233,11 @@
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -254,6 +260,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>co.unruly</groupId>
<artifactId>java-8-matchers</artifactId>
Expand Down Expand Up @@ -299,7 +310,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>

<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<!-- add junit in non-test scope -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -317,6 +331,10 @@
<groupId>co.unruly</groupId>
<artifactId>java-8-matchers</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
Expand Down
Loading