- jaxb-runtime to use latest version to avoid maven pulling random jaxb-runtime version for ehcache.

- Compare basic auth and ssl passwords if system property is set with com.axway.apimanager.api.model.disable.confidential.fields=false

Author: rathnapandi

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAdapter.java

@@ -413,11 +413,13 @@ public void addQuotaConfiguration(API api, boolean addQuota) throws AppException
     }
 
     public void translateMethodIdsToName(APIQuota apiQuota, String apiId) throws AppException {
-        if(apiQuota != null) {
+        if (apiQuota != null) {
             APIManagerAPIMethodAdapter methodAdapter = APIManagerAdapter.getInstance().getMethodAdapter();
             List<QuotaRestriction> quotaRestrictions = apiQuota.getRestrictions();
             for (QuotaRestriction quotaRestriction : quotaRestrictions) {
-                quotaRestriction.setMethod(methodAdapter.getMethodForId(apiId, quotaRestriction.getApiId()).getName());
+                APIMethod apiMethod = methodAdapter.getMethodForId(apiId, quotaRestriction.getApiId());
+                if (apiMethod != null)
+                    quotaRestriction.setMethod(apiMethod.getName());
             }
         }
     }

pom.xml

@@ -239,10 +239,11 @@
                 </exclusions>
             </dependency>
             <!-- used by ehcache to read xml configuration-->
+
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
-                <version>4.0.5</version>
+                <version>2.3.9</version>
             </dependency>
             <!-- Used by olingo -->
             <dependency>