Skip to content

Commit c08c58a

Browse files
acoburnacoburn
authored
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
1 parent 6d9af74 commit c08c58a

File tree

32 files changed

+163
-163
lines changed

32 files changed

+163
-163
lines changed

‎access-grant/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>com.inrupt</groupId>
5+
<groupId>com.inrupt.client</groupId>
66
<artifactId>inrupt-client</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
@@ -20,7 +20,7 @@
2020

2121
<dependencies>
2222
<dependency>
23-
<groupId>com.inrupt</groupId>
23+
<groupId>com.inrupt.client</groupId>
2424
<artifactId>inrupt-client-api</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>
@@ -50,31 +50,31 @@
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>
53-
<groupId>com.inrupt</groupId>
53+
<groupId>com.inrupt.client</groupId>
5454
<artifactId>inrupt-client-jackson</artifactId>
5555
<version>${project.version}</version>
5656
<scope>test</scope>
5757
</dependency>
5858
<dependency>
59-
<groupId>com.inrupt</groupId>
59+
<groupId>com.inrupt.client</groupId>
6060
<artifactId>inrupt-client-core</artifactId>
6161
<version>${project.version}</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>
65-
<groupId>com.inrupt</groupId>
65+
<groupId>com.inrupt.client</groupId>
6666
<artifactId>inrupt-client-httpclient</artifactId>
6767
<version>${project.version}</version>
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>
71-
<groupId>com.inrupt</groupId>
71+
<groupId>com.inrupt.client</groupId>
7272
<artifactId>inrupt-client-openid</artifactId>
7373
<version>${project.version}</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>
77-
<groupId>com.inrupt</groupId>
77+
<groupId>com.inrupt.client</groupId>
7878
<artifactId>inrupt-client-uma</artifactId>
7979
<version>${project.version}</version>
8080
<scope>test</scope>

‎api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>com.inrupt</groupId>
5+
<groupId>com.inrupt.client</groupId>
66
<artifactId>inrupt-client</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
@@ -35,7 +35,7 @@
3535
<version>${slf4j.version}</version>
3636
</dependency>
3737
<dependency>
38-
<groupId>com.inrupt</groupId>
38+
<groupId>com.inrupt.rdf</groupId>
3939
<artifactId>inrupt-rdf-wrapping-commons</artifactId>
4040
<version>${inrupt.rdf.wrapping.version}</version>
4141
</dependency>

‎archetypes/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>com.inrupt</groupId>
4+
<groupId>com.inrupt.client</groupId>
55
<artifactId>inrupt-client-archetype-parent</artifactId>
66
<version>1.0.0-SNAPSHOT</version>
77
</parent>

‎archetypes/java/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependencyManagement>
2020
<dependencies>
2121
<dependency>
22-
<groupId>com.inrupt</groupId>
22+
<groupId>com.inrupt.client</groupId>
2323
<artifactId>inrupt-client-bom</artifactId>
2424
<version>${inrupt-client-version}</version>
2525
<type>pom</type>
@@ -37,39 +37,39 @@
3737

3838
<dependencies>
3939
<dependency>
40-
<groupId>com.inrupt</groupId>
40+
<groupId>com.inrupt.client</groupId>
4141
<artifactId>inrupt-client-api</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>com.inrupt</groupId>
44+
<groupId>com.inrupt.client</groupId>
4545
<artifactId>inrupt-client-solid</artifactId>
4646
</dependency>
4747
<dependency>
48-
<groupId>com.inrupt</groupId>
48+
<groupId>com.inrupt.client</groupId>
4949
<artifactId>inrupt-client-core</artifactId>
5050
</dependency>
5151
<dependency>
52-
<groupId>com.inrupt</groupId>
52+
<groupId>com.inrupt.client</groupId>
5353
<artifactId>inrupt-client-okhttp</artifactId>
5454
</dependency>
5555
<dependency>
56-
<groupId>com.inrupt</groupId>
56+
<groupId>com.inrupt.client</groupId>
5757
<artifactId>inrupt-client-jackson</artifactId>
5858
</dependency>
5959
<dependency>
60-
<groupId>com.inrupt</groupId>
60+
<groupId>com.inrupt.client</groupId>
6161
<artifactId>inrupt-client-jena</artifactId>
6262
</dependency>
6363
<dependency>
64-
<groupId>com.inrupt</groupId>
64+
<groupId>com.inrupt.client</groupId>
6565
<artifactId>inrupt-client-openid</artifactId>
6666
</dependency>
6767
<dependency>
68-
<groupId>com.inrupt</groupId>
68+
<groupId>com.inrupt.client</groupId>
6969
<artifactId>inrupt-client-vocabulary</artifactId>
7070
</dependency>
7171
<dependency>
72-
<groupId>com.inrupt</groupId>
72+
<groupId>com.inrupt.client</groupId>
7373
<artifactId>inrupt-client-webid</artifactId>
7474
</dependency>
7575

‎archetypes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>com.inrupt</groupId>
5+
<groupId>com.inrupt.client</groupId>
66
<artifactId>inrupt-client</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>

‎bom/pom.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>com.inrupt</groupId>
6+
<groupId>com.inrupt.client</groupId>
77
<artifactId>inrupt-client</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>..</relativePath>
@@ -19,82 +19,82 @@
1919
<dependencyManagement>
2020
<dependencies>
2121
<dependency>
22-
<groupId>com.inrupt</groupId>
22+
<groupId>com.inrupt.client</groupId>
2323
<artifactId>inrupt-client-api</artifactId>
2424
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
27-
<groupId>com.inrupt</groupId>
27+
<groupId>com.inrupt.client</groupId>
2828
<artifactId>inrupt-client-accessgrant</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>
3131
<dependency>
32-
<groupId>com.inrupt</groupId>
32+
<groupId>com.inrupt.client</groupId>
3333
<artifactId>inrupt-client-core</artifactId>
3434
<version>${project.version}</version>
3535
</dependency>
3636
<dependency>
37-
<groupId>com.inrupt</groupId>
37+
<groupId>com.inrupt.client</groupId>
3838
<artifactId>inrupt-client-okhttp</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
4141
<dependency>
42-
<groupId>com.inrupt</groupId>
42+
<groupId>com.inrupt.client</groupId>
4343
<artifactId>inrupt-client-httpclient</artifactId>
4444
<version>${project.version}</version>
4545
</dependency>
4646
<dependency>
47-
<groupId>com.inrupt</groupId>
47+
<groupId>com.inrupt.client</groupId>
4848
<artifactId>inrupt-client-jackson</artifactId>
4949
<version>${project.version}</version>
5050
</dependency>
5151
<dependency>
52-
<groupId>com.inrupt</groupId>
52+
<groupId>com.inrupt.client</groupId>
5353
<artifactId>inrupt-client-jena</artifactId>
5454
<version>${project.version}</version>
5555
</dependency>
5656
<dependency>
57-
<groupId>com.inrupt</groupId>
57+
<groupId>com.inrupt.client</groupId>
5858
<artifactId>inrupt-client-jsonb</artifactId>
5959
<version>${project.version}</version>
6060
</dependency>
6161
<dependency>
62-
<groupId>com.inrupt</groupId>
62+
<groupId>com.inrupt.client</groupId>
6363
<artifactId>inrupt-client-openid</artifactId>
6464
<version>${project.version}</version>
6565
</dependency>
6666
<dependency>
67-
<groupId>com.inrupt</groupId>
67+
<groupId>com.inrupt.client</groupId>
6868
<artifactId>inrupt-client-parser</artifactId>
6969
<version>${project.version}</version>
7070
</dependency>
7171
<dependency>
72-
<groupId>com.inrupt</groupId>
72+
<groupId>com.inrupt.client</groupId>
7373
<artifactId>inrupt-client-rdf4j</artifactId>
7474
<version>${project.version}</version>
7575
</dependency>
7676
<dependency>
77-
<groupId>com.inrupt</groupId>
77+
<groupId>com.inrupt.client</groupId>
7878
<artifactId>inrupt-client-rdf-legacy</artifactId>
7979
<version>${project.version}</version>
8080
</dependency>
8181
<dependency>
82-
<groupId>com.inrupt</groupId>
82+
<groupId>com.inrupt.client</groupId>
8383
<artifactId>inrupt-client-solid</artifactId>
8484
<version>${project.version}</version>
8585
</dependency>
8686
<dependency>
87-
<groupId>com.inrupt</groupId>
87+
<groupId>com.inrupt.client</groupId>
8888
<artifactId>inrupt-client-uma</artifactId>
8989
<version>${project.version}</version>
9090
</dependency>
9191
<dependency>
92-
<groupId>com.inrupt</groupId>
92+
<groupId>com.inrupt.client</groupId>
9393
<artifactId>inrupt-client-webid</artifactId>
9494
<version>${project.version}</version>
9595
</dependency>
9696
<dependency>
97-
<groupId>com.inrupt</groupId>
97+
<groupId>com.inrupt.client</groupId>
9898
<artifactId>inrupt-client-vocabulary</artifactId>
9999
<version>${project.version}</version>
100100
</dependency>

‎build-tools/owasp/suppressions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<notes><![CDATA[
55
This suppresses a false positive CPE match
66
]]></notes>
7-
<packageUrl regex="true">^pkg:maven/com\.inrupt/inrupt\-client\-openid@.*$</packageUrl>
7+
<packageUrl regex="true">^pkg:maven/com\.inrupt\.client/inrupt\-client\-openid@.*$</packageUrl>
88
<cpe>cpe:/a:openid:openid</cpe>
99
</suppress>
1010
<suppress>

‎core/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>com.inrupt</groupId>
5+
<groupId>com.inrupt.client</groupId>
66
<artifactId>inrupt-client</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
@@ -32,12 +32,12 @@
3232

3333
<dependencies>
3434
<dependency>
35-
<groupId>com.inrupt</groupId>
35+
<groupId>com.inrupt.client</groupId>
3636
<artifactId>inrupt-client-api</artifactId>
3737
<version>${project.version}</version>
3838
</dependency>
3939
<dependency>
40-
<groupId>com.inrupt</groupId>
40+
<groupId>com.inrupt.client</groupId>
4141
<artifactId>inrupt-client-parser</artifactId>
4242
<version>${project.version}</version>
4343
</dependency>
@@ -99,31 +99,31 @@
9999
<scope>test</scope>
100100
</dependency>
101101
<dependency>
102-
<groupId>com.inrupt</groupId>
102+
<groupId>com.inrupt.client</groupId>
103103
<artifactId>inrupt-client-jackson</artifactId>
104104
<version>${project.version}</version>
105105
<scope>test</scope>
106106
</dependency>
107107
<dependency>
108-
<groupId>com.inrupt</groupId>
108+
<groupId>com.inrupt.client</groupId>
109109
<artifactId>inrupt-client-openid</artifactId>
110110
<version>${project.version}</version>
111111
<scope>test</scope>
112112
</dependency>
113113
<dependency>
114-
<groupId>com.inrupt</groupId>
114+
<groupId>com.inrupt.client</groupId>
115115
<artifactId>inrupt-client-uma</artifactId>
116116
<version>${project.version}</version>
117117
<scope>test</scope>
118118
</dependency>
119119
<dependency>
120-
<groupId>com.inrupt</groupId>
120+
<groupId>com.inrupt.client</groupId>
121121
<artifactId>inrupt-client-jena</artifactId>
122122
<version>${project.version}</version>
123123
<scope>test</scope>
124124
</dependency>
125125
<dependency>
126-
<groupId>com.inrupt</groupId>
126+
<groupId>com.inrupt.client</groupId>
127127
<artifactId>inrupt-client-httpclient</artifactId>
128128
<version>${project.version}</version>
129129
<scope>test</scope>

‎examples/cli/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>com.inrupt</groupId>
6+
<groupId>com.inrupt.client</groupId>
77
<artifactId>inrupt-client-examples-parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
</parent>
@@ -40,47 +40,47 @@
4040
<artifactId>quarkus-arc</artifactId>
4141
</dependency>
4242
<dependency>
43-
<groupId>com.inrupt</groupId>
43+
<groupId>com.inrupt.client</groupId>
4444
<artifactId>inrupt-client-api</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747
<dependency>
48-
<groupId>com.inrupt</groupId>
48+
<groupId>com.inrupt.client</groupId>
4949
<artifactId>inrupt-client-vocabulary</artifactId>
5050
<version>${project.version}</version>
5151
</dependency>
5252
<dependency>
53-
<groupId>com.inrupt</groupId>
53+
<groupId>com.inrupt.client</groupId>
5454
<artifactId>inrupt-client-webid</artifactId>
5555
<version>${project.version}</version>
5656
</dependency>
5757
<dependency>
58-
<groupId>com.inrupt</groupId>
58+
<groupId>com.inrupt.client</groupId>
5959
<artifactId>inrupt-client-jena</artifactId>
6060
<version>${project.version}</version>
6161
</dependency>
6262
<dependency>
63-
<groupId>com.inrupt</groupId>
63+
<groupId>com.inrupt.client</groupId>
6464
<artifactId>inrupt-client-openid</artifactId>
6565
<version>${project.version}</version>
6666
</dependency>
6767
<dependency>
68-
<groupId>com.inrupt</groupId>
68+
<groupId>com.inrupt.client</groupId>
6969
<artifactId>inrupt-client-httpclient</artifactId>
7070
<version>${project.version}</version>
7171
</dependency>
7272
<dependency>
73-
<groupId>com.inrupt</groupId>
73+
<groupId>com.inrupt.client</groupId>
7474
<artifactId>inrupt-client-jackson</artifactId>
7575
<version>${project.version}</version>
7676
</dependency>
7777
<dependency>
78-
<groupId>com.inrupt</groupId>
78+
<groupId>com.inrupt.client</groupId>
7979
<artifactId>inrupt-client-core</artifactId>
8080
<version>${project.version}</version>
8181
</dependency>
8282
<dependency>
83-
<groupId>com.inrupt</groupId>
83+
<groupId>com.inrupt.client</groupId>
8484
<artifactId>inrupt-client-solid</artifactId>
8585
<version>${project.version}</version>
8686
</dependency>

0 commit comments

Comments
 (0)