Update version 2.0.1 -> 3.0.0

IBM · Sep 12, 2023 · f1c78f8 · f1c78f8
1 parent c18843d
commit f1c78f8
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 84 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.0
+current_version = 3.0.0
 commit = True
 message = Update version {current_version} -> {new_version}
 

diff --git a/modules/common/pom.xml b/modules/common/pom.xml
@@ -1,18 +1,21 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>security-and-compliance-center-sdk</artifactId>
+        <!-- >>> Replace this with the parent pom's artifactId -->
+        <artifactId>scc</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>2.0.0</version>
+        <version>3.0.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>security-and-compliance-center-sdk-common</artifactId>
+    <!-- >>> Replace this with the common module's artifactId (e.g. platform-services-common) -->
+    <artifactId>common</artifactId>
 
-    <name>Security and Compliance Center SDK Common Library</name>
+    <!-- >>> Replace this with the common module's description (e.g. Platform Services Common Library) -->
+    <name>IBM Cloud Security &amp; Compliance Center Common Library</name>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -26,8 +29,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/modules/coverage-reports/pom.xml b/modules/coverage-reports/pom.xml
@@ -1,32 +1,47 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <!-- Update this section to reflect the correct values for your SDK project -->
     <parent>
-        <artifactId>security-and-compliance-center-sdk</artifactId>
+        <!-- >>> Update this to reflect your parent project's artifact id -->
+        <artifactId>scc</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>2.0.0</version>
+        <version>3.0.0</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>security-and-compliance-center-coverage-reports</artifactId>
+    <!-- >>> Replace this with the coverage-report module's artifactId (e.g. platform-services-coverage-reports) -->
+    <artifactId>coverage-reports</artifactId>
 
-    <name>Security and Compliance Center SDK Coverage Reports</name>
+    <!-- >>> Replace this with the coverage-report module's description -->
+    <name>IBM Cloud Security &amp; Compliance Center Coverage Reports</name>
 
     <properties>
-        <!-- There is no need to publish this module's artifacts on maven central -->
-        <!--        <maven.deploy.skip>true</maven.deploy.skip>-->
-        <!--        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>-->
+	<!-- There is no need to publish this module's artifacts on maven central -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
     </properties>
 
     <dependencies>
+        <!-- 
+            There should be a dependency for EACH module in the project.
+            Add new "dependency" entries here as needed when you add modules to your parent pom.xml.
+            This will ensure that an aggregate code coverage report contains information for all of your modules.
+            Note: the "artifactId" values below should reflect the "artifactId" value specified in each module's
+            pom.xml file (i.e. not the module's directory name).
+        -->
         <dependency>
-            <artifactId>security-and-compliance-center-sdk-common</artifactId>
+            <!-- >>> Replace this with the common module's artifactId -->
+            <artifactId>common</artifactId>
             <groupId>${project.groupId}</groupId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- Copy and update this section for each service added to the project. -->
+
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>security-and-compliance-center</artifactId>
+            <artifactId>configuration_governance</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

diff --git a/modules/examples/pom.xml b/modules/examples/pom.xml
@@ -0,0 +1,59 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>scc</artifactId>
+        <groupId>com.ibm.cloud</groupId>
+        <version>3.0.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>examples</artifactId>
+    <packaging>jar</packaging>
+    <name>IBM Cloud Security &amp; Compliance Center Code Examples</name>
+
+    <dependencies>
+        <!-- There should be a dependency for each module whose request example class exists in this "examples" module. Add 
+            new "dependency" entries here as needed when you add a request examples class for a new service. Note: the "artifactId" values 
+            below should reflect the "artifactId" value specified in each module's pom.xml file (i.e. not the module's directory name). -->
+        <dependency>
+            <groupId>com.ibm.cloud</groupId>
+            <artifactId>configuration_governance</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <minimizeJar>true</minimizeJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <developers>
+        <developer>
+            <name>IBM Cloud DevX SDK Development</name>
+            <email>[email protected]</email>
+            <url>https://www.ibm.com/</url>
+        </developer>
+    </developers>
+</project>
diff --git a/modules/security-and-compliance-center-api/pom.xml b/modules/security-and-compliance-center-api/pom.xml
@@ -1,34 +1,36 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>security-and-compliance-center-sdk</artifactId>
+        <artifactId>scc</artifactId>
         <groupId>com.ibm.cloud</groupId>
-        <version>2.0.0</version>
+        <version>3.0.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>security-and-compliance-center</artifactId>
-
-    <name>Security and Compliance Center</name>
+    <artifactId>configuration_governance</artifactId>
     <packaging>jar</packaging>
+    <name>IBM Cloud Security &amp; Compliance Center Configuration Governance API</name>
 
     <dependencies>
         <dependency>
             <groupId>com.ibm.cloud</groupId>
             <artifactId>sdk-core</artifactId>
         </dependency>
         <dependency>
-            <artifactId>security-and-compliance-center-sdk-common</artifactId>
             <groupId>${project.groupId}</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <artifactId>security-and-compliance-center-sdk-common</artifactId>
             <groupId>${project.groupId}</groupId>
+            <artifactId>common</artifactId>
             <type>test-jar</type>
             <classifier>tests</classifier>
             <scope>test</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -41,18 +43,22 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    
     <developers>
         <developer>
             <name>IBM Cloud DevX SDK Development</name>
             <email>[email protected]</email>
             <url>https://www.ibm.com/</url>
         </developer>
     </developers>
-
 </project>