From 67f3937a886e434cd2789c65ca8f1fa0fdda54d0 Mon Sep 17 00:00:00 2001
From: Shwetha Radhakrishna <shwetha.manvinkurke@gmail.com>
Date: Tue, 27 Jul 2021 17:57:34 -0500
Subject: [PATCH 1/2] chore: integrate with sonarcloud

---
 .travis.yml              | 35 +++++++++++++++++++++++------------
 pom.xml                  | 40 +++++++++++++++++++++++++++++++++++++---
 sonar-project.properties | 11 +++++++++++
 3 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 sonar-project.properties

diff --git a/.travis.yml b/.travis.yml
index dcebd1841d..7750c8966e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,28 @@ language: java
 sudo: false
 cache:
   directories:
-  - "$HOME/.m2"
+    - "$HOME/.m2"
 before_install:
-- echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import --batch || true
-- echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust --batch
-  || true
-matrix:
+  - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import --batch || true
+  - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust --batch
+    || true
+jobs:
   include:
-  - jdk: openjdk8
-    dist: xenial
-  - jdk: openjdk11
-    dist: xenial
+    - jdk: openjdk8
+      dist: xenial
+      before_script:
+        - mvn test -B
+    - jdk: openjdk11
+      dist: xenial
+      after_success:
+        - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar -Dsonar.projectKey=twilio_twilio-java -Dmaven.javadoc.skip=true
 services:
-- docker
+  - docker
 install:
-- mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true
-  -B -V
+  - mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true
+    -B -V
+script:
+  - echo "skipping tests"
 deploy:
 - provider: script
   script: echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin && make docker-build && make docker-push
@@ -39,3 +45,8 @@ notifications:
     on_failure: change
     rooms:
       secure: Yd0IZ2zGmRm64fVwbPebNJ+VJxT958iT3Zz7xP1CSkpR+w6rUulQhWvsn2ka4Kqge+TaXbhNu3I55wRdPCxLrEkTNgCdTkJ9y5HYMxPHpRcQ0XFxJHBmAW6y9foUdSbk2KdM1TKwNUnCp43QmSMWfaMjnvNbh2GzadS/JS1nmBI=
+addons:
+  sonarcloud:
+    organization: "twilio"
+    token:
+      secure: EivSky9YwOBkCxRhxjocrCAL0d1V8ZunbiZFJK0MNtpwjajNJeZjMaVvE67Sf785NnaeiEStUKjH+usN+20kDrSq1JoF3Af17HQTtrY5yumRrdu9aJmCHnLW+qaqbtUJ6Z7XE5ULgKflo7l5ThbcVNu9gIBWFVKkLG4kUDv1/8Q=
diff --git a/pom.xml b/pom.xml
index 22422166ef..fe66ef9780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,12 +127,46 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>coverage</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.5</version>
+            <executions>
+              <execution>
+                <id>prepare-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <!-- attached to Maven test phase -->
+              <execution>
+                <id>report</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   <properties>
     <jackson.version>2.12.1</jackson.version>
     <jjwt.version>0.11.2</jjwt.version>
     <skip.tests>false</skip.tests>
     <dependency.skip>false</dependency.skip>
+    <sonar.coverage.exclusions>
+      **/test/**/*.*,**/rest/**/*.*
+    </sonar.coverage.exclusions>
   </properties>
   <dependencies>
     <dependency>
@@ -374,7 +408,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M4</version>
         <configuration>
-          <argLine>-javaagent:${settings.localRepository}/org/jmockit/jmockit/1.24/jmockit-1.24.jar</argLine>
+          <argLine>@{argLine} -javaagent:${settings.localRepository}/org/jmockit/jmockit/1.24/jmockit-1.24.jar</argLine>
           <forkCount>8</forkCount>
           <reuseForks>true</reuseForks>
         </configuration>
@@ -402,7 +436,7 @@
             </goals>
             <configuration>
               <rules>
-                <dependencyConvergence></dependencyConvergence>
+                <dependencyConvergence/>
               </rules>
             </configuration>
           </execution>
@@ -415,4 +449,4 @@
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
-</project>
\ No newline at end of file
+</project>
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..ab9239c48e
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,11 @@
+sonar.projectKey=twilio_twilio-java
+sonar.projectName=twilio-java
+sonar.organization=twilio
+
+sonar.sources=src/main/java
+# Exclude any auto-generated source code
+sonar.exclusions=src/main/java/com/twilio/rest/**/*
+
+sonar.tests=src/test/java/com/twilio
+# Exclude any auto-generated integration tests
+sonar.test.exclusions=src/test/java/com/twilio/rest/**/*.java

From 5d7a79e065c18c47992aa89e063ca3aa21955422 Mon Sep 17 00:00:00 2001
From: Shwetha Radhakrishna <shwetha.manvinkurke@gmail.com>
Date: Tue, 3 Aug 2021 13:50:47 -0500
Subject: [PATCH 2/2] filter duplicated lines

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index fe66ef9780..2bf5a3f3ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,9 @@
     <sonar.coverage.exclusions>
       **/test/**/*.*,**/rest/**/*.*
     </sonar.coverage.exclusions>
+    <sonar.cpd.exclusions>
+      **/rest/**/*.*
+    </sonar.cpd.exclusions>
   </properties>
   <dependencies>
     <dependency>