Merge pull request #23 from arsysop/switch-license-2

Switch license 2

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
     java
     jacoco
     `maven-publish`
-     //id("ru.arsysop.liho.liho-gradle-plugin") version "0.1"
+    //id("ru.arsysop.liho.liho-gradle-plugin") version "0.1"
 }
 
 group = "ru.arsysop.liho"
@@ -35,7 +35,6 @@ project.apply {
 
 repositories {
     mavenCentral()
-    mavenLocal()
     jcenter()
     maven(url = "https://dl.bintray.com/arsysop/lang")
 }
@@ -55,11 +54,13 @@ java {
     withSourcesJar()
 }
 
-/*liho {
+/*
+liho {
     root.set(project.file("src/main"))
     strict.set(true)
     report.set(project.file("$buildDir/liho/report.txt"))
-}*/
+}
+*/
 
 tasks.withType(Test::class) {
     useJUnitPlatform()
@@ -83,11 +84,17 @@ tasks.jar {
     extendManifest(manifest)
 }
 
+tasks.withType(Jar::class) {
+    extendManifestShort(manifest)
+    from("README.md", "LICENSE")
+}
+
+tasks.getByName("sourcesJar") {
+    (this as Jar).from(sourceSets["test"].allSource)
+}
+
 fun extendManifest(mf: Manifest) {
     mf.attributes(
-        "Group" to project.group,
-        "Artifact" to project.name,
-        "Version" to project.version,
         "Bundle-Vendor" to "ArSysOp",
         "Bundle-Name" to "ru.arsysop.liho",
         "Bundle-SymbolicName" to "ru.arsysop.liho",
@@ -102,6 +109,14 @@ fun extendManifest(mf: Manifest) {
     )
 }
 
+fun extendManifestShort(mf: Manifest) {
+    mf.attributes(
+        "Group" to project.group,
+        "Artifact" to project.name,
+        "Version" to project.version
+    )
+}
+
 publishing {
     publications {
         repositories {
@@ -117,8 +132,8 @@ publishing {
                 url.set("https://github.com/ArSysOp/liho")
                 licenses {
                     license {
-                        name.set("Eclipse Public License 2.0")
-                        url.set("https://spdx.org/licenses/EPL-2.0.html")
+                        name.set("Apache 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0")
                     }
                 }
                 developers {

settings.gradle.kts

@@ -24,6 +24,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         maven(url = "https://dl.bintray.com/arsysop/lang")
+        maven(url = "https://dl.bintray.com/arsysop/liho")
     }
     resolutionStrategy {
         eachPlugin {

src/main/java/ru/arsysop/liho/bulk/Visitor.java

@@ -34,7 +34,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 
 final class Visitor implements FileVisitor<Path> {
-
+                                    
 	private final CommentTypes types;
 	private final ContentAnalysisFactory analyzers;
 	private final Report report;