diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..9d4faec --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: # Replace with a single custom sponsorship URL diff --git a/.travis.yml b/.travis.yml index b20dcbd..94b466a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: - - oraclejdk7 - - openjdk7 + - oraclejdk8 + - openjdk8 install: true -script: mvn test -Dmaven.compiler.target=1.6 -Dmaven.compiler.source=1.6 -B +script: mvn test -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -B diff --git a/LICENSE b/LICENSE index d2468d7..a2ae1bf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,28 @@ +MIT License + +Copyright (c) 2019 Michael Ma(mycsoft@qq.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +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. + + +================================================================================= + The MIT License (MIT) Copyright (c) 2014 Michael Rice (me@michaelrice.com) diff --git a/LICENSE-Michael_Rice b/LICENSE-Michael_Rice new file mode 100644 index 0000000..d2468d7 --- /dev/null +++ b/LICENSE-Michael_Rice @@ -0,0 +1,8 @@ +The MIT License (MIT) +Copyright (c) 2014 Michael Rice (me@michaelrice.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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. diff --git a/README.md b/README.md index fde5132..b9383af 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ license-check ============= -[![Build Status](https://travis-ci.org/mrice/license-check.png)](https://travis-ci.org/mrice/license-check) +[![Build Status](https://travis-ci.org/mycsoft/license-check.svg?branch=master)](https://travis-ci.org/mycsoft/license-check) Current version: 0.5.3 (Sep 5, 2015) diff --git a/pom.xml b/pom.xml index b00a6ba..8acdb02 100755 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.complykit license-check-maven-plugin - 0.5.4 + 0.5.5-SNAPSHOT maven-plugin License Check Plugin @@ -42,6 +42,15 @@ -7 + + Michael Ma + mycsoft@qq.com + + Developer + + +8 + http://myc.name + @@ -211,4 +220,4 @@ - \ No newline at end of file + diff --git a/src/main/java/org/complykit/licensecheck/mojo/OpenSourceLicenseCheckMojo.java b/src/main/java/org/complykit/licensecheck/mojo/OpenSourceLicenseCheckMojo.java index 957ea22..9dd45e3 100755 --- a/src/main/java/org/complykit/licensecheck/mojo/OpenSourceLicenseCheckMojo.java +++ b/src/main/java/org/complykit/licensecheck/mojo/OpenSourceLicenseCheckMojo.java @@ -183,14 +183,16 @@ public void execute() throws MojoExecutionException, MojoFailureException result = repoSystem.resolveArtifact(repoSession, request); getLog().info(result.toString()); } catch (final ArtifactResolutionException e) { - // TODO: figure out how to deal with this one + getLog().error("Error reading artifact", e); } String licenseName = ""; - try { - licenseName = recurseForLicenseName(RepositoryUtils.toArtifact(result.getArtifact()), 0); - } catch (IOException e) { - getLog().error("Error reading license information", e); + if (result != null) { + try { + licenseName = recurseForLicenseName(RepositoryUtils.toArtifact(result.getArtifact()), 0); + } catch (IOException e) { + getLog().error("Error reading license information", e); + } } String code = convertLicenseNameToCode(licenseName); if (code == null) {