Skip to content

Commit 51a7653

Browse files
chadlwilsonchadlwilson
authored
Rationalise runtime dependencies (#939)
* Remove unnecessary transitive dependencies Signed-off-by: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> * Update NOTICE Signed-off-by: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> --------- Signed-off-by: Chad Wilson <29788154+chadlwilson@users.noreply.github.com>
1 parent d179db9 commit 51a7653

3 files changed

Lines changed: 54 additions & 9 deletions

File tree

‎notice.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11

2-
| Dependency Name | Copyright Information | Description | Repo URL | License Type | License URL |
3-
|-----------------|-----------------------|-------------|----------|--------------|-------------|
4-
|guava|Copyright (C) 2012 The Guava Authors|"Google Core Libraries for Java 6+|https://code.google.com/p/guava-libraries/|Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0|
5-
|javassist|Copyright (C) 1999-2015 Shigeru Chiba.|Java bytecode engineering toolkit|http://www.javassist.org/ |Triple License: MPL 1.1, LGPL 2.1, Apache 2.0||
6-
|reflections|Copyright (C) 2004 Sam Hocevar|Java runtime metadata analysis|https://github.com/ronmamo/reflections|wtfpl version 2 |https://code.google.com/p/reflections/source/browse/trunk/COPYING.txt|
7-
|protobuf-java| Copyright 2008 Google Inc.|Java Protocol Buffers runtime library|https://github.com/google/protobuf/tree/master/java|BSD 2 clause license|http://www.opensource.org/licenses/bsd-license.php|
2+
| Dependency Name | Copyright Information | Description | Repo URL | License Type | License URL |
3+
|-----------------|----------------------------------------|--------------------------------------------------------------------------------------------|---------------------------------------------|-----------------------------------------------|-----------------------------------------------------------------------|
4+
| assertj | | Fluent testing assertions for Java and the JVM | https://github.com/assertj/assertj | Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |
5+
| bye-buddy | | Runtime code generation for the Java virtual machine. | https://github.com/raphw/byte-buddy | Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |
6+
| reflections | Copyright (C) 2004 Sam Hocevar | Java runtime metadata analysis | https://github.com/ronmamo/reflections | wtfpl version 2 | https://code.google.com/p/reflections/source/browse/trunk/COPYING.txt |
7+
| javassist | Copyright (C) 1999-2015 Shigeru Chiba. | Java bytecode engineering toolkit | https://www.javassist.org/ | Triple License: MPL 1.1, LGPL 2.1, Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |
8+
| javaparser | | Java 1-21 Parser and Abstract Syntax Tree for Java with advanced analysis functionalities. | https://github.com/javaparser/javaparser | Dual License: LGPL 3.0, Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |
9+
| JSON-java | | A reference implementation of a JSON package in Java. | https://github.com/stleary/JSON-java | Public Domain | https://github.com/stleary/JSON-java/blob/master/LICENSE |
10+
| guava | Copyright (C) 2012 The Guava Authors | Google Core Libraries for Java | https://github.com/google/guava | Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |
11+
| protobuf-java | | Java Protocol Buffers runtime library | https://github.com/protocolbuffers/protobuf | BSD 2 clause license | https://www.opensource.org/licenses/bsd-license.php |
12+
| grpc-java | | Google Core Libraries for Java | https://github.com/grpc/grpc-java | Apache 2.0 | https://www.apache.org/licenses/LICENSE-2.0 |

‎pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<groupId>org.reflections</groupId>
4343
<artifactId>reflections</artifactId>
4444
<version>0.10.2</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>com.google.code.findbugs</groupId>
48+
<artifactId>jsr305</artifactId>
49+
</exclusion>
50+
</exclusions>
4551
</dependency>
4652
<dependency>
4753
<groupId>com.github.javaparser</groupId>
@@ -84,18 +90,54 @@
8490
<dependency>
8591
<groupId>io.grpc</groupId>
8692
<artifactId>grpc-api</artifactId>
93+
<exclusions>
94+
<exclusion>
95+
<groupId>com.google.errorprone</groupId>
96+
<artifactId>error_prone_annotations</artifactId>
97+
</exclusion>
98+
<exclusion>
99+
<groupId>com.google.code.findbugs</groupId>
100+
<artifactId>jsr305</artifactId>
101+
</exclusion>
102+
</exclusions>
87103
</dependency>
88104
<dependency>
89105
<groupId>io.grpc</groupId>
90106
<artifactId>grpc-netty-shaded</artifactId>
107+
<exclusions>
108+
<exclusion>
109+
<groupId>com.google.errorprone</groupId>
110+
<artifactId>error_prone_annotations</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>org.codehaus.mojo</groupId>
114+
<artifactId>animal-sniffer-annotations</artifactId>
115+
</exclusion>
116+
<exclusion>
117+
<groupId>com.google.android</groupId>
118+
<artifactId>annotations</artifactId>
119+
</exclusion>
120+
</exclusions>
91121
</dependency>
92122
<dependency>
93123
<groupId>io.grpc</groupId>
94124
<artifactId>grpc-protobuf</artifactId>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>com.google.code.findbugs</groupId>
128+
<artifactId>jsr305</artifactId>
129+
</exclusion>
130+
</exclusions>
95131
</dependency>
96132
<dependency>
97133
<groupId>io.grpc</groupId>
98134
<artifactId>grpc-stub</artifactId>
135+
<exclusions>
136+
<exclusion>
137+
<groupId>com.google.errorprone</groupId>
138+
<artifactId>error_prone_annotations</artifactId>
139+
</exclusion>
140+
</exclusions>
99141
</dependency>
100142
<dependency>
101143
<groupId>org.junit.jupiter</groupId>

‎src/main/java/com/thoughtworks/gauge/execution/parameters/parsers/base/ParameterParsingChain.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.reflections.util.ConfigurationBuilder;
2121
import org.reflections.util.FilterBuilder;
2222

23-
import javax.annotation.Nullable;
2423
import java.lang.reflect.InvocationTargetException;
2524
import java.util.LinkedList;
2625
import java.util.List;
@@ -48,8 +47,7 @@ private Reflections createReflections() {
4847
return new Reflections(config);
4948
}
5049

51-
private @Nullable
52-
ParameterParser asCustomParameterParser(Class<? extends ParameterParser> clazz) {
50+
private ParameterParser asCustomParameterParser(Class<? extends ParameterParser> clazz) {
5351
try {
5452
ParameterParser instance = clazz.getDeclaredConstructor().newInstance();
5553
Logger.debug(String.format("Adding %s as custom parameter parser", clazz.getName()));

0 commit comments

Comments
 (0)