From 38b7229bd94723be5bb378847c1fd1e10b2c5b9e Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Tue, 29 Nov 2022 15:27:21 +0000
Subject: Fix broken 'security-util-lib'-coverage

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Iac477368daecdc52d409b4bb8b6d52a51e51ffdb
Issue-ID: SDC-4282
---
 pom.xml                   |   9 +-
 security-util-lib/pom.xml | 321 +++++++++++++++++++++-------------------------
 2 files changed, 154 insertions(+), 176 deletions(-)

diff --git a/pom.xml b/pom.xml
index 517e5de..0a9eda6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
   -->
 
 <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">
+    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>
 
@@ -55,7 +55,7 @@
         <!-- Sonar properties -->
         <sonar.language>java</sonar.language>
         <sonar.coverage.jacoco.xmlReportPaths>
-          ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
         <sonar.skipDesign>true</sonar.skipDesign>
@@ -148,14 +148,17 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>${maven-failsafe-plugin.version}</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${maven-checkstyle-plugin.version}</version>
                 <configuration>
diff --git a/security-util-lib/pom.xml b/security-util-lib/pom.xml
index bb0d8ef..116341d 100644
--- a/security-util-lib/pom.xml
+++ b/security-util-lib/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    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">
 
     <artifactId>security-util-lib</artifactId>
     <name>security-util-lib</name>
@@ -36,186 +36,161 @@
         <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
         <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
         <sonar.branch>${project.version}</sonar.branch>
-        
+
     </properties>
 
-   <dependencies>
-       <dependency>
-           <groupId>com.fasterxml.jackson.core</groupId>
-           <artifactId>jackson-core</artifactId>
-           <version>${jackson.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>com.fasterxml.jackson.core</groupId>
-           <artifactId>jackson-annotations</artifactId>
-           <version>${jackson.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>com.fasterxml.jackson.core</groupId>
-           <artifactId>jackson-databind</artifactId>
-           <version>${jackson.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.functionaljava</groupId>
-           <artifactId>functionaljava</artifactId>
-           <version>${functionaljava.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.owasp.esapi</groupId>
-           <artifactId>esapi</artifactId>
-           <version>${esapi.version}</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.slf4j</groupId>
-                   <artifactId>slf4j-simple</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>log4j</groupId>
-                   <artifactId>log4j</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>commons-io</groupId>
-                   <artifactId>commons-io</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>commons-beanutils</groupId>
-                   <artifactId>commons-beanutils</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>xerces</groupId>
-                   <artifactId>xercesImpl</artifactId>
-               </exclusion>
-           </exclusions>
-       </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.functionaljava</groupId>
+            <artifactId>functionaljava</artifactId>
+            <version>${functionaljava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+            <version>${esapi.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-       <!-- Inserted for Portal Integration -->
-       <dependency>
-           <groupId>org.onap.portal.sdk</groupId>
-           <artifactId>epsdk-fw</artifactId>
-           <version>${portal.version}</version>
-           <scope>compile</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>com.att.nsa</groupId>
-                   <artifactId>cambriaClient</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>com.fasterxml.jackson.core</groupId>
-                   <artifactId>jackson-core</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>com.fasterxml.jackson.core</groupId>
-                   <artifactId>jackson-annotations</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>com.fasterxml.jackson.core</groupId>
-                   <artifactId>jackson-databind</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>org.owasp.esapi</groupId>
-                   <artifactId>esapi</artifactId>
-               </exclusion>
-               <exclusion>
-                   <artifactId>slf4j-log4j12</artifactId>
-                   <groupId>org.slf4j</groupId>
-               </exclusion>
-               <exclusion>
-                   <artifactId>powermock-api-mockito</artifactId>
-                   <groupId>org.powermock</groupId>
-               </exclusion>
-               <exclusion>
-                   <artifactId>powermock-module-junit4</artifactId>
-                   <groupId>org.powermock</groupId>
-               </exclusion>
-               <exclusion>
-                   <groupId>org.junit.jupiter</groupId>
-                   <artifactId>junit-jupiter-api</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>org.onap.aaf.authz</groupId>
-                   <artifactId>aaf-cadi-aaf</artifactId>
-               </exclusion>
-               <exclusion>
-                   <artifactId>aaf-cadi-core</artifactId>
-                   <groupId>org.onap.aaf.authz</groupId>
-               </exclusion>
-               <exclusion>
-                   <artifactId>commons-codec</artifactId>
-                   <groupId>commons-codec</groupId>
-               </exclusion>
-           </exclusions>
-       </dependency>
+        <!-- Inserted for Portal Integration -->
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-fw</artifactId>
+            <version>${portal.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.att.nsa</groupId>
+                    <artifactId>cambriaClient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.owasp.esapi</groupId>
+                    <artifactId>esapi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>powermock-api-mockito</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>powermock-module-junit4</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-aaf</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>aaf-cadi-core</artifactId>
+                    <groupId>org.onap.aaf.authz</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-codec</artifactId>
+                    <groupId>commons-codec</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-       <dependency>
-           <groupId>org.apache.commons</groupId>
-           <artifactId>commons-lang3</artifactId>
-           <version>${lang3.version}</version>
-           <scope>compile</scope>
-       </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${lang3.version}</version>
+            <scope>compile</scope>
+        </dependency>
 
-       <dependency>
-           <groupId>com.google.guava</groupId>
-           <artifactId>guava</artifactId>
-           <version>${guava.version}</version>
-           <scope>compile</scope>
-       </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+            <scope>compile</scope>
+        </dependency>
 
-       <!-- http client -->
-       <dependency>
-           <groupId>org.apache.httpcomponents</groupId>
-           <artifactId>httpclient</artifactId>
-           <version>${httpclient.version}</version>
-           <scope>compile</scope>
-       </dependency>
-       <dependency>
-           <groupId>org.glassfish.jersey.ext</groupId>
-           <artifactId>jersey-bean-validation</artifactId>
-           <version>${jersey-bom.version}</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.hibernate</groupId>
-                   <artifactId>hibernate-validator</artifactId>
-               </exclusion>
-           </exclusions>
-       </dependency>
-       <dependency>
-           <groupId>com.googlecode.json-simple</groupId>
-           <artifactId>json-simple</artifactId>
-           <version>${json-simple.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.projectlombok</groupId>
-           <artifactId>lombok</artifactId>
-       </dependency>
-   </dependencies>
+        <!-- http client -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-bean-validation</artifactId>
+            <version>${jersey-bom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>${json-simple.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.6</version>
-                <executions>
-                    <!-- Unit-Tests -->
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <argLine>${argLine} -Xmx2048m</argLine>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-- 
cgit 1.2.3-korg