Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java	(revision 34196)
@@ -34,8 +34,8 @@
 
     public static final String PREF_OAPI = "opendata.oapi";
-    public static final String DEFAULT_OAPI = "http://www.overpass-api.de/api/interpreter?";
+    public static final String DEFAULT_OAPI = "https://www.overpass-api.de/api/interpreter?";
 
     public static final String PREF_XAPI = "opendata.xapi";
-    public static final String DEFAULT_XAPI = "http://www.overpass-api.de/api/xapi?";
+    public static final String DEFAULT_XAPI = "https://www.overpass-api.de/api/xapi?";
 
     public static final String PREF_RAWDATA = "opendata.rawdata";
@@ -50,5 +50,5 @@
     public static final String PREF_MODULES = "opendata.modules";
     public static final String PREF_MODULES_SITES = "opendata.modules.sites";
-    public static final String OSM_SITE = "http://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/";
+    public static final String OSM_SITE = "https://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/";
     public static final String[] DEFAULT_MODULE_SITES = {OSM_SITE + "modules.txt%<?modules=>"};
 
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java	(revision 34196)
@@ -9,5 +9,5 @@
      * Portal
      */
-    String BELGIAN_PORTAL = "http://data.gov.be/"+OdConstants.PATTERN_LANG+"/dataset/";
+    String BELGIAN_PORTAL = "https://data.gov.be/"+OdConstants.PATTERN_LANG+"/dataset/";
 
     /**
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java	(revision 34196)
@@ -7,5 +7,5 @@
      * Portal
      */
-    String FRENCH_PORTAL = "http://www.data.gouv.fr/";
+    String FRENCH_PORTAL = "https://www.data.gouv.fr/";
 
     /**
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java	(revision 34196)
@@ -12,8 +12,8 @@
 /**
  * An InputStreamReader that only consumes as many bytes as is necessary.
- * It does not do any read-ahead. From http://stackoverflow.com/q/2631507/2257172
+ * It does not do any read-ahead. From https://stackoverflow.com/q/2631507/2257172
  */
 public class InputStreamReaderUnbuffered extends Reader {
-    
+
     private final CharsetDecoder charsetDecoder;
     private final InputStream inputStream;
@@ -59,4 +59,5 @@
     }
 
+    @Override
     public int read(char[] cbuf, int off, int len) throws IOException {
         for (int i = 0; i < len; i++) {
@@ -72,4 +73,5 @@
     }
 
+    @Override
     public void close() throws IOException {
         inputStream.close();
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java	(revision 34196)
@@ -188,5 +188,5 @@
                 } else {
                     String path = file.getAbsolutePath();
-                    // See http://gis.stackexchange.com/a/3663/17245
+                    // See https://gis.stackexchange.com/a/3663/17245
                     path = path.substring(0, path.lastIndexOf('.')) + ".cpg";
                     Path cpg = new File(path).toPath();
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java	(revision 34196)
@@ -6,7 +6,7 @@
 
 public class LOOL extends License {
-    
-    //public static final String URL_FR = "http://www.data.gouv.fr/Licence-Ouverte-Open-Licence";
-    
+
+    //public static final String URL_FR = "https://www.etalab.gouv.fr/licence-ouverte-open-licence";
+
     public LOOL() {
         setIcon(OdUtils.getImageIcon(OdConstants.ICON_LOOL_48, true));
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java	(revision 34196)
@@ -5,10 +5,10 @@
 
 public class ODbL extends License {
-    
-    //public static final String URL            = "http://opendatacommons.org/licenses/odbl/1-0";
-    //public static final String SUMMARY_URL    = "http://opendatacommons.org/licenses/odbl/summary";
-    //public static final String URL_FR         = "http://vvlibri.org/fr/licence/odbl/10/fr/legalcode#La_Licence_ODbL";
+
+    //public static final String URL            = "https://opendatacommons.org/licenses/odbl/1-0";
+    //public static final String SUMMARY_URL    = "https://opendatacommons.org/licenses/odbl/summary";
+    //public static final String URL_FR         = "https://vvlibri.org/fr/licence/odbl-10/legalcode/unofficial";
     //public static final String SUMMARY_URL_FR = "http://vvlibri.org/fr/licence/odbl/10/fr";
-    
+
     public ODbL() {
         for (String lang : new String[]{"", "fr"}) {
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java	(revision 34196)
@@ -16,5 +16,5 @@
  * A parser for the module list provided by an opendata Module Download Site.
  *
- * See <a href="http://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a>
+ * See <a href="https://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a>
  * for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style
  * name/value-pairs.
@@ -49,5 +49,5 @@
      * Parses a module information document and replies a list of module information objects.
      *
-     * See <a href="http://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a>
+     * See <a href="https://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a>
      * for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style
      * name/value-pairs.
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java	(revision 34195)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java	(revision 34196)
@@ -32,5 +32,5 @@
  *   <li>.jar.new-files, assuming that these are downloaded but not yet installed modules</li>
  *   <li>cached lists of available modules, downloaded for instance from
- *   <a href="http://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a></li>
+ *   <a href="https://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/modules.txt">OSM SVN</a></li>
  * </ul>
  */