Skip to content
This repository was archived by the owner on Aug 28, 2025. It is now read-only.

Commit 551ddd7

Browse files
authored
Merge pull request #15 from upwork/dev-pr13
Merge modified pr13
2 parents a4686f3 + 34e2f71 commit 551ddd7

File tree

6 files changed

+23
-40
lines changed

6 files changed

+23
-40
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#maven
2+
target/
3+
4+
#IDEs
5+
.idea/
6+
*.iml
7+
.project
8+
.classpath
9+
10+
#example build
11+
example/src/*.class

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
language: java
22
install: mvn install -DskipTests=true -Dgpg.skip=true
33
jdk:
4+
- oraclejdk8
45
- oraclejdk7
56
- openjdk7
67
- openjdk6
78
script:
89
- ant test
910
matrix:
1011
allow_failures:
12+
- jdk: oraclejdk7
1113
- jdk: openjdk6
1214
fast_finish: true
1315
notifications:

example/.classpath

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

example/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
1. Download signpost from https://code.google.com/p/oauth-signpost/downloads/list (both core and commonhttp)
2-
2. Download HttpClient from http://hc.apache.org/httpclient-3.x/
2+
2. Download HttpClient 4 from http://hc.apache.org/
33
3. Download org.json from http://www.java2s.com/Code/Jar/j/Downloadjavajsonjar.htm
44
4. Link external jars
5-
- signpost-core-VERSION.jar,
6-
- signpost-commonhttp-VERSION.jar
7-
- httpcore-VERSION.jar,
8-
- httpclient-VERSION.jar,
9-
- commons-codec-VERSION.jar,
10-
- commons-logging-VERSION.jar,
11-
- java-json.jar
5+
- signpost-core-VERSION.jar,
6+
- signpost-commonhttp-VERSION.jar
7+
- httpcore-VERSION.jar,
8+
- httpclient-VERSION.jar,
9+
- commons-codec-VERSION.jar,
10+
- commons-logging-VERSION.jar,
11+
- java-json.jar
1212
5. Finally link java-upwork.jar to your project.
1313
6. Create upwork.properties and set up your key/secret; by default OAuthClient reads data from it.
1414
You can also overwrite super class Config and use your own as a parameter for OAuthClient constructor,
@@ -18,5 +18,5 @@ in that way, keys can be stored elsewhere.
1818
Some steps from the above are automated already in the `Makefile`, so to run the `TestApi.java`
1919
example app you can just use:
2020

21-
make
22-
make run
21+
make
22+
make run

lib/java-upwork.jar

45.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)