Skip to content

Commit 7fd55e7

Browse files
author
Alexandre Dutra
committed
Update license plugin
1 parent 1050d33 commit 7fd55e7

10 files changed

Lines changed: 29 additions & 58 deletions

File tree

‎driver-core/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
</description>
3131
<url>https://github.com/datastax/java-driver</url>
3232

33-
<properties>
34-
<main.basedir>${project.parent.basedir}</main.basedir>
35-
</properties>
36-
3733
<dependencies>
3834
<dependency>
3935
<groupId>io.netty</groupId>

‎driver-dist/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
</parent>
2525
<artifactId>cassandra-driver-dist</artifactId>
2626

27-
<properties>
28-
<main.basedir>${project.parent.basedir}</main.basedir>
29-
</properties>
30-
3127
<!-- Should be pom but Javadoc generation requires a "classpath-capable" package -->
3228
<packaging>jar</packaging>
3329

‎driver-examples/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<url>https://github.com/datastax/java-driver</url>
3131

3232
<properties>
33-
<main.basedir>${project.parent.basedir}</main.basedir>
3433
<jax-rs.version>2.0.1</jax-rs.version>
3534
<jersey.version>2.23.1</jersey.version>
3635
<hk2.version>2.4.0-b34</hk2.version>

‎driver-extras/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<url>https://github.com/datastax/java-driver</url>
3131

3232
<properties>
33-
<main.basedir>${project.parent.basedir}</main.basedir>
3433
<test.groups>unit</test.groups>
3534
<jdk8.excludes>none</jdk8.excludes>
3635
</properties>

‎driver-mapping/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<url>https://github.com/datastax/java-driver</url>
3030

3131
<properties>
32-
<main.basedir>${project.parent.basedir}</main.basedir>
3332
<groovy.version>2.4.7</groovy.version>
3433
</properties>
3534

‎driver-tests/osgi/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
test with no matching methods.
4343
-->
4444
<test.skip>true</test.skip>
45-
<main.basedir>${project.parent.parent.basedir}</main.basedir>
4645
</properties>
4746

4847
<dependencies>

‎driver-tests/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<description>Tests for the DataStax Java Driver for Apache Cassandra.</description>
2929
<url>https://github.com/datastax/java-driver</url>
3030

31-
<properties>
32-
<main.basedir>${project.parent.basedir}</main.basedir>
33-
</properties>
34-
3531
<modules>
3632
<module>stress</module>
3733
<module>osgi</module>

‎driver-tests/stress/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<description>A stress test example for DataStax Java Driver for Apache Cassandra.</description>
2929
<url>https://github.com/datastax/java-driver</url>
3030

31-
<properties>
32-
<main.basedir>${project.parent.parent.basedir}</main.basedir>
33-
</properties>
34-
3531
<dependencies>
3632
<dependency>
3733
<groupId>com.datastax.cassandra</groupId>

‎pom.xml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<!--
22
3-
Copyright (C) 2012-2015 DataStax Inc.
3+
Copyright (C) 2012-2015 DataStax Inc.
44
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
http://www.apache.org/licenses/LICENSE-2.0
1010
11-
Unless required by applicable law or agreed to in writing, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
1616
1717
-->
1818
<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/maven-v4_0_0.xsd">
@@ -73,7 +73,6 @@
7373
<commons-exec.version>1.3</commons-exec.version>
7474
<scassandra.version>1.1.2</scassandra.version>
7575
<logback.version>1.2.3</logback.version>
76-
<main.basedir>${project.basedir}</main.basedir>
7776
<ipprefix>127.0.1.</ipprefix>
7877
<test.groups>unit</test.groups>
7978
<!-- Set default javadoc.opts, overriden by profiles -->
@@ -382,25 +381,35 @@
382381
</dependency>
383382
</dependencies>
384383
</plugin>
385-
<!--
386-
To update license headers run:
387-
mvn license:format
388-
-->
389384
<plugin>
390385
<groupId>com.mycila</groupId>
391386
<artifactId>license-maven-plugin</artifactId>
392-
<version>2.8</version>
387+
<version>3.0</version>
393388
<configuration>
394-
<header>${main.basedir}/src/license/header.txt</header>
389+
<inlineHeader><![CDATA[
390+
391+
Copyright (C) 2012-2017 DataStax Inc.
392+
393+
Licensed under the Apache License, Version 2.0 (the "License");
394+
you may not use this file except in compliance with the License.
395+
You may obtain a copy of the License at
396+
397+
http://www.apache.org/licenses/LICENSE-2.0
398+
399+
Unless required by applicable law or agreed to in writing, software
400+
distributed under the License is distributed on an "AS IS" BASIS,
401+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
402+
See the License for the specific language governing permissions and
403+
limitations under the License.
404+
405+
]]>
406+
</inlineHeader>
395407
<includes>
396408
<include>src/**/*.java</include>
397409
<include>src/**/*.xml</include>
398410
<include>src/**/*.properties</include>
399411
<include>**/pom.xml</include>
400412
</includes>
401-
<excludes>
402-
<exclude>**/src/main/config/ide/**</exclude>
403-
</excludes>
404413
<mapping>
405414
<java>SLASHSTAR_STYLE</java>
406415
<properties>SCRIPT_STYLE</properties>
@@ -414,11 +423,6 @@
414423
<goals>
415424
<goal>check</goal>
416425
</goals>
417-
<configuration>
418-
<properties>
419-
<currentYear>${currentYear}</currentYear>
420-
</properties>
421-
</configuration>
422426
</execution>
423427
</executions>
424428
</plugin>

‎src/license/header.txt‎

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

0 commit comments

Comments
 (0)