Revert "nexus release (finos#2194)" (finos#2196)

This reverts commit 55400cf.
dackattack218 · Jun 19, 2023 · c85e113 · c85e113
1 parent 55400cf
commit c85e113
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 88 deletions.
diff --git a/codefresh.yml b/codefresh.yml
@@ -23,7 +23,6 @@ steps:
       - cf_export MVN_DEPLOY_FLAGS="-s ${{CF_VOLUME_PATH}}/${{CF_REPO_NAME}}/settings.xml -Dmaven.repo.local=${{CF_VOLUME_PATH}}/.m2 -Denv.CI_DEPLOY_PASSWORD=${{CI_DEPLOY_PASSWORD}} -Denv.CI_DEPLOY_USERNAME=${{CI_DEPLOY_USERNAME}} -Denv.GPG_KEYNAME=${{GPG_KEYNAME}} -Denv.GPG_PASSPHRASE=${{GPG_PASSPHRASE}}"
       - cf_export MVN_BUILD_FLAGS="-Dmaven.repo.local=${{CF_VOLUME_PATH}}/.m2"
       - cf_export GPG_IMPORT_COMMAND="cat <(echo -e '${{GPG_PRIVATE_KEY}}') | gpg --batch --import"
-      - cf_export GEN_DEPLOY_POM_SCRIPT="${{CF_VOLUME_PATH}}/${{CF_REPO_NAME}}/rosetta-source/src/main/resources/build-resources/create-deploy-pom.sh"
 
   ReleaseProperties:
     stage: 'setup'
@@ -85,8 +84,6 @@ steps:
         commands:
           - sbt compile
           - sbt package
-          - sbt doc
-          - sbt packageDoc packageSrc
       BuildCSharp8:
         stage: 'build'
         title: CSharp8 build
@@ -136,103 +133,89 @@ steps:
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target
+          - cd ${{REPO_PATH}}/rosetta-source/target
           - tar -cvzf cdm-daml-${{RELEASE_NAME}}.tar.gz cdm-daml-${{RELEASE_NAME}}.dar
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-daml ${{RELEASE_NAME}} tar.gz
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-daml-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-daml -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DpomFile=cdm-daml-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-daml-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-daml -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DgeneratePom=true
       DeployScala:
         stage: 'build'
         title: Scala deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm/scala
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm/scala/target/scala-2.12
+          - cd ${{REPO_PATH}}/rosetta-source/target/classes/cdm/scala/target/scala-2.12
           - mv cdm-scala_2.12-0.0.0.snapshot.jar cdm-scala-${{RELEASE_NAME}}.jar
-          - mv cdm-scala_2.12-0.0.0.snapshot-sources.jar cdm-scala-${{RELEASE_NAME}}-sources.jar
-          - mv cdm-scala_2.12-0.0.0.snapshot-javadoc.jar cdm-scala-${{RELEASE_NAME}}-javadoc.jar
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-scala-${{RELEASE_NAME}}.jar -DgroupId=org.finos.cdm -DartifactId=cdm-scala -Dversion=${{RELEASE_NAME}} -DgeneratePom=true -Dsources=cdm-scala-${{RELEASE_NAME}}-sources.jar -Djavadoc=cdm-scala-${{RELEASE_NAME}}-javadoc.jar
-
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-scala-${{RELEASE_NAME}}.jar -DgroupId=org.finos.cdm -DartifactId=cdm-scala -Dversion=${{RELEASE_NAME}} -DgeneratePom=true
       DeployCSharp8:
         stage: 'build'
         title: CSharp8 deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm/csharp8/NetStandard.2.1
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm/csharp8/NetStandard.2.1
           - tar -cvzf cdm-csharp8-${{RELEASE_NAME}}.tar.gz app
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-csharp8 ${{RELEASE_NAME}} tar.gz
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-csharp8-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-csharp8 -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DpomFile=cdm-csharp8-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-csharp8-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-csharp8 -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DgeneratePom=true
       DeployCSharp9:
         stage: 'build'
         title: CSharp9 deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm/csharp9/Net.5.0
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm/csharp9/Net.5.0
           - tar -cvzf cdm-csharp9-${{RELEASE_NAME}}.tar.gz app
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-csharp9 ${{RELEASE_NAME}} tar.gz
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-csharp9-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-csharp9 -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DpomFile=cdm-csharp9-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-csharp9-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-csharp9 -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DgeneratePom=true
       DeployTypeScript:
         stage: 'build'
         title: TypeScript deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm
           - tar -cvzf cdm-typescript-${{RELEASE_NAME}}.zip typescript
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-typescript ${{RELEASE_NAME}} zip
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-typescript-${{RELEASE_NAME}}.zip -DgroupId=org.finos.cdm -DartifactId=cdm-typescript -Dversion=${{RELEASE_NAME}} -DpomFile=cdm-typescript-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-typescript-${{RELEASE_NAME}}.zip -DgroupId=org.finos.cdm -DartifactId=cdm-typescript -Dversion=${{RELEASE_NAME}} -DgeneratePom=true
       DeployGo:
         stage: 'build'
         title: Go deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm
           - tar -cvzf cdm-golang-${{RELEASE_NAME}}.tar.gz golang
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-golang ${{RELEASE_NAME}} tar.gz
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-golang-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-golang -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DpomFile=cdm-golang-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-golang-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-golang -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DgeneratePom=true
       DeployKotlin:
         stage: 'build'
         title: Kotlin deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm/kotlin
+          - cd rosetta-source/target/classes/cdm/kotlin
           - mvn -f kotlin-build-pom.xml ${{MVN_BUILD_FLAGS}} versions:update-parent -DparentVersion=${{RELEASE_NAME}} -DallowSnapshots=true
           - mvn -f kotlin-build-pom.xml ${{MVN_BUILD_FLAGS}} versions:set -DnewVersion=${{RELEASE_NAME}} -DallowSnapshots=true
-          - mvn -f kotlin-build-pom.xml ${{MVN_DEPLOY_FLAGS}} clean deploy -P gpg
+          - mvn -f kotlin-build-pom.xml ${{MVN_DEPLOY_FLAGS}} clean deploy
       DeployPython:
         stage: 'build'
         title: Python deploy
         fail_fast: false
         image: maven:3.8.2-jdk-11
-        working_directory: ./rosetta-source/
+        working_directory: ./rosetta-source/target/classes/cdm/python
         shell: bash
         commands:
           - bash -c "${{GPG_IMPORT_COMMAND}}"
-          - cd target/classes/cdm/python
           - tar -cvzf cdm-python-${{RELEASE_NAME}}.tar.gz python_cdm-*-py3-none-any.whl rosetta_runtime-*-py3-none-any.whl
-          - ${{GEN_DEPLOY_POM_SCRIPT}} cdm-python ${{RELEASE_NAME}} tar.gz
-          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-python-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-python -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DpomFile=cdm-python-${{RELEASE_NAME}}.pom
+          - mvn gpg:sign-and-deploy-file ${{MVN_DEPLOY_FILE_FLAGS}} -Dfile=cdm-python-${{RELEASE_NAME}}.tar.gz -DgroupId=org.finos.cdm -DartifactId=cdm-python -Dversion=${{RELEASE_NAME}} -Dpackaging=tar.gz -DgeneratePom=true
 
 
   NotifySlackOnFail:

diff --git a/rosetta-source/pom.xml b/rosetta-source/pom.xml
@@ -351,7 +351,7 @@
                                     <outputDirectory>${project.build.directory}/classes/cdm/scala</outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${basedir}/src/main/resources/build-resources/scala</directory>
+                                            <directory>${basedir}/src/main/resources/scala-build-resources</directory>
                                             <includes>
                                                 <include>**/*</include>
                                             </includes>
@@ -432,7 +432,7 @@
                                     <outputDirectory>${project.build.directory}/classes/cdm/golang</outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${basedir}/src/main/resources/build-resources/golang</directory>
+                                            <directory>${basedir}/src/main/resources/golang-build-resources</directory>
                                             <includes>
                                                 <include>**/*</include>
                                             </includes>
@@ -706,7 +706,7 @@
                                     </outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${basedir}/src/main/resources/build-resources/kotlin</directory>
+                                            <directory>${basedir}/src/main/resources/kotlin-build-resources</directory>
                                         </resource>
                                     </resources>
                                 </configuration>

diff --git a/rosetta-source/src/main/resources/build-resources/create-deploy-pom.sh b/rosetta-source/src/main/resources/build-resources/create-deploy-pom.sh
diff --git a/...ild-resources/kotlin/kotlin-build-pom.xml → ...tlin-build-resources/kotlin-build-pom.xml b/...ild-resources/kotlin/kotlin-build-pom.xml → ...tlin-build-resources/kotlin-build-pom.xml
@@ -9,15 +9,13 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.finos.cdm</groupId>
     <artifactId>cdm-kotlin</artifactId>
     <version>0.0.0.master-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>cdm-kotlin</name>
     <url>https://www.finos.org/common-domain-model</url>
 
     <properties>
-        <gpg.keyname>configured-by-release-profile</gpg.keyname>
         <repoServerHost>oss.sonatype.org</repoServerHost>
 
         <maven.compiler.release>11</maven.compiler.release>
@@ -27,7 +25,6 @@
         <kotlin.version>1.4.32</kotlin.version>
         <serialization.version>1.1.0</serialization.version>
         <apache.commons.lang3.version>3.1</apache.commons.lang3.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
     </properties>
 
     <build>
@@ -67,29 +64,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                        <configuration>
-                            <keyname>${gpg.keyname}</keyname>
-                            <passphraseServerId>${gpg.keyname}</passphraseServerId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...resources/build-resources/scala/build.sbt → ...resources/scala-build-resources/build.sbt b/...resources/build-resources/scala/build.sbt → ...resources/scala-build-resources/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 
 ThisBuild / scalaVersion     := "2.12.8"
 ThisBuild / version          := "0.0.0.snapshot"
-ThisBuild / organization     := "org.finos.cdm"
+ThisBuild / organization     := "org.isda.cdm"
 ThisBuild / organizationName := "cdm-scala"
 
 val versions = new {

diff --git a/...esources/scala/project/Dependencies.scala → ...uild-resources/project/Dependencies.scala b/...esources/scala/project/Dependencies.scala → ...uild-resources/project/Dependencies.scala
diff --git a/...-resources/scala/project/build.properties → ...-build-resources/project/build.properties b/...-resources/scala/project/build.properties → ...-build-resources/project/build.properties
diff --git a/...build-resources/scala/project/plugins.sbt → ...scala-build-resources/project/plugins.sbt b/...build-resources/scala/project/plugins.sbt → ...scala-build-resources/project/plugins.sbt