Refactor package to com.cm and prepare to publish to Maven Central

.github/workflows/maven-build.yaml

@@ -0,0 +1,37 @@
+name: Maven build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: [ 8, 11, 17, 18 ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{ matrix.java-version }}
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.java-version }}
+        distribution: 'zulu'
+        cache: maven
+    - name: Build with Maven
+      run: mvn --batch-mode -DskipTests package --file pom.xml
+
+    - name: Test
+      run: mvn --batch-mode -Dmaven.test.failure.ignore=true test
+
+    # - name: Report
+    #   uses: dorny/test-reporter@v1
+    #   if: always()
+    #   with:
+    #     name: Maven Tests
+    #     path: target/surefire-reports/*.xml
+    #     reporter: java-junit
+    #     fail-on-error: true

.github/workflows/maven-publish.yaml

@@ -0,0 +1,50 @@
+name: Publish package to the Maven Central Repository and GitHub Packages
+
+on:
+  release:
+    types: [created]
+jobs:
+
+  publish:
+    runs-on: ubuntu-latest 
+    permissions: 
+      contents: read
+      packages: write 
+
+    steps:
+
+    #To maven central
+      - name: Set up Java for publishing to Maven Central Repository
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 7
+          server-id: ossrh
+          #gpg is only needed for the first run
+          gpg-private-key: ${{ secrets.GPG_JAR_KEY }} 
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+          server-username: MAVEN_USERNAME 
+          server-password: MAVEN_PASSWORD 
+
+      - name: Deploy to the Maven Central Repository
+        run: | 
+          mvn -B -Dgpg.passphrase=${{ secrets.GPG_JAR_PASSWORD }} -P ossrh deploy 
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_JAR_PASSWORD }}
+
+    # To github packages!
+      - name: Set up Java for publishing to Github Packages
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 7
+          server-id: github
+
+      - name: Deploy to GitHub Packages
+        run: | 
+          mvn -B -Dgpg.passphrase=${{ secrets.GPG_JAR_PASSWORD }} -P github deploy 
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_JAR_PASSWORD }}

pom.xml

@@ -2,121 +2,82 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>com.github.cmdotcom</groupId>
-    <artifactId>text-sdk-java</artifactId>
-    <version>1.3-SNAPSHOT</version>
-    <build>
-        <plugins>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.cm</groupId>
+  <artifactId>text-sdk-java</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <version>3.10.1</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>7</source>
+          <target>7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>7</source>
-                    <target>7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <name>text-sdk-java</name>
+  <description>This is a library for sending messages with CM.com
+  </description>
+  <url>https://github.com/cmdotcom/text-sdk-java</url>
 
-    <name>Text-sdk-Java</name>
-    <description>This is a  library for sending messages with CM.com
-    </description>
-    <url>https://github.com/cmdotcom/text-sdk-java</url>
-
-    <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
-        </license>
-    </licenses>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
+    </license>
+  </licenses>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
+  <profiles>
+    <profile>
+      <id>ossrh</id>
+      <distributionManagement>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <id>ossrh</id>
+          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
-    </distributionManagement>
+      </distributionManagement>
+    </profile>
+    <profile>
+      <id>github</id>
+      <distributionManagement>
+        <repository>
+          <id>github</id>
+          <name>GitHub Apache Maven Packages</name>
+          <url>https://maven.pkg.github.com/cmdotcom/text-sdk-java</url>
+        </repository>
+      </distributionManagement>
+    </profile>
+  </profiles>
 
-    <scm>
-        <connection>scm:git:git://https://github.com/cmdotcom/text-sdk-java.git</connection>
-        <developerConnection>scm:git:ssh://https://github.com/cmdotcom/text-sdk-java.git</developerConnection>
-        <url>https://github.com/cmdotcom/text-sdk-java</url>
-    </scm>
+  <scm>
+    <connection>scm:git:git://https://github.com/cmdotcom/text-sdk-java.git</connection>
+    <developerConnection>scm:git:ssh://https://github.com/cmdotcom/text-sdk-java.git</developerConnection>
+    <url>https://github.com/cmdotcom/text-sdk-java</url>
+  </scm>
 
-    <developers>
-        <developer>
-            <name>Soufyan Bargach</name>
-            <email>Soufyan.Bargach@cmtelecom.com</email>
-            <organization>com.github.cmdotcom</organization>
-            <organizationUrl>http://cm.com/</organizationUrl>
-        </developer>
-    </developers>
+  <developers>
+    <developer>
+      <name>Soufyan Bargach</name>
+      <email>Soufyan.Bargach@cm.com</email>
+      <organization>com.github.cmdotcom</organization>
+      <organizationUrl>http://cm.com/</organizationUrl>
+    </developer>
+  </developers>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <dependencies>
+  <dependencies>
     <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.8.2</version>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.2</version>
     </dependency>
-</dependencies>
-</project>
+  </dependencies>
+</project>

src/main/java/com/cmtelecom/text/sdk/Config.java → src/main/java/com/cm/text/Config.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk;
+package com.cm.text;
 
 public class Config {
 

src/main/java/com/cmtelecom/text/sdk/MessageBuilder.java → src/main/java/com/cm/text/MessageBuilder.java

@@ -1,15 +1,14 @@
-package com.cmtelecom.text.sdk;
-
-import com.cmtelecom.text.sdk.models.Body;
-import com.cmtelecom.text.sdk.models.Channel;
-import com.cmtelecom.text.sdk.models.Message;
-import com.cmtelecom.text.sdk.models.Recipient;
-import com.cmtelecom.text.sdk.models.multichannel.IRichMessage;
-import com.cmtelecom.text.sdk.models.multichannel.RichContent;
-import com.cmtelecom.text.sdk.models.multichannel.Suggestion;
-import com.cmtelecom.text.sdk.models.templates.TemplateMessage;
-import com.cmtelecom.text.sdk.models.templates.TemplateMessageContent;
-import com.cmtelecom.text.sdk.models.templates.WhatsAppTemplate;
+package com.cm.text;
+
+
+import com.cm.text.models.Body;
+import com.cm.text.models.Channel;
+import com.cm.text.models.Message;
+import com.cm.text.models.Recipient;
+import com.cm.text.models.multichannel.IRichMessage;
+import com.cm.text.models.multichannel.RichContent;
+import com.cm.text.models.multichannel.Suggestion;
+import com.cm.text.models.templates.TemplateMessage;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/cmtelecom/text/sdk/MessagingClient.java → src/main/java/com/cm/text/MessagingClient.java

@@ -1,10 +1,10 @@
-package com.cmtelecom.text.sdk;
+package com.cm.text;
 
+import com.cm.text.models.Message;
+import com.cm.text.models.Request;
+import com.cm.text.models.Response;
+import com.cm.text.utils.HttpHelper;
 import com.google.gson.Gson;
-import com.cmtelecom.text.sdk.models.Message;
-import com.cmtelecom.text.sdk.models.Request;
-import com.cmtelecom.text.sdk.models.Response;
-import com.cmtelecom.text.sdk.utils.HttpHelper;
 
 public class MessagingClient {
 

src/main/java/com/cmtelecom/text/sdk/models/Body.java → src/main/java/com/cm/text/models/Body.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/com/cmtelecom/text/sdk/models/Channel.java → src/main/java/com/cm/text/models/Channel.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -106,4 +106,4 @@ public enum  Channel {
     ///     Note that CM needs to configure this for you to work.
     /// </remarks>
     Instagram
-}
+}

src/main/java/com/cmtelecom/text/sdk/models/Message.java → src/main/java/com/cm/text/models/Message.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -113,7 +113,7 @@ public class Message {
     public String Reference;
 
     @SerializedName("richContent")
-    public com.cmtelecom.text.sdk.models.multichannel.RichContent RichContent;
+    public com.cm.text.models.multichannel.RichContent RichContent;
 
     /// <summary>
     ///     Optional: For each message you send, you can set a validity.

src/main/java/com/cmtelecom/text/sdk/models/Recipient.java → src/main/java/com/cm/text/models/Recipient.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/com/cmtelecom/text/sdk/models/Request.java → src/main/java/com/cm/text/models/Request.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/com/cmtelecom/text/sdk/models/Response.java → src/main/java/com/cm/text/models/Response.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models;
+package com.cm.text.models;
 
 
 

src/main/java/com/cmtelecom/text/sdk/models/multichannel/Carousel.java → src/main/java/com/cm/text/models/multichannel/Carousel.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models.multichannel;
+package com.cm.text.models.multichannel;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/com/cmtelecom/text/sdk/models/multichannel/CarouselCardWidth.java → src/main/java/com/cm/text/models/multichannel/CarouselCardWidth.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models.multichannel;
+package com.cm.text.models.multichannel;
 
 public enum  CarouselCardWidth {
     /// <summary>

src/main/java/com/cmtelecom/text/sdk/models/multichannel/Dial.java → src/main/java/com/cm/text/models/multichannel/Dial.java

@@ -1,4 +1,4 @@
-package com.cmtelecom.text.sdk.models.multichannel;
+package com.cm.text.models.multichannel;
 
 import com.google.gson.annotations.SerializedName;