Merge 2.0 Work

Move the work on the 2.0 plugin for upcoming release.
hkamel · Apr 3, 2023 · 076d6d0 · 076d6d0
2 parents d66ebe1 + 8daac9a
commit 076d6d0
Show file tree

Hide file tree

Showing 23 changed files with 1,021 additions and 655 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,20 +8,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up AdoptOpenJDK 11
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: '11'
       - name: Build and Test with Maven
-        run: mvn --batch-mode --update-snapshots package
+        run: mvn --batch-mode --update-snapshots clean verify package
       - name: Upload Packaged JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: plugin-binary
           path: target/*.jar
       - name: Upload Code Coverage Report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: code-coverage-report
-          path: target/jacoco-ut/
+          path: target/site/jacoco/
diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
@@ -8,15 +8,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up AdoptOpenJDK 11
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: '11'
       - name: Unit Tests
         run: mvn --batch-mode --update-snapshots verify
       - name: Upload Code Coverage Report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: code-coverage-report
-          path: target/jacoco-ut/
+          path: target/site/jacoco/
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,27 @@
+name: Scan with SonarCloud
+
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up AdoptOpenJDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Scan with SonarCloud
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          mvn --batch-mode --update-snapshots clean verify sonar:sonar \
+            -Dsonar.projectKey="${{ secrets.SONARCLOUD_KEY }}" \
+            -Dsonar.organization="${{ secrets.SONARCLOUD_ORG }}" \
+            -Dsonar.host.url=https://sonarcloud.io \
+            -Dsonar.login="${{ secrets.SONARCLOUD_TOKEN }}"
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Azure Active Directory (AAD) Authentication Plug-in for SonarQube
-[![Build Status](https://travis-ci.org/hkamel/sonar-auth-aad.svg?branch=master)](https://travis-ci.org/hkamel/sonar-auth-aad) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.almrangers.auth.aad%3Asonar-auth-aad-plugin&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.almrangers.auth.aad%3Asonar-auth-aad-plugin)
+[![Test and Package](https://github.com/hkamel/sonar-auth-aad/actions/workflows/maven.yml/badge.svg?branch=1.3.0)](https://github.com/hkamel/sonar-auth-aad/actions/workflows/maven.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.almrangers.auth.aad%3Asonar-auth-aad-plugin&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.almrangers.auth.aad%3Asonar-auth-aad-plugin)
 
 This plugin for SonarQube allows the use of Azure Active Directory (AAD)
 as an authentication option.
@@ -10,4 +10,4 @@ as an authentication option.
 
 ## Installation, Setup, and Documentation
 Information for installation and configuration of this plugin is located
-at https://github.com/hkamel/sonar-auth-aad/wiki
+at https://github.com/hkamel/sonar-auth-aad/wiki
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.almrangers.auth.aad</groupId>
     <artifactId>sonar-auth-aad-plugin</artifactId>
-    <version>1.3.2</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>sonar-plugin</packaging>
 
     <name>Azure Active Directory (AAD) Authentication Plug-in for SonarQube</name>
@@ -75,56 +75,56 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.sonarsource.sonarqube</groupId>
             <artifactId>sonar-plugin-api</artifactId>
-            <version>7.9</version>
+            <version>8.9.0.43852</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>adal4j</artifactId>
-            <version>1.6.7</version>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>oauth2-oidc-sdk</artifactId>
+            <version>10.7</version>
         </dependency>
         <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20220320</version>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-            <scope>provided</scope>
+            <groupId>com.microsoft.graph</groupId>
+            <artifactId>microsoft-graph</artifactId>
+            <version>5.49.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
-        </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.sonarsource.sonarqube</groupId>
+            <artifactId>sonar-plugin-api-impl</artifactId>
+            <version>8.9.0.43852</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.24.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.6.1</version>
+            <version>4.11.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -158,7 +158,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -167,22 +167,17 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
+                        <id>report</id>
                         <goals>
                             <goal>report</goal>
                         </goals>
-                        <configuration>
-                            <dataFile>target/jacoco.exec</dataFile>
-                            <outputDirectory>target/jacoco-ut</outputDirectory>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
                 <artifactId>sonar-packaging-maven-plugin</artifactId>
-                <version>1.20.0.405</version>
+                <version>1.21.0.505</version>
                 <extensions>true</extensions>
                 <configuration>
                     <pluginClass>org.almrangers.auth.aad.AuthAadPlugin</pluginClass>

diff --git a/src/main/java/org/almrangers/auth/aad/AadGroup.java b/src/main/java/org/almrangers/auth/aad/AadGroup.java