diff options
| author | JNajjar <johannes.najjar@tngtech.com> | 2015-05-28 09:35:31 +0200 |
|---|---|---|
| committer | JNajjar <johannes.najjar@tngtech.com> | 2015-05-28 09:41:27 +0200 |
| commit | c22ab1eff2b2d4bc1abd5e3677d24fd3843eccb5 (patch) | |
| tree | 4bf111be404e417ecffe0c466b0b2257c5087882 | |
| parent | 39727674afb002653dbc5bfeef68256c109efaaf (diff) | |
| download | ninka-c22ab1eff2b2d4bc1abd5e3677d24fd3843eccb5.tar.gz | |
Renamed Apache2 license
| -rw-r--r-- | lib/Ninka/licensesentence.dict | 4 | ||||
| -rw-r--r-- | lib/Ninka/rules.dict | 4 | ||||
| -rw-r--r-- | t/data/expected_output/Apache-2.0 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/Ninka/licensesentence.dict b/lib/Ninka/licensesentence.dict index 83d2f92..5ab826c 100644 --- a/lib/Ninka/licensesentence.dict +++ b/lib/Ninka/licensesentence.dict @@ -286,8 +286,8 @@ ApachePre:52:0:Licensed to the Apache Software Foundation \(ASF\) under one or m ApacheSee:52:0:See the NOTICE file distributed with this work for additional information regarding copyright ownership: ApachesAsIs:52:0:Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an <quotes>AS IS<quotes> BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied: ApachesPermLim:52:0:See the License for the specific language governing permissions and limitations under the License: -Apachev2:52:0:Licensed under the Apache License, Version 2.0 \(the <quotes>License<quotes>\); You may not use this file except in compliance with the License: -Apachev2:52:0:The ASF licenses this file to You under the Apache License, Version 2\.0 \(the <quotes>License<quotes>\); you may not use this file except in compliance with the License: +Apache-2:52:0:Licensed under the Apache License, Version 2.0 \(the <quotes>License<quotes>\); You may not use this file except in compliance with the License: +Apache-2:52:0:The ASF licenses this file to You under the Apache License, Version 2\.0 \(the <quotes>License<quotes>\); you may not use this file except in compliance with the License: apacheAndLGPLgen:10:0:^<LICENSED> under the terms of either the Apache License \(<VERSION>\) or the Lesser GPL, as specified in the COPYING file$ diff --git a/lib/Ninka/rules.dict b/lib/Ninka/rules.dict index 6eaaad9..d405c12 100644 --- a/lib/Ninka/rules.dict +++ b/lib/Ninka/rules.dict @@ -219,8 +219,8 @@ EPLv1:EPLv1 CDDLic:CDDLic CDDLicV1:CDDLicV1Only -Apachev2:Apachev2,ApacheLicWherePart1,ApacheLicWherePart2v2,ApachesAsIs,ApachesPermLim -Apachev2:Apachev2,ApacheLicWherePart1,ApacheLicWherePart2v2 +Apache-2:Apache-2,ApacheLicWherePart1,ApacheLicWherePart2v2,ApachesAsIs,ApachesPermLim +Apache-2:Apache-2,ApacheLicWherePart1,ApacheLicWherePart2v2 # publid comain publicDomain:publicDomain diff --git a/t/data/expected_output/Apache-2.0 b/t/data/expected_output/Apache-2.0 index 470067b..d6867d6 100644 --- a/t/data/expected_output/Apache-2.0 +++ b/t/data/expected_output/Apache-2.0 @@ -1 +1 @@ -Apachev2;1;5;0;1;42;UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,Copyright,5 +Apache-2;1;5;0;1;42;UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,Copyright,5 |