Revert "Migrate the generated Java artefacts to be published to maven…

… central (finos#2093)" (finos#2197)

This reverts commit daea664.

.github/workflows/license-scanning.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        module-folder: ["./", "./examples", "./rosetta-source", "./rosetta-project", "./distribution", "./scheme-import"]
+        module-folder: ["./", "./isda-demo", "./rosetta-source", "./rosetta-project", "./cdm-distribution", "./scheme-import"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 11

RELEASE.md

@@ -1,61 +1,16 @@
-# *Infrastructure - CDM Artifacts published to Maven Central*
+# *Infrastructure - Dependency Updates*
 
-#### _What is being released?_
+_What is being released?_
 
-As part of the CDM migration to FINOS, all generated artifacts are now being published to Maven Central. The intention to make this change was presented to CDM community, and noted in the CDM transition document ["Common Domain Model becoming Open Source @ FINOS"](https://assets.isda.org/media/6fac704a/081f5537.pdf), earlier this year. This is a positive step for the CDM community and realizes a demand from implementers that the project has noted for some time.
+This release updates the `rosetta-dsl` dependency:
 
-#### _Downloading Source Code_
+- Versions:
+    - `7.9.3` Made keyword `then` mandatory to avoid ambiguity. Improved consistency of using
+      square brackets. See also https://github.com/REGnosys/rosetta-dsl/issues/569 for more details and information on usage.
 
-Previously, only the latest CDM source code was available to download from the CDM Portal. After this release, the open source code is only available to be downloaded from [CDM GitHub](https://github.com/finos/common-domain-model). However, additional to the latest version, previously released versions are tagged and can be downloaded from [CDM GitHub Releases](https://github.com/finos/common-domain-model/releases) also.
+The model has been updated to conform to the new DSL syntax. No logical changes to
+the model have been made, thereby the test expectations remain the same.
 
-#### _CDM as Java_
+_Review directions_
 
-In order to use the latest version of CDM in a [Maven](https://maven.apache.org) project, the following dependency needs to be added to the project pom.xml:
-
-```
-<dependency>
-  <groupId>org.finos.cdm</groupId>
-  <artifactId>cdm-java</artifactId>
-  <version>LATEST</version>
-</dependency>
-```
-
-Going forward from this release, the "LATEST" value can be substituted for with any of the subqequent [CDM GitHub Releases](https://github.com/finos/common-domain-model/releases). 
-
-For implemntation of CDM releases prior to today's release, dependencies in implementers' projects can still point to the version in [Artifactory](https://regnosys.jfrog.io/ui/repos/tree/General/libs-snapshot/com/isda/cdm) as they do today.
-
-#### _CDM as Java Examples_
-
-Examples of how you can use the CDM can be found in GitHub: [CDM GitHub Examples](https://github.com/finos/common-domain-model/tree/master/examples).
-
-#### _CDM as PYTHON_
-
-CDM as PYHON is available as a set of `.tar.gz` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-python/).
-
-#### _CDM as DAML_
-
-CDM as DAML is available as a set of `.dar` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-daml/).
-
-#### _CDM as Scala_
-
-CDM as Scala is available as a `.jar` file published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-scala/).
-
-#### _CDM as C# 8.0_
-
-CDM as C# 8.0 is available as a `tar.gz` file containing compiled `.dll` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-csharp8/).
-
-#### _CDM as C# 9.0_
-
-CDM as C# 9.0 is available as a `tar.gz` file containing compiled `.dll` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-csharp9/).
-
-#### _CDM as Go_
-
-CDM as Go is available as a `tar.gz` file containing the `.go` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-golang/).
-
-#### _CDM as TypeScript_
-
-CDM as TypeScript is available as a `tar.gz` file containing the `.ts` files published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-typescript/).
-
-#### _CDM as Kotlin_
-
-CDM as Kotlin is available as a `.jar` file published [here](https://central.sonatype.com/artifact/org.finos.cdm/cdm-kotlin/).
+CDM Java implementors should update their maven `pom.xml` to the latest CDM maven artefact (groupId com.isda, artifactId cdm) and recompile.

distribution/csharp8-pom.xml → cdm-distribution/csharp8-pom.xml

@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>cdm-parent</artifactId>
-        <groupId>org.finos.cdm</groupId>
-        <version>0.0.0.master-SNAPSHOT</version>
+        <groupId>com.isda</groupId>
+        <version>0.0.0.master</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution-csharp8</artifactId>
-    <version>0.0.0.master-SNAPSHOT</version>
+    <artifactId>cdm-distribution-csharp8</artifactId>
+    <version>0.0.0.master</version>
     <packaging>pom</packaging>
-    <name>distribution-csharp8</name>
-    <url>https://www.finos.org/common-domain-model</url>
+    <name>cdm-distribution-csharp8</name>
+    <url>https://www.isda.org</url>
 
     <properties>
         <junit.version>5.9.1</junit.version>
@@ -21,8 +21,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.finos.cdm</groupId>
-                <artifactId>cdm-java</artifactId>
+                <groupId>com.isda</groupId>
+                <artifactId>cdm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -37,8 +37,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.finos.cdm</groupId>
-            <artifactId>cdm-java</artifactId>
+            <groupId>com.isda</groupId>
+            <artifactId>cdm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -72,8 +72,8 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
-                                    <artifactId>cdm-java</artifactId>
+                                    <groupId>com.isda</groupId>
+                                    <artifactId>cdm</artifactId>
                                     <version>${project.version}</version>
                                     <includes>cdm/**,cdm-sample-files/**,schemas/**,config/**</includes>
                                 </artifactItem>
@@ -90,7 +90,7 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts/lib</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
+                                    <groupId>com.isda</groupId>
                                     <artifactId>cdm-csharp8</artifactId>
                                     <version>${project.version}</version>
                                     <type>tar.gz</type>
@@ -150,4 +150,12 @@
             </plugin>
         </plugins>
     </build>
+
+    <distributionManagement>
+        <repository>
+            <id>snapshots</id>
+            <name>libs-snapshots</name>
+            <url>https://regnosys.jfrog.io/regnosys/libs-snapshot-local</url>
+        </repository>
+    </distributionManagement>
 </project>

distribution/csharp9-pom.xml → cdm-distribution/csharp9-pom.xml

@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>cdm-parent</artifactId>
-        <groupId>org.finos.cdm</groupId>
-        <version>0.0.0.master-SNAPSHOT</version>
+        <groupId>com.isda</groupId>
+        <version>0.0.0.master</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution-csharp9</artifactId>
-    <version>0.0.0.master-SNAPSHOT</version>
+    <artifactId>cdm-distribution-csharp9</artifactId>
+    <version>0.0.0.master</version>
     <packaging>pom</packaging>
-    <name>distribution-csharp9</name>
-    <url>https://www.finos.org/common-domain-model</url>
+    <name>cdm-distribution-csharp9</name>
+    <url>https://www.isda.org</url>
 
     <properties>
         <junit.version>5.9.1</junit.version>
@@ -21,8 +21,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.finos.cdm</groupId>
-                <artifactId>cdm-java</artifactId>
+                <groupId>com.isda</groupId>
+                <artifactId>cdm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -37,8 +37,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.finos.cdm</groupId>
-            <artifactId>cdm-java</artifactId>
+            <groupId>com.isda</groupId>
+            <artifactId>cdm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -72,8 +72,8 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
-                                    <artifactId>cdm-java</artifactId>
+                                    <groupId>com.isda</groupId>
+                                    <artifactId>cdm</artifactId>
                                     <version>${project.version}</version>
                                     <includes>cdm/**,cdm-sample-files/**,schemas/**,config/**</includes>
                                 </artifactItem>
@@ -90,7 +90,7 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts/lib</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
+                                    <groupId>com.isda</groupId>
                                     <artifactId>cdm-csharp9</artifactId>
                                     <version>${project.version}</version>
                                     <type>tar.gz</type>
@@ -150,4 +150,12 @@
             </plugin>
         </plugins>
     </build>
+
+    <distributionManagement>
+        <repository>
+            <id>snapshots</id>
+            <name>libs-snapshots</name>
+            <url>https://regnosys.jfrog.io/regnosys/libs-snapshot-local</url>
+        </repository>
+    </distributionManagement>
 </project>

distribution/daml-pom.xml → cdm-distribution/daml-pom.xml

@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>cdm-parent</artifactId>
-        <groupId>org.finos.cdm</groupId>
-        <version>0.0.0.master-SNAPSHOT</version>
+        <groupId>com.isda</groupId>
+        <version>0.0.0.master</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution-daml</artifactId>
-    <version>0.0.0.master-SNAPSHOT</version>
+    <artifactId>cdm-distribution-daml</artifactId>
+    <version>0.0.0.master</version>
     <packaging>pom</packaging>
-    <name>distribution-daml</name>
-    <url>https://www.finos.org/common-domain-model</url>
+    <name>cdm-distribution-daml</name>
+    <url>https://www.isda.org</url>
 
     <properties>
         <junit.version>5.9.1</junit.version>
@@ -21,8 +21,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.finos.cdm</groupId>
-                <artifactId>cdm-java</artifactId>
+                <groupId>com.isda</groupId>
+                <artifactId>cdm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -37,8 +37,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.finos.cdm</groupId>
-            <artifactId>cdm-java</artifactId>
+            <groupId>com.isda</groupId>
+            <artifactId>cdm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -72,8 +72,8 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
-                                    <artifactId>cdm-java</artifactId>
+                                    <groupId>com.isda</groupId>
+                                    <artifactId>cdm</artifactId>
                                     <version>${project.version}</version>
                                     <includes>cdm/**,cdm-sample-files/**,schemas/**,config/**</includes>
                                 </artifactItem>
@@ -90,7 +90,7 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts/lib</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
+                                    <groupId>com.isda</groupId>
                                     <artifactId>cdm-daml</artifactId>
                                     <version>${project.version}</version>
                                     <type>tar.gz</type>
@@ -150,4 +150,12 @@
             </plugin>
         </plugins>
     </build>
+
+    <distributionManagement>
+        <repository>
+            <id>snapshots</id>
+            <name>libs-snapshots</name>
+            <url>https://regnosys.jfrog.io/regnosys/libs-snapshot-local</url>
+        </repository>
+    </distributionManagement>
 </project>

distribution/golang-pom.xml → cdm-distribution/golang-pom.xml

@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>cdm-parent</artifactId>
-        <groupId>org.finos.cdm</groupId>
-        <version>0.0.0.master-SNAPSHOT</version>
+        <groupId>com.isda</groupId>
+        <version>0.0.0.master</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution-golang</artifactId>
-    <version>0.0.0.master-SNAPSHOT</version>
+    <artifactId>cdm-distribution-golang</artifactId>
+    <version>0.0.0.master</version>
     <packaging>pom</packaging>
-    <name>distribution-golang</name>
-    <url>https://www.finos.org/common-domain-model</url>
+    <name>cdm-distribution-golang</name>
+    <url>https://www.isda.org</url>
 
     <properties>
         <junit.version>5.9.1</junit.version>
@@ -21,8 +21,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.finos.cdm</groupId>
-                <artifactId>cdm-java</artifactId>
+                <groupId>com.isda</groupId>
+                <artifactId>cdm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -37,8 +37,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.finos.cdm</groupId>
-            <artifactId>cdm-java</artifactId>
+            <groupId>com.isda</groupId>
+            <artifactId>cdm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -72,8 +72,8 @@
                             <outputDirectory>${project.build.directory}/cdm-artefacts</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.finos.cdm</groupId>
-                                    <artifactId>cdm-java</artifactId>
+                                    <groupId>com.isda</groupId>
+                                    <artifactId>cdm</artifactId>
                                     <version>${project.version}</version>
                                     <includes>cdm/**,cdm-sample-files/**,schemas/**,config/**</includes>
                                 </artifactItem>
@@ -132,4 +132,12 @@
             </plugin>
         </plugins>
     </build>
+
+    <distributionManagement>
+        <repository>
+            <id>snapshots</id>
+            <name>libs-snapshots</name>
+            <url>https://regnosys.jfrog.io/regnosys/libs-snapshot-local</url>
+        </repository>
+    </distributionManagement>
 </project>