Upgrade osgi example

Author: oliemansm

examples/osgi/apache-karaf-feature/pom.xml

@@ -14,7 +14,7 @@
         </configuration>
         <extensions>true</extensions>
         <groupId>org.apache.karaf.tooling</groupId>
-        <version>4.0.8</version>
+        <version>4.2.10</version>
       </plugin>
 
       <plugin>
@@ -108,7 +108,7 @@
   <parent>
     <artifactId>graphql-java-servlet-osgi-examples</artifactId>
     <groupId>com.graphql-java-kickstart</groupId>
-    <version>7.3.4-SNAPSHOT</version>
+    <version>10.1.0</version>
   </parent>
 
   <properties>

examples/osgi/apache-karaf-package/pom.xml

@@ -110,6 +110,6 @@
   <parent>
     <artifactId>graphql-java-servlet-osgi-examples</artifactId>
     <groupId>com.graphql-java-kickstart</groupId>
-    <version>7.3.4-SNAPSHOT</version>
+    <version>10.1.0</version>
   </parent>
 </project>

examples/osgi/buildAndRun.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 mvn clean install
-pushd apache-karaf-package/target
-tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT.tar.gz
-cd graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT/bin
+pushd apache-karaf-package/target || exit 1
+tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-10.1.0.tar.gz
+cd graphql-java-servlet-osgi-examples-apache-karaf-package-10.1.0/bin || exit 1
 ./karaf debug
-popd
+popd || exit 1

examples/osgi/pom.xml

@@ -14,11 +14,13 @@
   <packaging>pom</packaging>
 
   <properties>
-    <graphql.java.servlet.version>7.3.4-SNAPSHOT</graphql.java.servlet.version>
-    <graphql.java.version>11.0</graphql.java.version>
-    <karaf.version>4.2.4</karaf.version>
+    <graphql.java.servlet.version>11.0.0-SNAPSHOT</graphql.java.servlet.version>
+    <graphql.java.version>16.1</graphql.java.version>
+    <karaf.version>4.2.10</karaf.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
-  <version>7.3.4-SNAPSHOT</version>
+  <version>10.1.0</version>
 
 </project>

examples/osgi/providers/pom.xml

@@ -8,8 +8,6 @@
       <plugin>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-          <instructions>
-          </instructions>
         </configuration>
         <extensions>true</extensions>
         <groupId>org.apache.felix</groupId>
@@ -51,7 +49,7 @@
   <parent>
     <artifactId>graphql-java-servlet-osgi-examples</artifactId>
     <groupId>com.graphql-java-kickstart</groupId>
-    <version>7.3.4-SNAPSHOT</version>
+    <version>10.1.0</version>
   </parent>
 
 </project>

examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java

@@ -1,10 +1,10 @@
-package graphql.kickstart.servlet.examples.osgi;
+package graphql.servlet.examples.osgi;
 
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLType;
-import graphql.servlet.GraphQLMutationProvider;
-import graphql.servlet.GraphQLQueryProvider;
-import graphql.servlet.GraphQLTypesProvider;
+import graphql.kickstart.servlet.osgi.GraphQLMutationProvider;
+import graphql.kickstart.servlet.osgi.GraphQLQueryProvider;
+import graphql.kickstart.servlet.osgi.GraphQLTypesProvider;
 import org.osgi.service.component.annotations.Component;
 
 import java.util.ArrayList;
@@ -38,8 +38,6 @@ public Collection<GraphQLFieldDefinition> getMutations() {
   }
 
   public Collection<GraphQLType> getTypes() {
-
-    List<GraphQLType> types = new ArrayList<GraphQLType>();
-    return types;
+    return new ArrayList<GraphQLType>();
   }
 }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java

@@ -52,7 +52,8 @@
 
 @Component(
     service = {javax.servlet.http.HttpServlet.class, javax.servlet.Servlet.class},
-    property = {"service.description=GraphQL HTTP Servlet"}
+    property = {"alias=/graphql", "service.description=GraphQL HTTP Servlet"},
+    immediate = true
 )
 @Designate(ocd = OsgiGraphQLHttpServletConfiguration.class, factory = true)
 public class OsgiGraphQLHttpServlet extends AbstractGraphQLHttpServlet {