JCL-321: Use com.inrupt.client for Maven groupId (#401)

* JCL-321: Use com.inrupt.client for Maven groupId * Adjust owasp suppression list * Upgrade dependency groupIds
inrupt · Apr 6, 2023 · c08c58a · c08c58a
1 parent 6d9af74
commit c08c58a
Show file tree

Hide file tree

Showing 32 changed files with 163 additions and 163 deletions.
diff --git a/access-grant/pom.xml b/access-grant/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
@@ -20,7 +20,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-api</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -50,31 +50,31 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-jackson</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
      <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-httpclient</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-openid</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-uma</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/api/pom.xml b/api/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
@@ -35,7 +35,7 @@
       <version>${slf4j.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.rdf</groupId>
       <artifactId>inrupt-rdf-wrapping-commons</artifactId>
       <version>${inrupt.rdf.wrapping.version}</version>
     </dependency>

diff --git a/archetypes/java/pom.xml b/archetypes/java/pom.xml
@@ -1,7 +1,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client-archetype-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>

diff --git a/archetypes/java/src/main/resources/archetype-resources/pom.xml b/archetypes/java/src/main/resources/archetype-resources/pom.xml
@@ -19,7 +19,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-bom</artifactId>
         <version>${inrupt-client-version}</version>
         <type>pom</type>
@@ -37,39 +37,39 @@
 
   <dependencies>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-api</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-solid</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-okhttp</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-jackson</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-jena</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-openid</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-vocabulary</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-webid</artifactId>
     </dependency>
 

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
@@ -19,82 +19,82 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-accessgrant</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-okhttp</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-httpclient</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-jackson</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-jena</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-jsonb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-openid</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-parser</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-rdf4j</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-rdf-legacy</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-solid</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-uma</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-webid</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.inrupt</groupId>
+        <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-vocabulary</artifactId>
         <version>${project.version}</version>
       </dependency>

diff --git a/build-tools/owasp/suppressions.xml b/build-tools/owasp/suppressions.xml
@@ -4,7 +4,7 @@
     <notes><![CDATA[
         This suppresses a false positive CPE match
     ]]></notes>
-    <packageUrl regex="true">^pkg:maven/com\.inrupt/inrupt\-client\-openid@.*$</packageUrl>
+    <packageUrl regex="true">^pkg:maven/com\.inrupt\.client/inrupt\-client\-openid@.*$</packageUrl>
     <cpe>cpe:/a:openid:openid</cpe>
   </suppress>
   <suppress>

diff --git a/core/pom.xml b/core/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
@@ -32,12 +32,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-parser</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -99,31 +99,31 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-jackson</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-openid</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-uma</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-jena</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-httpclient</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.inrupt</groupId>
+    <groupId>com.inrupt.client</groupId>
     <artifactId>inrupt-client-examples-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
@@ -40,47 +40,47 @@
       <artifactId>quarkus-arc</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-vocabulary</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-webid</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-jena</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-openid</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-httpclient</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-jackson</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.inrupt</groupId>
+      <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-solid</artifactId>
       <version>${project.version}</version>
     </dependency>