Merge pull request #166 from sergehuber/master

Update OSGi example project

Author: oliemansm

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-apache-karaf-package</artifactId>
@@ -112,4 +112,4 @@
 			</plugin>
 		</plugins>
     </build>
-</project>
+</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-3.0.1.tar.gz
-cd graphql-java-servlet-osgi-examples-apache-karaf-package-3.0.1/bin
+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
 ./karaf debug
-popd
+popd

examples/osgi/pom.xml

@@ -6,13 +6,13 @@
 
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>7.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <karaf.version>4.1.6</karaf.version>
-        <graphql.java.servlet.version>6.2.1-SNAPSHOT</graphql.java.servlet.version>
-        <graphql.java.version>10.0</graphql.java.version>
+        <karaf.version>4.2.4</karaf.version>
+        <graphql.java.servlet.version>7.3.4-SNAPSHOT</graphql.java.servlet.version>
+        <graphql.java.version>11.0</graphql.java.version>
     </properties>
 
     <modules>

examples/osgi/providers/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-servlet-osgi-examples</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>7.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
@@ -54,4 +54,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

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

@@ -25,6 +25,7 @@ public Collection<GraphQLFieldDefinition> getQueries() {
         fieldDefinitions.add(newFieldDefinition()
                 .type(GraphQLString)
                 .name("hello")
+                .description("Basic example of a GraphQL Java Servlet provider using the Apache Karaf OSGi Runtime")
                 .staticValue("world")
                 .build());
         return fieldDefinitions;