Skip to content

Commit 7fd113f

Browse files
wumpzwumpz
committed
corrected hopefully right the license headers, using maven license plugin (as for the original author stated Apache 2.0: dnaumenko/java-diff-utils#35)
1 parent c29c53d commit 7fd113f

23 files changed

+431
-441
lines changed

‎pom.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,27 @@
2020
<developerConnection>scm:git:ssh://git@github.com:wumpz/java-diff-utils.git</developerConnection>
2121
<url>https://github.com/wumpz/java-diff-utils.git</url>
2222
</scm>
23+
24+
<issueManagement>
25+
<system>GitHub Issues</system>
26+
<url>https://github.com/wumpz/java-diff-utils/issues</url>
27+
</issueManagement>
28+
29+
<organization>
30+
<name>java-diff-utils</name>
31+
</organization>
32+
33+
<developers>
34+
<developer>
35+
<name>Tobias Warneke</name>
36+
<email>t.warneke@gmx.net</email>
37+
</developer>
38+
<developer>
39+
<name>Dmitry Naumenko</name>
40+
<email>dm.naumenko@gmail.com</email>
41+
</developer>
42+
</developers>
43+
2344
<licenses>
2445
<license>
2546
<name>The Apache Software License, Version 2.0</name>
@@ -84,6 +105,31 @@
84105
</execution>
85106
</executions>
86107
</plugin>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>license-maven-plugin</artifactId>
111+
<version>1.12</version>
112+
<configuration>
113+
<verbose>false</verbose>
114+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
115+
<canUpdateDescription>false</canUpdateDescription>
116+
</configuration>
117+
<executions>
118+
<execution>
119+
<id>first</id>
120+
<goals>
121+
<goal>update-file-header</goal>
122+
</goals>
123+
<phase>process-sources</phase>
124+
<configuration>
125+
<licenseName>apache_v2</licenseName>
126+
<roots>
127+
<root>src/main/java</root>
128+
</roots>
129+
</configuration>
130+
</execution>
131+
</executions>
132+
</plugin>
87133
</plugins>
88134
</build>
89135
</project>

‎src/main/java/difflib/DiffUtils.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
/*
2-
Copyright 2010 Dmitry Naumenko (dm.naumenko@gmail.com)
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
1519
*/
1620
package difflib;
1721

‎src/main/java/difflib/algorithm/DiffAlgorithm.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
/*
2-
Copyright 2010 Dmitry Naumenko (dm.naumenko@gmail.com)
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
310
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
712
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
1519
*/
1620
package difflib.algorithm;
1721

‎src/main/java/difflib/algorithm/myers/DiffException.java‎

Lines changed: 18 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,21 @@
1-
/*
2-
* ====================================================================
3-
*
4-
* The Apache Software License, Version 1.1
5-
*
6-
* Copyright (c) 1999-2003 The Apache Software Foundation.
7-
* All rights reserved.
8-
*
9-
* Redistribution and use in source and binary forms, with or without
10-
* modification, are permitted provided that the following conditions
11-
* are met:
12-
*
13-
* 1. Redistributions of source code must retain the above copyright
14-
* notice, this list of conditions and the following disclaimer.
15-
*
16-
* 2. Redistributions in binary form must reproduce the above copyright
17-
* notice, this list of conditions and the following disclaimer in
18-
* the documentation and/or other materials provided with the
19-
* distribution.
20-
*
21-
* 3. The end-user documentation included with the redistribution, if
22-
* any, must include the following acknowledgement:
23-
* "This product includes software developed by the
24-
* Apache Software Foundation (http://www.apache.org/)."
25-
* Alternately, this acknowledgement may appear in the software itself,
26-
* if and wherever such third-party acknowledgements normally appear.
27-
*
28-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
29-
* Foundation" must not be used to endorse or promote products derived
30-
* from this software without prior written permission. For written
31-
* permission, please contact apache@apache.org.
32-
*
33-
* 5. Products derived from this software may not be called "Apache"
34-
* nor may "Apache" appear in their names without prior written
35-
* permission of the Apache Software Foundation.
36-
*
37-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
38-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
39-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
40-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
41-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
42-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
43-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
44-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
45-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
46-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
47-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
48-
* SUCH DAMAGE.
49-
* ====================================================================
50-
*
51-
* This software consists of voluntary contributions made by many
52-
* individuals on behalf of the Apache Software Foundation. For more
53-
* information on the Apache Software Foundation, please see
54-
* <http://www.apache.org/>.
55-
*
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
5619
*/
5720
package difflib.algorithm.myers;
5821

‎src/main/java/difflib/algorithm/myers/DiffNode.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
19+
*/
120
package difflib.algorithm.myers;
221

322
/**

‎src/main/java/difflib/algorithm/myers/DifferentiationFailedException.java‎

Lines changed: 18 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,21 @@
1-
/*
2-
* ====================================================================
3-
*
4-
* The Apache Software License, Version 1.1
5-
*
6-
* Copyright (c) 1999-2003 The Apache Software Foundation.
7-
* All rights reserved.
8-
*
9-
* Redistribution and use in source and binary forms, with or without
10-
* modification, are permitted provided that the following conditions
11-
* are met:
12-
*
13-
* 1. Redistributions of source code must retain the above copyright
14-
* notice, this list of conditions and the following disclaimer.
15-
*
16-
* 2. Redistributions in binary form must reproduce the above copyright
17-
* notice, this list of conditions and the following disclaimer in
18-
* the documentation and/or other materials provided with the
19-
* distribution.
20-
*
21-
* 3. The end-user documentation included with the redistribution, if
22-
* any, must include the following acknowledgement:
23-
* "This product includes software developed by the
24-
* Apache Software Foundation (http://www.apache.org/)."
25-
* Alternately, this acknowledgement may appear in the software itself,
26-
* if and wherever such third-party acknowledgements normally appear.
27-
*
28-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
29-
* Foundation" must not be used to endorse or promote products derived
30-
* from this software without prior written permission. For written
31-
* permission, please contact apache@apache.org.
32-
*
33-
* 5. Products derived from this software may not be called "Apache"
34-
* nor may "Apache" appear in their names without prior written
35-
* permission of the Apache Software Foundation.
36-
*
37-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
38-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
39-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
40-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
41-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
42-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
43-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
44-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
45-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
46-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
47-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
48-
* SUCH DAMAGE.
49-
* ====================================================================
50-
*
51-
* This software consists of voluntary contributions made by many
52-
* individuals on behalf of the Apache Software Foundation. For more
53-
* information on the Apache Software Foundation, please see
54-
* <http://www.apache.org/>.
55-
*
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
5619
*/
5720
package difflib.algorithm.myers;
5821

‎src/main/java/difflib/algorithm/myers/MyersDiff.java‎

Lines changed: 18 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,21 @@
1-
/*
2-
* ====================================================================
3-
*
4-
* The Apache Software License, Version 1.1
5-
*
6-
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
7-
* reserved.
8-
*
9-
* Redistribution and use in source and binary forms, with or without
10-
* modification, are permitted provided that the following conditions
11-
* are met:
12-
*
13-
* 1. Redistributions of source code must retain the above copyright
14-
* notice, this list of conditions and the following disclaimer.
15-
*
16-
* 2. Redistributions in binary form must reproduce the above copyright
17-
* notice, this list of conditions and the following disclaimer in
18-
* the documentation and/or other materials provided with the
19-
* distribution.
20-
*
21-
* 3. The end-user documentation included with the redistribution, if
22-
* any, must include the following acknowledgement:
23-
* "This product includes software developed by the
24-
* Apache Software Foundation (http://www.apache.org/)."
25-
* Alternately, this acknowledgement may appear in the software itself,
26-
* if and wherever such third-party acknowledgements normally appear.
27-
*
28-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
29-
* Foundation" must not be used to endorse or promote products derived
30-
* from this software without prior written permission. For written
31-
* permission, please contact apache@apache.org.
32-
*
33-
* 5. Products derived from this software may not be called "Apache"
34-
* nor may "Apache" appear in their names without prior written
35-
* permission of the Apache Software Foundation.
36-
*
37-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
38-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
39-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
40-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
41-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
42-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
43-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
44-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
45-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
46-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
47-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
48-
* SUCH DAMAGE.
49-
* ====================================================================
50-
*
51-
* This software consists of voluntary contributions made by many
52-
* individuals on behalf of the Apache Software Foundation. For more
53-
* information on the Apache Software Foundation, please see
54-
* <http://www.apache.org/>.
55-
*
1+
/*-
2+
* #%L
3+
* java-diff-utils
4+
* %%
5+
* Copyright (C) 2009 - 2017 java-diff-utils
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
* #L%
5619
*/
5720
package difflib.algorithm.myers;
5821

0 commit comments

Comments
 (0)