From 8d6ef9aa187d47a521c9145e894a3aaa7059c4fc Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <nmicoud@tgi.fr>
Date: Thu, 16 Jan 2020 10:32:01 +0100
Subject: [PATCH 1/2] IDEMPIERE-4148 : WAutoCompleterCity should retrieve only
 active cities

---
 .../src/org/adempiere/webui/window/WAutoCompleterCity.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
index cbd643df43..4f8505e74d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
@@ -42,7 +42,7 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 318310285903469314L;
+	private static final long serialVersionUID = -5130826429569842714L;
 
 	private static final int PopupDelayMillis = 500;
 
@@ -153,7 +153,7 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 				"SELECT cy.C_City_ID, cy.Name, cy.C_Region_ID, r.Name"
 				+" FROM C_City cy"
 				+" LEFT OUTER JOIN C_Region r ON (r.C_Region_ID=cy.C_Region_ID)"
-				+" WHERE cy.AD_Client_ID IN (0,?)");
+				+" WHERE cy.AD_Client_ID IN (0,?) AND cy.IsActive = 'Y'");
 		params.add(getAD_Client_ID());
 		if (getC_Region_ID() > 0)
 		{

From 0e8e4b6f1372636385283200eb678b4a98e320b8 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Thu, 16 Jan 2020 15:17:28 +0100
Subject: [PATCH 2/2] IDEMPIERE-4149 mvn verify broken because of changes in
 maven

---
 .../org.idempiere.maven.to.p2/pom.xml            |  8 ++++----
 org.idempiere.parent/pom.xml                     | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 28e790c502..fa4603d633 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -39,12 +39,12 @@
     <repositories>
         <repository>
             <id>orbit-photon-R20180531190352</id><!--only this repository have bakik 1.9-->
-            <url>http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository</url>
+            <url>https://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository</url>
             <layout>p2</layout>
         </repository>
         <repository>
 	        <id>org.jfree.chart</id>
-	        <url>http://nexus.orbisgis.org/content/repositories/osgi-maven</url>
+	        <url>https://nexus.orbisgis.org/content/repositories/osgi-maven</url>
         </repository>
         <repository>
 	        <id>jasperstudio-6.6.0</id>
@@ -53,11 +53,11 @@
         </repository>
         <repository>
             <id>zkoss</id>
-            <url>http://mavensync.zkoss.org/maven2</url>
+            <url>https://mavensync.zkoss.org/maven2</url>
         </repository>
         <repository>
 	        <id>restlet-maven</id>
-	        <url>http://maven.restlet.com</url>
+	        <url>https://maven.restlet.com</url>
         </repository>
     </repositories>
 
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index e4d1d552ba..f092030126 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -26,9 +26,9 @@
 		<maven-clean-plugin.version>2.5</maven-clean-plugin.version><!-- get from master, update when mave have update-->
 		<!-- default value of properties, use when run without profile -->
 		<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
-		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
+		<idempiere-equinox-url>https://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
 		<idempiere-equinox-repository-id>eclipse-photon-201810</idempiere-equinox-repository-id>
-		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository</idempiere-orbit-url>
+		<idempiere-orbit-url>https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository</idempiere-orbit-url>
 		<idempiere-orbit-repository-id>orbit-photon-R20181128170323</idempiere-orbit-repository-id>
 		<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
 		<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
@@ -464,7 +464,7 @@
             <repositories>
 	            <repository>
 		            <id>Central</id>
-		            <url>http://central.maven.org/maven2</url>
+		            <url>https://repo1.maven.org/maven2</url>
 	            </repository>
 
 	            <repository>
@@ -474,7 +474,7 @@
 
 	            <repository>
 		            <id>OpenNMS</id>
-		            <url>http://repo.opennms.org/maven2</url>
+		            <url>https://repo.opennms.org/maven2</url>
 	            </repository>
 
 	            <repository>
@@ -489,12 +489,12 @@
 
 	            <repository>
 		            <id>NetBeans</id>
-		            <url>http://bits.netbeans.org/maven2</url>
+		            <url>https://bits.netbeans.org/maven2</url>
 	            </repository>
 
 	            <repository>
 		            <id>Clojars</id>
-		            <url>http://clojars.org/repo</url>
+		            <url>https://clojars.org/repo</url>
 	            </repository>
 
 	            <repository>
@@ -504,12 +504,12 @@
 
 	            <repository>
 		            <id>zkoss</id>
-		            <url>http://mavensync.zkoss.org/maven2</url>
+		            <url>https://mavensync.zkoss.org/maven2</url>
 	            </repository>
 
 	            <repository>
 		            <id>jenkins</id>
-		            <url>http://repo.jenkins-ci.org/releases</url>
+		            <url>https://repo.jenkins-ci.org/releases</url>
 	            </repository>
             </repositories>
             <build>