Merge branch 'master' into PAYARA-2548-Implement-OpenAPI-1.0-REBASE

payara · May 30, 2018 · c6ee4ca · c6ee4ca
2 parents b949344 + 7c35987
commit c6ee4ca
Show file tree

Hide file tree

Showing 135 changed files with 7,107 additions and 1,496 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ appserver/packager/pkg_conf.py
 target/
 *~
 *.iml
+*nbactions.xml
 .vscode/
 .idea
 gfbuild.log
@@ -22,4 +23,4 @@ nb-configuration.xml
 /nucleus/payara-modules/nucleus-microprofile/config-service/nbproject/
 appserver/extras/arquillian-containers/payara-common/dependency-reduced-pom.xml
 /nucleus/payara-modules/service-exemplar/nbproject/
-/nucleus/admin/server-mgmt/nbproject/
+/nucleus/admin/server-mgmt/nbproject/
diff --git a/api/payara-api/pom.xml b/api/payara-api/pom.xml
@@ -147,7 +147,7 @@
                                     fish.payara.notification.eventbus,
                                     fish.payara.notification.healthcheck,
                                     fish.payara.notification.requesttracing,
-                                    fish.payara.security.oauth2.annotation,
+                                    fish.payara.security.annotations,
                                     fish.payara.security.oauth2.api
                                 </Export-Package>
                             </instructions>
@@ -175,5 +175,12 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-api</artifactId>
+            <version>${opentracing.version}</version>
+            <optional>true</optional>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>