Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix_bug_29 #32

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
25 changes: 25 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
MIT License

Copyright (c) 2019 Michael Ma([email protected])

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 ([email protected])

Expand Down
8 changes: 8 additions & 0 deletions LICENSE-Michael_Rice
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
The MIT License (MIT)
Copyright (c) 2014 Michael Rice ([email protected])

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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
13 changes: 11 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>org.complykit</groupId>
<artifactId>license-check-maven-plugin</artifactId>
<version>0.5.4</version>
<version>0.5.5-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>License Check Plugin</name>
Expand Down Expand Up @@ -42,6 +42,15 @@
</roles>
<timezone>-7</timezone>
</developer>
<developer>
<name>Michael Ma</name>
<email>[email protected]</email>
<roles>
<role>Developer</role>
</roles>
<timezone>+8</timezone>
<url>http://myc.name</url>
</developer>
</developers>

<properties>
Expand Down Expand Up @@ -211,4 +220,4 @@
</repository>
</distributionManagement>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down