Skip to content

Commit 1edd192

Browse files
committed
Remove parent pom from cdt-java-client
1 parent cabd7df commit 1edd192

File tree

4 files changed

+73
-22
lines changed

4 files changed

+73
-22
lines changed

cdt-examples/THIRD-PARTY.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

cdt-examples/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
<plugin>
6666
<groupId>org.codehaus.mojo</groupId>
6767
<artifactId>license-maven-plugin</artifactId>
68+
<configuration>
69+
<skipAddThirdParty>true</skipAddThirdParty>
70+
</configuration>
6871
</plugin>
6972
<plugin>
7073
<groupId>com.coveo</groupId>

cdt-java-client/pom.xml

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<parent>
6-
<groupId>com.github.kklisura.cdt</groupId>
7-
<artifactId>ctd-java-client-root</artifactId>
8-
<version>1.0-SNAPSHOT</version>
9-
</parent>
5+
<!-- NOTE(kklisura): Do not add parent tag here, since it gets deployed (via mvn deploy)[at least on snapshot repo],
6+
so clients won't be able to pull it unless parent is also deployed -->
107

8+
<groupId>com.github.kklisura.cdt</groupId>
119
<artifactId>cdt-java-client</artifactId>
1210
<version>3.0.0-SNAPSHOT</version>
1311
<packaging>jar</packaging>
@@ -16,6 +14,18 @@
1614
<description>Chrome DevTools java client</description>
1715
<url>https://github.com/kklisura/chrome-devtools-java-client</url>
1816

17+
<developers>
18+
<developer>
19+
<name>Kenan Klisura</name>
20+
<email>kklisura@hotmail.com</email>
21+
</developer>
22+
</developers>
23+
24+
<organization>
25+
<name>Kenan Klisura</name>
26+
<url>https://kklisura.com</url>
27+
</organization>
28+
1929
<scm>
2030
<connection>scm:git:git://github.com/kklisura/chrome-devtools-java-client.git</connection>
2131
<developerConnection>scm:git:ssh://github.com:kklisura/chrome-devtools-java-client.git</developerConnection>
@@ -38,6 +48,8 @@
3848
<maven.compiler.source>1.8</maven.compiler.source>
3949
<maven.compiler.target>1.8</maven.compiler.target>
4050

51+
<project.inceptionYear>2018</project.inceptionYear>
52+
4153
<jackson.version>2.11.3</jackson.version>
4254
<websocket.api.version>1.1</websocket.api.version>
4355
<tyrus.version>1.13.1</tyrus.version>
@@ -264,12 +276,63 @@
264276
</resources>
265277
<plugins>
266278
<plugin>
279+
<!-- This plugin is also present in cdt-java-client, so be sure to copy any changes here to that module as well -->
267280
<groupId>org.codehaus.mojo</groupId>
268281
<artifactId>license-maven-plugin</artifactId>
282+
<version>2.0.0</version>
283+
<executions>
284+
<execution>
285+
<id>update-file-header</id>
286+
<goals>
287+
<goal>update-file-header</goal>
288+
</goals>
289+
<phase>process-sources</phase>
290+
</execution>
291+
<execution>
292+
<id>attach-licenses</id>
293+
<goals>
294+
<goal>update-project-license</goal>
295+
<goal>add-third-party</goal>
296+
</goals>
297+
</execution>
298+
</executions>
299+
<configuration>
300+
<outputDirectory>${project.basedir}</outputDirectory>
301+
<canUpdateCopyright>true</canUpdateCopyright>
302+
<failOnMissing>true</failOnMissing>
303+
<licenseName>apache_v2</licenseName>
304+
<useMissingFile>true</useMissingFile>
305+
<excludes>
306+
<exclude>**/*.json</exclude>
307+
</excludes>
308+
<roots>
309+
<root>src/main/java</root>
310+
<root>src/test</root>
311+
</roots>
312+
<licenseMerges>
313+
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache
314+
Public License 2.0|Apache 2|Apache 2.0|Apache License 2.0|Apache License
315+
</licenseMerge>
316+
<licenseMerge>Eclipse Public License v1.0|Eclipse Public License 1.0|Eclipse Public License
317+
- v 1.0
318+
</licenseMerge>
319+
<licenseMerge>BSD 3-Clause License|BSD|New BSD License</licenseMerge>
320+
<licenseMerge>Dual license consisting of the CDDL v1.1 and GPL v2|CDDL+GPL</licenseMerge>
321+
</licenseMerges>
322+
</configuration>
269323
</plugin>
270324
<plugin>
271325
<groupId>com.coveo</groupId>
272326
<artifactId>fmt-maven-plugin</artifactId>
327+
<version>2.9.1</version>
328+
<executions>
329+
<execution>
330+
<goals>
331+
<goal>format</goal>
332+
</goals>
333+
<phase>process-sources</phase>
334+
</execution>
335+
</executions>
273336
</plugin>
274337
</plugins>
275338
</build>

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<pluginManagement>
4747
<plugins>
4848
<plugin>
49+
<!-- This plugin is also present in cdt-java-client, so be sure to copy any changes here to that module as well -->
4950
<groupId>org.codehaus.mojo</groupId>
5051
<artifactId>license-maven-plugin</artifactId>
5152
<version>2.0.0</version>
@@ -91,6 +92,7 @@
9192
</configuration>
9293
</plugin>
9394
<plugin>
95+
<!-- This plugin is also present in cdt-java-client, so be sure to copy any changes here to that module as well -->
9496
<groupId>com.coveo</groupId>
9597
<artifactId>fmt-maven-plugin</artifactId>
9698
<version>2.9.1</version>

0 commit comments

Comments
 (0)