Skip to content

Update OSGi example project #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 21, 2019
Merged

Update OSGi example project #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97545a5
Revert change to OSGi R6 Property back to a property compatible with …
sergehuber Apr 24, 2017
5df91ac
Add ignore for Maven target directories
sergehuber Apr 24, 2017
7d98b41
Merge remote-tracking branch 'upstream/master'
sergehuber Apr 18, 2019
2d89c92
Update Example to latest versions
sergehuber Apr 18, 2019
1af7a9b
- Update Karaf to latest stable version (4.2.4)
sergehuber Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/osgi/apache-karaf-feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi/apache-karaf-package/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -112,4 +112,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
6 changes: 3 additions & 3 deletions examples/osgi/buildAndRun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions examples/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi/providers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -54,4 +54,4 @@
</plugins>
</build>

</project>
</project>
1 change: 1 addition & 0 deletions ...es/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down