Skip to content

Commit

Permalink
removes unnecessary licensee headers + adds copyright notice to README
Browse files Browse the repository at this point in the history
  • Loading branch information
abelsromero committed Sep 5, 2020
1 parent 5a7430d commit 24b50f2
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 141 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Documentation::
* Fix broken link to V2 migration guide (https://github.com/ge0ffrey[@ge0ffrey]) (#446)
* Add GitHub's PR and issue templates (#465)
* Add `auto-refresh` mojo documentation (#466)
* Add copyright notice to README and remove unnecessary license header from sources (#482)

Build / Infrastructure::

Expand Down
7 changes: 7 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -787,3 +787,10 @@ If you are not sure what version of the Asciidoctor converter is being used.
You can obtain it using the version attribute like in the example blow.

Asciidoctor version: {asciidoctor-version}

== Copyright and License

Copyright (C) 2013-2020 Jason Porter, Dan Allen, Abel Salgado Romero and the individual contributors.
Use of this software is granted under the terms of the Apache License, Version 2.0.

See the {uri-license}[LICENSE] for the full license text.
12 changes: 0 additions & 12 deletions src/main/java/org/asciidoctor/maven/AsciidoctorHttpMojo.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven;

import org.apache.commons.io.IOUtils;
Expand Down
13 changes: 1 addition & 12 deletions src/main/java/org/asciidoctor/maven/AsciidoctorMaven.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.asciidoctor.maven;

public interface AsciidoctorMaven {
static final String PREFIX = "asciidoctor.";
String PREFIX = "asciidoctor.";
}
14 changes: 1 addition & 13 deletions src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven;

import org.apache.maven.execution.MavenSession;
Expand Down Expand Up @@ -53,7 +41,7 @@


/**
* Basic maven plugin goal to convert AsciiDoc files using Asciidoctor, a ruby port.
* Basic maven plugin goal to convert AsciiDoc files using AsciidoctorJ.
*/
@Mojo(name = "process-asciidoc", threadSafe = true)
public class AsciidoctorMojo extends AbstractMojo {
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/org/asciidoctor/maven/AsciidoctorRefreshMojo.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven;

import org.apache.commons.io.filefilter.FileFilterUtils;
Expand Down Expand Up @@ -54,7 +42,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
stopMonitors();
}

protected void doWork() throws MojoFailureException, MojoExecutionException {
protected void doWork() {
long timeInMillis = TimeCounter.timed(() -> {
try {
processAllSources(defaultResourcesProcessor);
Expand All @@ -65,7 +53,7 @@ protected void doWork() throws MojoFailureException, MojoExecutionException {
getLog().info("Converted document(s) in " + timeInMillis + "ms");
}

protected void doWait() throws MojoExecutionException, MojoFailureException {
protected void doWait() {
showWaitMessage();

String line;
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/org/asciidoctor/maven/AsciidoctorZipMojo.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven;

import org.apache.maven.plugin.MojoExecutionException;
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/org/asciidoctor/maven/http/AsciidoctorHandler.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.asciidoctor.maven.http;

import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.asciidoctor.maven.http;

import java.io.File;
Expand Down
17 changes: 3 additions & 14 deletions src/main/java/org/asciidoctor/maven/io/Zips.java
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven.io;

import org.apache.commons.io.IOUtils;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import org.apache.commons.io.IOUtils;

public final class Zips {

public static void zip(final File dir, final File zipName) throws IOException, IllegalArgumentException {
final String[] entries = dir.list();
final ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zipName));
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/org/asciidoctor/maven/process/AsciidoctorHelper.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.asciidoctor.maven.process;

import org.apache.maven.project.MavenProject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/*
* Copyright 2015 The Ascidoctor Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.asciidoctor.maven.site;

import org.apache.maven.doxia.module.xhtml.XhtmlParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/*
* Copyright 2015 The Ascidoctor Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.asciidoctor.maven.site;

import org.apache.maven.doxia.parser.module.AbstractParserModule;
Expand Down

0 comments on commit 24b50f2

Please sign in to comment.