Skip to content

Commit 9b63460

Browse files
committed
Drop apache-http
Signed-off-by: Taylor Smock <tsmock@meta.com>
1 parent aed53f4 commit 9b63460

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

build.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
</target>
2626
<fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
2727
<include name="apache-commons.jar"/>
28-
<include name="apache-http.jar"/>
2928
</fileset>
3029
<target name="mapillary_secrets">
3130
<property environment="env"/>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugin.main.version=18291
1212
# If not, choose the next higher number that is available, or the gradle build will break.
1313
plugin.compile.version=18531
1414
# The datepicker plugin is currently in the source tree. TODO fix
15-
plugin.requires=apache-commons;apache-http
15+
plugin.requires=apache-commons
1616

1717
# Character encoding of Gradle files
1818
systemProp.file.encoding=utf-8

src/main/java/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import javax.json.JsonStructure;
2525
import javax.swing.JOptionPane;
2626

27-
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
2827
import org.openstreetmap.josm.gui.Notification;
2928
import org.openstreetmap.josm.gui.util.GuiHelper;
3029
import org.openstreetmap.josm.io.CachedFile;
@@ -161,18 +160,6 @@ public static HttpClient addAuthenticationHeader(HttpClient client) {
161160
return client.setHeader(AUTHORIZATION, getAuthorizationToken());
162161
}
163162

164-
/**
165-
* Returns a HttpEntity with an authorization header for use when making user
166-
* specific API calls
167-
*
168-
* @param httpEntity The HttpEntity to add authentication headers to
169-
* @return The HttpEntity for easy chaining
170-
*/
171-
public static HttpEntityEnclosingRequestBase addAuthenticationHeader(HttpEntityEnclosingRequestBase httpEntity) {
172-
httpEntity.addHeader(AUTHORIZATION, getAuthorizationToken());
173-
return httpEntity;
174-
}
175-
176163
/**
177164
* Get an authorization token
178165
*

0 commit comments

Comments
 (0)