Skip to content

Commit 87f2101

Browse files
oliemansmoliemansm
committed
Reformat code according to Google Code Style
1 parent 01ef2fe commit 87f2101

File tree

114 files changed

+1996
-1745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1996
-1745
lines changed

‎.github/workflows/pull-request.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-latest, macos-latest, windows-latest]
21-
java: [8, 11, 15]
20+
os: [ ubuntu-latest, macos-latest, windows-latest ]
21+
java: [ 8, 11, 15 ]
2222
needs: validation
2323
runs-on: ${{ matrix.os }}
2424
steps:

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "Publish release"
2-
on: [workflow_dispatch]
2+
on: [ workflow_dispatch ]
33

44
jobs:
55
validation:

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ subprojects {
151151
it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
152152
dep.name == it.artifactId.text()
153153
}
154-
}.each { it.scope*.value = 'compile'}
154+
}.each { it.scope*.value = 'compile' }
155155
}
156156
}
157157
}

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

+106-107
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,118 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<groupId>com.graphql-java-kickstart</groupId>
8-
<artifactId>graphql-java-servlet-osgi-examples</artifactId>
9-
<version>7.3.4-SNAPSHOT</version>
10-
</parent>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
6+
<build>
7+
<plugins>
8+
<plugin>
9+
<artifactId>karaf-maven-plugin</artifactId>
10+
<configuration>
11+
<addTransitiveFeatures>true</addTransitiveFeatures>
12+
<includeTransitiveDependency>true</includeTransitiveDependency>
13+
<startLevel>80</startLevel>
14+
</configuration>
15+
<extensions>true</extensions>
16+
<groupId>org.apache.karaf.tooling</groupId>
17+
<version>4.0.8</version>
18+
</plugin>
1119

12-
<artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
13-
<packaging>feature</packaging>
20+
<plugin>
21+
<artifactId>maven-install-plugin</artifactId>
22+
<groupId>org.apache.maven.plugins</groupId>
23+
<version>2.5.2</version>
24+
</plugin>
25+
<plugin>
26+
<artifactId>maven-deploy-plugin</artifactId>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<version>2.8.2</version>
29+
</plugin>
30+
</plugins>
1431

15-
<properties>
16-
<jackson.version>2.10.0.pr1</jackson.version>
17-
</properties>
32+
</build>
1833

34+
<dependencies>
35+
<dependency>
36+
<artifactId>jackson-core</artifactId>
37+
<groupId>com.fasterxml.jackson.core</groupId>
38+
<version>${jackson.version}</version>
39+
</dependency>
40+
<dependency>
41+
<artifactId>jackson-annotations</artifactId>
42+
<groupId>com.fasterxml.jackson.core</groupId>
43+
<version>${jackson.version}</version>
44+
</dependency>
45+
<dependency>
46+
<artifactId>jackson-databind</artifactId>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<version>${jackson.version}</version>
49+
</dependency>
50+
<dependency>
51+
<artifactId>jackson-datatype-jdk8</artifactId>
52+
<groupId>com.fasterxml.jackson.datatype</groupId>
53+
<version>${jackson.version}</version>
54+
</dependency>
55+
<dependency>
56+
<artifactId>guava</artifactId>
57+
<groupId>com.google.guava</groupId>
58+
<version>[24.1.1,)</version>
59+
</dependency>
60+
<dependency>
61+
<artifactId>commons-fileupload</artifactId>
62+
<groupId>commons-fileupload</groupId>
63+
<version>[1.3.3,)</version>
64+
</dependency>
65+
<dependency>
66+
<artifactId>antlr4-runtime</artifactId>
67+
<groupId>org.antlr</groupId>
68+
<version>4.7.1</version>
69+
</dependency>
1970

71+
<dependency>
72+
<artifactId>graphql-java-servlet</artifactId>
73+
<groupId>com.graphql-java-kickstart</groupId>
74+
<version>${graphql.java.servlet.version}</version>
75+
</dependency>
76+
<dependency>
77+
<artifactId>graphql-java</artifactId>
78+
<groupId>com.graphql-java</groupId>
79+
<version>${graphql.java.version}</version>
80+
</dependency>
81+
<dependency>
82+
<artifactId>graphql-java-annotations</artifactId>
83+
<groupId>com.graphql-java</groupId>
84+
<version>0.13.1</version>
85+
</dependency>
2086

21-
<dependencies>
22-
<dependency>
23-
<groupId>com.fasterxml.jackson.core</groupId>
24-
<artifactId>jackson-core</artifactId>
25-
<version>${jackson.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>com.fasterxml.jackson.core</groupId>
29-
<artifactId>jackson-annotations</artifactId>
30-
<version>${jackson.version}</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
34-
<artifactId>jackson-databind</artifactId>
35-
<version>${jackson.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>com.fasterxml.jackson.datatype</groupId>
39-
<artifactId>jackson-datatype-jdk8</artifactId>
40-
<version>${jackson.version}</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>com.google.guava</groupId>
44-
<artifactId>guava</artifactId>
45-
<version>[24.1.1,)</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>commons-fileupload</groupId>
49-
<artifactId>commons-fileupload</artifactId>
50-
<version>[1.3.3,)</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.antlr</groupId>
54-
<artifactId>antlr4-runtime</artifactId>
55-
<version>4.7.1</version>
56-
</dependency>
87+
<dependency>
88+
<artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
89+
<groupId>com.graphql-java-kickstart</groupId>
90+
<version>${project.version}</version>
91+
</dependency>
92+
<dependency>
93+
<artifactId>slf4j-api</artifactId>
94+
<groupId>org.slf4j</groupId>
95+
<version>1.7.25</version>
96+
</dependency>
97+
<dependency>
98+
<artifactId>slf4j-log4j12</artifactId>
99+
<groupId>org.slf4j</groupId>
100+
<version>1.7.25</version>
101+
</dependency>
102+
</dependencies>
103+
<modelVersion>4.0.0</modelVersion>
57104

58-
<dependency>
59-
<groupId>com.graphql-java-kickstart</groupId>
60-
<artifactId>graphql-java-servlet</artifactId>
61-
<version>${graphql.java.servlet.version}</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>com.graphql-java</groupId>
65-
<artifactId>graphql-java</artifactId>
66-
<version>${graphql.java.version}</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>com.graphql-java</groupId>
70-
<artifactId>graphql-java-annotations</artifactId>
71-
<version>0.13.1</version>
72-
</dependency>
105+
<packaging>feature</packaging>
73106

74-
<dependency>
75-
<groupId>com.graphql-java-kickstart</groupId>
76-
<artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
77-
<version>${project.version}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.slf4j</groupId>
81-
<artifactId>slf4j-api</artifactId>
82-
<version>1.7.25</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.slf4j</groupId>
86-
<artifactId>slf4j-log4j12</artifactId>
87-
<version>1.7.25</version>
88-
</dependency>
89-
</dependencies>
90107

91-
<build>
92-
<plugins>
93-
<plugin>
94-
<groupId>org.apache.karaf.tooling</groupId>
95-
<artifactId>karaf-maven-plugin</artifactId>
96-
<version>4.0.8</version>
97-
<extensions>true</extensions>
98-
<configuration>
99-
<startLevel>80</startLevel>
100-
<addTransitiveFeatures>true</addTransitiveFeatures>
101-
<includeTransitiveDependency>true</includeTransitiveDependency>
102-
</configuration>
103-
</plugin>
108+
<parent>
109+
<artifactId>graphql-java-servlet-osgi-examples</artifactId>
110+
<groupId>com.graphql-java-kickstart</groupId>
111+
<version>7.3.4-SNAPSHOT</version>
112+
</parent>
104113

105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-install-plugin</artifactId>
108-
<version>2.5.2</version>
109-
</plugin>
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-deploy-plugin</artifactId>
113-
<version>2.8.2</version>
114-
</plugin>
115-
</plugins>
116-
117-
</build>
114+
<properties>
115+
<jackson.version>2.10.0.pr1</jackson.version>
116+
</properties>
118117

119118
</project>

‎examples/osgi/apache-karaf-feature/src/main/feature/feature.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="graphql-java-servlet-osgi-examples-karaf-feature">
3-
<feature name="graphql-java-servlet-osgi-examples-karaf-feature" description="graphql-java-servlet-osgi-examples-karaf-feature">
4-
<feature prerequisite="true" dependency="false">scr</feature>
5-
<feature prerequisite="true" dependency="false">war</feature>
6-
</feature>
2+
<features name="graphql-java-servlet-osgi-examples-karaf-feature"
3+
xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
4+
<feature description="graphql-java-servlet-osgi-examples-karaf-feature"
5+
name="graphql-java-servlet-osgi-examples-karaf-feature">
6+
<feature dependency="false" prerequisite="true">scr</feature>
7+
<feature dependency="false" prerequisite="true">war</feature>
8+
</feature>
79
</features>

0 commit comments

Comments
 (0)