Merge branch '3.x'

nebhale · nebhale · commit e44688498bbc · 2017-06-20T09:42:55.000-07:00
diff --git a/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb b/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb
@@ -31,7 +31,7 @@ def compile
         setup_ext_dir
 
         @droplet.copy_resources
-        @droplet.security_providers.insert 2, 'com.dyadicsec.provider.DYCryptoProvider'
+        @droplet.security_providers << 'com.dyadicsec.provider.DYCryptoProvider'
 
         credentials = @application.services.find_service(FILTER)['credentials']
         write_key credentials['key']
diff --git a/lib/java_buildpack/framework/luna_security_provider.rb b/lib/java_buildpack/framework/luna_security_provider.rb
@@ -31,7 +31,7 @@ def compile
         setup_ext_dir
 
         @droplet.copy_resources
-        @droplet.security_providers.insert 2, 'com.safenetinc.luna.provider.LunaProvider'
+        @droplet.security_providers << 'com.safenetinc.luna.provider.LunaProvider'
 
         credentials = @application.services.find_service(FILTER)['credentials']
         write_client credentials['client']
diff --git a/lib/java_buildpack/framework/protect_app_security_provider.rb b/lib/java_buildpack/framework/protect_app_security_provider.rb
@@ -32,7 +32,7 @@ def compile
         download_zip false
 
         @droplet.copy_resources
-        @droplet.security_providers.insert 2, 'com.ingrian.security.nae.IngrianProvider'
+        @droplet.security_providers << 'com.ingrian.security.nae.IngrianProvider'
 
         credentials = @application.services.find_service(FILTER)['credentials']
 
diff --git a/spec/java_buildpack/framework/container_security_provider_spec.rb b/spec/java_buildpack/framework/container_security_provider_spec.rb
@@ -34,7 +34,7 @@
      cache_fixture: 'stub-container-security-provider.jar' do
 
     component.compile
-    expect(security_providers).to include('org.cloudfoundry.security.CloudFoundryContainerProvider')
+    expect(security_providers[1]).to eq('org.cloudfoundry.security.CloudFoundryContainerProvider')
   end
 
 end
diff --git a/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb b/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb
@@ -91,7 +91,7 @@
 
       component.compile
 
-      expect(security_providers).to include('com.dyadicsec.provider.DYCryptoProvider')
+      expect(security_providers.last).to eq('com.dyadicsec.provider.DYCryptoProvider')
     end
 
     it 'adds extension directory' do
diff --git a/spec/java_buildpack/framework/luna_security_provider_spec.rb b/spec/java_buildpack/framework/luna_security_provider_spec.rb
@@ -115,7 +115,7 @@
        cache_fixture: 'stub-luna-security-provider.tar' do
 
       component.compile
-      expect(security_providers).to include('com.safenetinc.luna.provider.LunaProvider')
+      expect(security_providers.last).to eq('com.safenetinc.luna.provider.LunaProvider')
     end
 
     it 'adds extension directory' do
diff --git a/spec/java_buildpack/framework/protect_app_security_provider_spec.rb b/spec/java_buildpack/framework/protect_app_security_provider_spec.rb
@@ -74,7 +74,7 @@
 
       component.compile
 
-      expect(security_providers).to include('com.ingrian.security.nae.IngrianProvider')
+      expect(security_providers.last).to eq('com.ingrian.security.nae.IngrianProvider')
     end
 
     it 'copies resources',
