From 97545a5cb9837884e44cf21b069b92c4bc84de96 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Mon, 24 Apr 2017 21:35:56 +0200 Subject: [PATCH 1/2] Revert change to OSGi R6 Property back to a property compatible with older OSGi containers --- src/main/java/graphql/servlet/OsgiGraphQLServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/graphql/servlet/OsgiGraphQLServlet.java b/src/main/java/graphql/servlet/OsgiGraphQLServlet.java index 880add24..6e5e6762 100644 --- a/src/main/java/graphql/servlet/OsgiGraphQLServlet.java +++ b/src/main/java/graphql/servlet/OsgiGraphQLServlet.java @@ -38,7 +38,7 @@ @Component( service={javax.servlet.http.HttpServlet.class,javax.servlet.Servlet.class}, - property = {"osgi.http.whiteboard.servlet.pattern=/graphql/*", "jmx.objectname=graphql.servlet:type=graphql"} + property = {"alias=/graphql", "jmx.objectname=graphql.servlet:type=graphql"} ) public class OsgiGraphQLServlet extends GraphQLServlet { From 5df91ac728f0b8308cbaf2034b87e13c656f5a25 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Mon, 24 Apr 2017 21:54:38 +0200 Subject: [PATCH 2/2] Add ignore for Maven target directories --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 36bc517d..beeb3bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build *.iml *.ipr *.iws -.idea/ \ No newline at end of file +.idea/ +target