Changes group ID to allow EHRbase build w/ locally installed SDK deps

and manual patch version bump
ehrbase · Jun 30, 2020 · f1bbb84 · f1bbb84
1 parent 67fa04b
commit f1bbb84
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 44 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -206,12 +206,11 @@ jobs:
                     ;;
                 ( !(!(*"patch"*)|!(*"release"*)) )
                     echo "deploy patch release"
-                    mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} versions:commit
-                    echo "TODO - deploy to jitpack command goes here"
+                    mvn build-helper:parse-version versions:set -DnewVersion=v\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
                     SDK_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
-                    git commit -am "released v${SDK_VERSION}-SNAPSHOT [skip ci]"
-                    git tag -a v${SDK_VERSION} -m "release v${SDK_VERSION}-SNAPSHOT"
-                    git push --set-upstream origin develop v${SDK_VERSION}
+                    git commit -am "released ${SDK_VERSION} [skip ci]"
+                    git tag -a ${SDK_VERSION} -m "release ${SDK_VERSION}"
+                    git push --set-upstream origin develop ${SDK_VERSION}
                     exit 0
                     ;;
                 *)

diff --git a/client/pom.xml b/client/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -43,24 +43,24 @@
 
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>opt-1.4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+           <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>serialisation</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>terminology</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>response-dto</artifactId>
         </dependency>
         <dependency>
@@ -102,7 +102,7 @@
 
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>test-data</artifactId>
 
         </dependency>

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -23,16 +23,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>generator</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>client</artifactId>
         </dependency>
 
@@ -54,7 +54,7 @@
             <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>test-data</artifactId>
         </dependency>
     </dependencies>

diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -21,10 +21,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.ehrbase.sdk</groupId>
+    <groupId>com.github.ehrbase.openEHR_SDK</groupId>
     <artifactId>root</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>v0.3.2-SNAPSHOT</version>
     <modules>
         <module>client</module>
         <module>generator</module>
@@ -113,42 +113,42 @@
         <dependencies>
             <!-- modules -->
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>client</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>generator</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>response-dto</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>opt-1.4</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>serialisation</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>terminology</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>validation</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ehrbase.sdk</groupId>
+                <groupId>com.github.ehrbase.openEHR_SDK</groupId>
                 <artifactId>test-data</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/serialisation/pom.xml b/serialisation/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -91,7 +91,7 @@
 
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>test-data</artifactId>
         </dependency>
         <dependency>

diff --git a/terminology/pom.xml b/terminology/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,7 +36,7 @@
             <artifactId>archie</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>serialisation</artifactId>
         </dependency>
         <dependency>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -23,8 +23,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -23,20 +23,20 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>root</artifactId>
-        <groupId>org.ehrbase.sdk</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <groupId>com.github.ehrbase.openEHR_SDK</groupId>
+        <version>v0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>validation</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>terminology</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>opt-1.4</artifactId>
         </dependency>
         <dependency>
@@ -50,12 +50,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+            <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>test-data</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ehrbase.sdk</groupId>
+           <groupId>com.github.ehrbase.openEHR_SDK</groupId>
             <artifactId>serialisation</artifactId>
             <scope>test</scope>
         </dependency>