block swagger access

remove swagger access to mitigate

Change-Id: Ia95eb39f3d5f763d754c6957e40e0224e2423ed7
Issue-ID: SDC-1913
Signed-off-by: Michael Lando <michael.lando@intl.att.com>

diff --git a/.gitreview b/.gitreview
index d7a0930..1ea97a0 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
 host=gerrit.onap.org
 port=29418
-project=sdc.git
\ No newline at end of file
+project=sdc.git
+defaultbranch=casablanca
\ No newline at end of file

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 3d32633..955d8c1 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -578,12 +578,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>2.4.8</version>
-        </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
@@ -616,7 +610,6 @@
                     <webResources>
                         <resource>
                             <directory>src/main/resources</directory>
-                            <directory>src/main/resources/swagger</directory>
                         </resource>
                     </webResources>
                     <attachClasses>true</attachClasses>

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 027601b..26f707d 100644 (file)
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -8,11 +8,11 @@
                <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
                <init-param>
                        <param-name>jersey.config.server.provider.packages</param-name>
-                       <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value>
+                       <param-value>org.openecomp.sdc.be.servlets</param-value>
                </init-param>
                <init-param>
                        <param-name>jersey.config.server.provider.classnames</param-name>
-                       <param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
+                       <param-value>
                 org.glassfish.jersey.media.multipart.MultiPartFeature,
                 org.openecomp.sdc.be.filters.BeServletFilter,
                 org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter,
@@ -23,14 +23,14 @@
             </param-value>
 
                </init-param>
-               <init-param>
-                       <param-name>swagger.scanner.id</param-name>
-                       <param-value>test.1</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>swagger.config.id</param-name>
-                       <param-value>test.1</param-value>
-               </init-param>
+               <!--<init-param>-->
+                       <!--<param-name>swagger.scanner.id</param-name>-->
+                       <!--<param-value>test.1</param-value>-->
+               <!--</init-param>-->
+               <!--<init-param>-->
+                       <!--<param-name>swagger.config.id</param-name>-->
+                       <!--<param-value>test.1</param-value>-->
+               <!--</init-param>-->
                <load-on-startup>1</load-on-startup>
        </servlet>
        
@@ -88,38 +88,38 @@
                <url-pattern>/sdc/*</url-pattern>
        </servlet-mapping>
 
-       <servlet>
-               <servlet-name>Internal-APIs-Configurations</servlet-name>
-               <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
-               
-               <init-param>
-                       <param-name>api.version</param-name>
-                       <param-value>1.2.0</param-value>
-               </init-param>
-               
-               <init-param>
-                       <param-name>swagger.api.title</param-name>
-                       <param-value>Internal API's</param-value>
-               </init-param>
-               
-               <init-param>
-                       <param-name>swagger.api.basepath</param-name>
-                       <param-value>/sdc2/rest</param-value>
-               </init-param>
-               
-               <init-param>
-                       <param-name>swagger.scanner.id</param-name>
-                       <param-value>test.1</param-value>
-               </init-param>
+       <!--<servlet>-->
+               <!--<servlet-name>Internal-APIs-Configurations</servlet-name>-->
+               <!--<servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>-->
+               <!---->
+               <!--<init-param>-->
+                       <!--<param-name>api.version</param-name>-->
+                       <!--<param-value>1.2.0</param-value>-->
+               <!--</init-param>-->
+               <!---->
+               <!--<init-param>-->
+                       <!--<param-name>swagger.api.title</param-name>-->
+                       <!--<param-value>Internal API's</param-value>-->
+               <!--</init-param>-->
+               <!---->
+               <!--<init-param>-->
+                       <!--<param-name>swagger.api.basepath</param-name>-->
+                       <!--<param-value>/sdc2/rest</param-value>-->
+               <!--</init-param>-->
+               <!---->
+               <!--<init-param>-->
+                       <!--<param-name>swagger.scanner.id</param-name>-->
+                       <!--<param-value>test.1</param-value>-->
+               <!--</init-param>-->
 
-               <init-param>
-                       <param-name>swagger.config.id</param-name>
-                       <param-value>test.1</param-value>
-               </init-param>
-               
-               <load-on-startup>2</load-on-startup>
-               <async-supported>true</async-supported>
-       </servlet>
+               <!--<init-param>-->
+                       <!--<param-name>swagger.config.id</param-name>-->
+                       <!--<param-value>test.1</param-value>-->
+               <!--</init-param>-->
+               <!---->
+               <!--<load-on-startup>2</load-on-startup>-->
+               <!--<async-supported>true</async-supported>-->
+       <!--</servlet>-->
        
        <servlet>
                <servlet-name>External and Distribution API's</servlet-name>

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index f49b284..1b25f36 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -6,7 +6,7 @@ COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
 
 ADD onboarding-be-*.war    ${JETTY_BASE}/webapps/
 
-ADD api-docs.war           ${JETTY_BASE}/webapps/
+#ADD api-docs.war           ${JETTY_BASE}/webapps/
 
 USER root