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.

Sign up for GitHub

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

Batch Upload tests #103

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Batch Upload tests #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2c83ce4
Reinstated "views" element
E-Penguin Aug 28, 2014
6d16704
Batch Upload tests
vishbin Oct 5, 2014
c1e805f
Fix SAXParseException on REST.get call #105
szabobalint-virgo Oct 9, 2014
bda22b1
Tests
vishbin Nov 8, 2014
e1cfb33
Merge pull request #106 from szbaalint/master
Nov 9, 2014
424864c
Merge pull request #108 from hytgbn/master
Nov 9, 2014
cb9f56a
Merge pull request #101 from E-Penguin/patch-3
Nov 9, 2014
83665c7
Add mention of log4j dependency
Nov 9, 2014
e939425
Add support for 'primary_photo_extras' in 'flickr.photosets.getList'
Nov 9, 2014
14e0f6f
Fix failing test that relies on Flickr data
Nov 9, 2014
f13d22a
Fix failing test after API change
Nov 9, 2014
d2aab10
Ensure tests pass even if user doesn't have delete token
Nov 9, 2014
4c3b8ca
Update example in README to match code changes
Nov 9, 2014
bc2fcf7
Always set API key for unsigned requests
Nov 9, 2014
7f74bbc
Update due to API changes
Nov 9, 2014
fc69fc2
Ensure 'tokensecret' is set in example
Nov 9, 2014
c4d303f
Update version numbers in anticipation of a release
Nov 9, 2014
ef028ac
[maven-release-plugin] prepare release flickr4java-2.12
Nov 9, 2014
5836027
[maven-release-plugin] prepare for next development iteration
Nov 9, 2014
5d60207
tests
vishbin Dec 11, 2014
e9c4c5a
face tags
vishbin Jan 5, 2015
436cc05
Batch Upload tests
vishbin Oct 5, 2014
ec8f448
Tests
vishbin Nov 8, 2014
4178394
tests
vishbin Dec 11, 2014
302b0ab
face tags
vishbin Jan 5, 2015
dcbd98c
merge change from master
vishbin Jan 5, 2015
aac950a
face reco
vishbin Jan 5, 2015
7aee1ec
multi face photo reco
vishbin Jan 5, 2015
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
2 changes: 1 addition & 1 deletion Flickr4Java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'idea'
apply plugin: 'maven'
apply plugin: 'application'

version = '2.11'
version = '2.12'
group = 'com.flickr4java.flickr'

sourceCompatibility = '1.5'
Expand Down
2 changes: 1 addition & 1 deletion Flickr4Java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.flickr4java</groupId>
<artifactId>flickr4java</artifactId>
<version>2.12-SNAPSHOT</version>
<version>2.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>flickr4java</name>
<description>Java API For Flickr. Fork of FlickrJ.</description>
Expand Down
3 changes: 1 addition & 2 deletions Flickr4Java/src/examples/java/ActivityExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

import org.xml.sax.SAXException;

import javax.xml.parsers.ParserConfigurationException;

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
Expand Down Expand Up @@ -52,6 +50,7 @@ public ActivityExample() throws IOException {
Auth auth = new Auth();
auth.setPermission(Permission.READ);
auth.setToken(properties.getProperty("token"));
auth.setTokenSecret(properties.getProperty("tokensecret"));
requestContext.setAuth(auth);
Flickr.debugRequest = false;
Flickr.debugStream = false;
Expand Down
Loading