Skip to content

Commit

Permalink
Update copyright headers (#466)
Browse files Browse the repository at this point in the history
* Update Maven license plugin and configuration

* Apply license header update

* Remove unnecessary license files
  • Loading branch information
andrewazores authored Apr 22, 2021
1 parent 7e6288d commit e0e7490
Show file tree
Hide file tree
Showing 235 changed files with 717 additions and 1,711 deletions.
49 changes: 24 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<org.apache.maven.plugins.assembly.version>3.3.0</org.apache.maven.plugins.assembly.version>
<com.github.eirslett.frontend.plugin.version>1.11.3</com.github.eirslett.frontend.plugin.version>
<org.codehaus.mojo.exec.plugin.version>3.0.0</org.codehaus.mojo.exec.plugin.version>
<org.codehaus.mojo.license.plugin.version>2.0.0</org.codehaus.mojo.license.plugin.version>
<com.mycila.license.maven.plugin.version>4.0</com.mycila.license.maven.plugin.version>
<org.owasp.dependency.check.version>6.1.5</org.owasp.dependency.check.version>
<com.google.cloud.tools.jib.maven.plugin.version>3.0.0</com.google.cloud.tools.jib.maven.plugin.version>

Expand Down Expand Up @@ -489,30 +489,29 @@
<version>${org.apache.maven.plugins.info.reports.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>${org.codehaus.mojo.license.plugin.version}</version>
<configuration>
<licenseName>upl_v1</licenseName>
<licenseResolver>${project.baseUri}/src/license</licenseResolver>
<projectName>Cryostat</projectName>
<organizationName>The Cryostat Authors</organizationName>
<inceptionYear>2020</inceptionYear>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<roots>
<root>src/main/java</root>
<root>src/test/java</root>
</roots>
</configuration>
<executions>
<execution>
<id>update-license</id>
<goals>
<goal>update-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>${com.mycila.license.maven.plugin.version}</version>
<configuration>
<licenseSets>
<licenseSet>
<header>LICENSE</header>
<includes>
<include>src/main/**/*.java</include>
<include>src/test/**/*.java</include>
</includes>
</licenseSet>
</licenseSets>
</configuration>
<executions>
<execution>
<id>update-license</id>
<goals>
<goal>check</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
1 change: 0 additions & 1 deletion src/license/licenses.properties

This file was deleted.

33 changes: 0 additions & 33 deletions src/license/upl_v1/header.txt

This file was deleted.

33 changes: 0 additions & 33 deletions src/license/upl_v1/license.txt

This file was deleted.

10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/Cryostat.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/MainModule.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/commands/Command.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/commands/CommandExecutor.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/commands/CommandRegistry.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/io/cryostat/commands/CommandsModule.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/*-
* #%L
* Cryostat
* %%
* Copyright (C) 2020 - 2021 The Cryostat Authors
* %%
/*
* Copyright The Cryostat Authors
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
Expand Down Expand Up @@ -37,7 +34,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* #L%
*/
package io.cryostat.commands.internal;

Expand Down
Loading

0 comments on commit e0e7490

Please sign in to comment.