Correct licence issues · KevinStrong/Flickr4Java@a208713 · GitHub
Skip to content

Commit a208713

Browse files
author
boncey
committed
Correct licence issues
F4J was forked from flickrj which was licensed under BSD and copyrighted Anthony Eden. Anthony has kindly agreed for that copyright to be set as just the BSD license. The old copyright comments have been removed and the license file updated. This resolves boncey#1.
1 parent 1894dcf commit a208713

83 files changed

Lines changed: 103 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE-apache.txt‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎LICENSE.txt‎

Lines changed: 25 additions & 45 deletions

‎pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
<version>7</version>
1717
</parent>
1818

19-
<licenses>
20-
<license>
21-
<name>Apache License, Version 1.1</name>
22-
<url>http://www.apache.org/licenses/LICENSE-1.1.txt</url>
23-
<distribution>repo</distribution>
24-
</license>
25-
</licenses>
26-
2719
<developers>
2820
<developer>
2921
<id>boncey</id>

‎src/main/java/com/flickr4java/flickr/Flickr.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42
package com.flickr4java.flickr;
53

64
import com.flickr4java.flickr.activity.ActivityInterface;

‎src/main/java/com/flickr4java/flickr/FlickrException.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42
package com.flickr4java.flickr;
53

64
/**

‎src/main/java/com/flickr4java/flickr/Parameter.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42
package com.flickr4java.flickr;
53

64
/**

‎src/main/java/com/flickr4java/flickr/REST.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42
package com.flickr4java.flickr;
53

64
import com.flickr4java.flickr.auth.Auth;

‎src/main/java/com/flickr4java/flickr/RESTResponse.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42
package com.flickr4java.flickr;
53

64
import com.flickr4java.flickr.util.XMLUtilities;

‎src/main/java/com/flickr4java/flickr/RequestContext.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/*
2-
* Copyright (c) 2005 Aetrion LLC.
3-
*/
1+
42

53
package com.flickr4java.flickr;
64

‎src/main/java/com/flickr4java/flickr/Response.java‎

Lines changed: 1 addition & 3 deletions

0 commit comments

Comments
 (0)