Skip to content

Commit 1b55fd7

Browse files
EnessenEEnessenE
authored
Refactor package to com.cm and prepare to publish to Maven Central (#18)
* Add pipelines and update pom.xml to understand publish * Move to com.cm * 2.0 * Update maven-build.yaml * import com.cmtelecom * Move again * Remove target files and rename groupid
1 parent ec60703 commit 1b55fd7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+287
-245
lines changed

‎.github/workflows/maven-build.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Maven build
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
java-version: [ 8, 11, 17, 18 ]
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up JDK ${{ matrix.java-version }}
19+
uses: actions/setup-java@v2
20+
with:
21+
java-version: ${{ matrix.java-version }}
22+
distribution: 'zulu'
23+
cache: maven
24+
- name: Build with Maven
25+
run: mvn --batch-mode -DskipTests package --file pom.xml
26+
27+
- name: Test
28+
run: mvn --batch-mode -Dmaven.test.failure.ignore=true test
29+
30+
# - name: Report
31+
# uses: dorny/test-reporter@v1
32+
# if: always()
33+
# with:
34+
# name: Maven Tests
35+
# path: target/surefire-reports/*.xml
36+
# reporter: java-junit
37+
# fail-on-error: true

‎.github/workflows/maven-publish.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Publish package to the Maven Central Repository and GitHub Packages
2+
3+
on:
4+
release:
5+
types: [created]
6+
jobs:
7+
8+
publish:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
packages: write
13+
14+
steps:
15+
16+
#To maven central
17+
- name: Set up Java for publishing to Maven Central Repository
18+
uses: actions/setup-java@v2
19+
with:
20+
distribution: 'adopt'
21+
java-version: 7
22+
server-id: ossrh
23+
#gpg is only needed for the first run
24+
gpg-private-key: ${{ secrets.GPG_JAR_KEY }}
25+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
26+
server-username: MAVEN_USERNAME
27+
server-password: MAVEN_PASSWORD
28+
29+
- name: Deploy to the Maven Central Repository
30+
run: |
31+
mvn -B -Dgpg.passphrase=${{ secrets.GPG_JAR_PASSWORD }} -P ossrh deploy
32+
env:
33+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
34+
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
35+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_JAR_PASSWORD }}
36+
37+
# To github packages!
38+
- name: Set up Java for publishing to Github Packages
39+
uses: actions/setup-java@v2
40+
with:
41+
distribution: 'zulu'
42+
java-version: 7
43+
server-id: github
44+
45+
- name: Deploy to GitHub Packages
46+
run: |
47+
mvn -B -Dgpg.passphrase=${{ secrets.GPG_JAR_PASSWORD }} -P github deploy
48+
env:
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_JAR_PASSWORD }}

‎pom.xml‎

Lines changed: 68 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -2,121 +2,82 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<groupId>com.github.cmdotcom</groupId>
7-
<artifactId>text-sdk-java</artifactId>
8-
<version>1.3-SNAPSHOT</version>
9-
<build>
10-
<plugins>
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.cm</groupId>
7+
<artifactId>text-sdk-java</artifactId>
8+
<version>2.0-SNAPSHOT</version>
9+
<build>
10+
<plugins>
11+
<plugin>
12+
<version>3.10.1</version>
13+
<groupId>org.apache.maven.plugins</groupId>
14+
<artifactId>maven-compiler-plugin</artifactId>
15+
<configuration>
16+
<source>7</source>
17+
<target>7</target>
18+
</configuration>
19+
</plugin>
20+
</plugins>
21+
</build>
1122

12-
<plugin>
13-
<groupId>org.apache.maven.plugins</groupId>
14-
<artifactId>maven-compiler-plugin</artifactId>
15-
<configuration>
16-
<source>7</source>
17-
<target>7</target>
18-
</configuration>
19-
</plugin>
20-
</plugins>
21-
</build>
23+
<name>text-sdk-java</name>
24+
<description>This is a library for sending messages with CM.com
25+
</description>
26+
<url>https://github.com/cmdotcom/text-sdk-java</url>
2227

23-
<name>Text-sdk-Java</name>
24-
<description>This is a library for sending messages with CM.com
25-
</description>
26-
<url>https://github.com/cmdotcom/text-sdk-java</url>
27-
28-
<licenses>
29-
<license>
30-
<name>MIT License</name>
31-
<url>http://www.opensource.org/licenses/mit-license.php</url>
32-
</license>
33-
</licenses>
34-
35-
<profiles>
36-
<profile>
37-
<id>release</id>
38-
<build>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-source-plugin</artifactId>
43-
<version>2.2.1</version>
44-
<executions>
45-
<execution>
46-
<id>attach-sources</id>
47-
<goals>
48-
<goal>jar-no-fork</goal>
49-
</goals>
50-
</execution>
51-
</executions>
52-
</plugin>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-javadoc-plugin</artifactId>
56-
<version>2.9.1</version>
57-
<executions>
58-
<execution>
59-
<id>attach-javadocs</id>
60-
<goals>
61-
<goal>jar</goal>
62-
</goals>
63-
</execution>
64-
</executions>
65-
</plugin>
66-
<plugin>
67-
<groupId>org.apache.maven.plugins</groupId>
68-
<artifactId>maven-gpg-plugin</artifactId>
69-
<version>1.6</version>
70-
<executions>
71-
<execution>
72-
<id>sign-artifacts</id>
73-
<phase>verify</phase>
74-
<goals>
75-
<goal>sign</goal>
76-
</goals>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
</plugins>
81-
</build>
82-
</profile>
83-
</profiles>
28+
<licenses>
29+
<license>
30+
<name>MIT License</name>
31+
<url>http://www.opensource.org/licenses/mit-license.php</url>
32+
</license>
33+
</licenses>
8434

85-
<distributionManagement>
86-
<snapshotRepository>
87-
<id>ossrh</id>
88-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
89-
</snapshotRepository>
35+
<profiles>
36+
<profile>
37+
<id>ossrh</id>
38+
<distributionManagement>
9039
<repository>
91-
<id>ossrh</id>
92-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
40+
<id>ossrh</id>
41+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
9342
</repository>
94-
</distributionManagement>
43+
</distributionManagement>
44+
</profile>
45+
<profile>
46+
<id>github</id>
47+
<distributionManagement>
48+
<repository>
49+
<id>github</id>
50+
<name>GitHub Apache Maven Packages</name>
51+
<url>https://maven.pkg.github.com/cmdotcom/text-sdk-java</url>
52+
</repository>
53+
</distributionManagement>
54+
</profile>
55+
</profiles>
9556

96-
<scm>
97-
<connection>scm:git:git://https://github.com/cmdotcom/text-sdk-java.git</connection>
98-
<developerConnection>scm:git:ssh://https://github.com/cmdotcom/text-sdk-java.git</developerConnection>
99-
<url>https://github.com/cmdotcom/text-sdk-java</url>
100-
</scm>
57+
<scm>
58+
<connection>scm:git:git://https://github.com/cmdotcom/text-sdk-java.git</connection>
59+
<developerConnection>scm:git:ssh://https://github.com/cmdotcom/text-sdk-java.git</developerConnection>
60+
<url>https://github.com/cmdotcom/text-sdk-java</url>
61+
</scm>
10162

102-
<developers>
103-
<developer>
104-
<name>Soufyan Bargach</name>
105-
<email>Soufyan.Bargach@cmtelecom.com</email>
106-
<organization>com.github.cmdotcom</organization>
107-
<organizationUrl>http://cm.com/</organizationUrl>
108-
</developer>
109-
</developers>
63+
<developers>
64+
<developer>
65+
<name>Soufyan Bargach</name>
66+
<email>Soufyan.Bargach@cm.com</email>
67+
<organization>com.github.cmdotcom</organization>
68+
<organizationUrl>http://cm.com/</organizationUrl>
69+
</developer>
70+
</developers>
11071

111-
<properties>
112-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
113-
</properties>
72+
<properties>
73+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
74+
</properties>
11475

115-
<dependencies>
76+
<dependencies>
11677
<dependency>
117-
<groupId>com.google.code.gson</groupId>
118-
<artifactId>gson</artifactId>
119-
<version>2.8.2</version>
78+
<groupId>com.google.code.gson</groupId>
79+
<artifactId>gson</artifactId>
80+
<version>2.8.2</version>
12081
</dependency>
121-
</dependencies>
122-
</project>
82+
</dependencies>
83+
</project>

‎src/main/java/com/cmtelecom/text/sdk/Config.java‎ renamed to ‎src/main/java/com/cm/text/Config.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cmtelecom.text.sdk;
1+
package com.cm.text;
22

33
public class Config {
44

‎src/main/java/com/cmtelecom/text/sdk/MessageBuilder.java‎ renamed to ‎src/main/java/com/cm/text/MessageBuilder.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package com.cmtelecom.text.sdk;
2-
3-
import com.cmtelecom.text.sdk.models.Body;
4-
import com.cmtelecom.text.sdk.models.Channel;
5-
import com.cmtelecom.text.sdk.models.Message;
6-
import com.cmtelecom.text.sdk.models.Recipient;
7-
import com.cmtelecom.text.sdk.models.multichannel.IRichMessage;
8-
import com.cmtelecom.text.sdk.models.multichannel.RichContent;
9-
import com.cmtelecom.text.sdk.models.multichannel.Suggestion;
10-
import com.cmtelecom.text.sdk.models.templates.TemplateMessage;
11-
import com.cmtelecom.text.sdk.models.templates.TemplateMessageContent;
12-
import com.cmtelecom.text.sdk.models.templates.WhatsAppTemplate;
1+
package com.cm.text;
2+
3+
4+
import com.cm.text.models.Body;
5+
import com.cm.text.models.Channel;
6+
import com.cm.text.models.Message;
7+
import com.cm.text.models.Recipient;
8+
import com.cm.text.models.multichannel.IRichMessage;
9+
import com.cm.text.models.multichannel.RichContent;
10+
import com.cm.text.models.multichannel.Suggestion;
11+
import com.cm.text.models.templates.TemplateMessage;
1312

1413
import java.util.ArrayList;
1514
import java.util.List;

‎src/main/java/com/cmtelecom/text/sdk/MessagingClient.java‎ renamed to ‎src/main/java/com/cm/text/MessagingClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.cmtelecom.text.sdk;
1+
package com.cm.text;
22

3+
import com.cm.text.models.Message;
4+
import com.cm.text.models.Request;
5+
import com.cm.text.models.Response;
6+
import com.cm.text.utils.HttpHelper;
37
import com.google.gson.Gson;
4-
import com.cmtelecom.text.sdk.models.Message;
5-
import com.cmtelecom.text.sdk.models.Request;
6-
import com.cmtelecom.text.sdk.models.Response;
7-
import com.cmtelecom.text.sdk.utils.HttpHelper;
88

99
public class MessagingClient {
1010

‎src/main/java/com/cmtelecom/text/sdk/models/Body.java‎ renamed to ‎src/main/java/com/cm/text/models/Body.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cmtelecom.text.sdk.models;
1+
package com.cm.text.models;
22

33
import com.google.gson.annotations.SerializedName;
44

‎src/main/java/com/cmtelecom/text/sdk/models/Channel.java‎ renamed to ‎src/main/java/com/cm/text/models/Channel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cmtelecom.text.sdk.models;
1+
package com.cm.text.models;
22

33
import com.google.gson.annotations.SerializedName;
44

@@ -106,4 +106,4 @@ public enum Channel {
106106
/// Note that CM needs to configure this for you to work.
107107
/// </remarks>
108108
Instagram
109-
}
109+
}

‎src/main/java/com/cmtelecom/text/sdk/models/Message.java‎ renamed to ‎src/main/java/com/cm/text/models/Message.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cmtelecom.text.sdk.models;
1+
package com.cm.text.models;
22

33
import com.google.gson.annotations.SerializedName;
44

@@ -113,7 +113,7 @@ public class Message {
113113
public String Reference;
114114

115115
@SerializedName("richContent")
116-
public com.cmtelecom.text.sdk.models.multichannel.RichContent RichContent;
116+
public com.cm.text.models.multichannel.RichContent RichContent;
117117

118118
/// <summary>
119119
/// Optional: For each message you send, you can set a validity.

‎src/main/java/com/cmtelecom/text/sdk/models/Recipient.java‎ renamed to ‎src/main/java/com/cm/text/models/Recipient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cmtelecom.text.sdk.models;
1+
package com.cm.text.models;
22

33
import com.google.gson.annotations.SerializedName;
44

0 commit comments

Comments
 (0)