INT-406 Remove Load As OSS Override (#17)

* INT-406 Remove Load As OSS Override * INT-406 Newline at EOF
sonatype · Nov 28, 2017 · c2a02ed · c2a02ed
1 parent a1dc77e
commit c2a02ed
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 .idea
+<<<<<<< HEAD
 .kitchen
+=======
+>>>>>>> INT-406 Newline at EOF
+.DS_Store
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -44,7 +44,6 @@ suites:
           application_port: 8082
           application_host: 127.0.0.1
           context_path: "/test-context"
-          load_as_oss: false
           clustered: true
           license_file: "/opt/sonatype/license.lic"
   - name: multicast_enabled

diff --git a/.kitchen.yml.erb b/.kitchen.yml.erb
@@ -54,7 +54,6 @@ suites:
           application_port: 8082
           application_host: 127.0.0.1
           context_path: "/test-context"
-          load_as_oss: false
           clustered: true
           license_file: "/opt/sonatype/license.lic"
   - name: multicast_enabled

diff --git a/attributes/nexus_properties.rb b/attributes/nexus_properties.rb
@@ -3,5 +3,4 @@
 
 # Copyright:: Copyright (c) 2017-present Sonatype, Inc. Apache License, Version 2.0.
 
-default['nexus_repository_manager']['properties']['load_as_oss'] = true
 default['nexus_repository_manager']['properties']['clustered'] = false
diff --git a/templates/nexus.properties.erb b/templates/nexus.properties.erb
@@ -8,7 +8,6 @@ nexus-context-path=<%= node['nexus_repository_manager']['properties']['context_p
 nexus-edition=nexus-pro-edition
 nexus-features=\
  nexus-pro-feature
-nexus.loadAsOSS=<%= node['nexus_repository_manager']['properties']['load_as_oss'] %>
 nexus.clustered=<%= node['nexus_repository_manager']['properties']['clustered'] %>
 <% if node['nexus_repository_manager']['properties']['license_file'] %>
 nexus.licenseFile=<%= node['nexus_repository_manager']['properties']['license_file'] %>

diff --git a/test/smoke/default/configure_test.rb b/test/smoke/default/configure_test.rb
@@ -82,10 +82,6 @@
     its('content') { should include 'nexus-context-path=/' }
   end
 
-  context 'when nexus_loadAsOSS is default' do
-    its('content') { should include 'nexus.loadAsOSS=true' }
-  end
-
   context 'when nexus_clustered is default' do
     its('content') { should include 'nexus.clustered=false' }
   end

diff --git a/test/smoke/nexus_properties_configured/configure_test.rb b/test/smoke/nexus_properties_configured/configure_test.rb
@@ -21,10 +21,6 @@
     its('content') { should include 'nexus-context-path=/test-context' }
   end
 
-  context 'when nexus_loadAsOSS is true' do
-    its('content') { should include 'nexus.loadAsOSS=false' }
-  end
-
   context 'when nexus_clustered is true' do
     its('content') { should include 'nexus.clustered=true' }
   end