Skip to content

Commit 68ccc2a

Browse files
committed
Merge pull request #20 from whiskeysierra/master
Bumped to newest reflections/javassist version
2 parents d581c33 + 3dcb993 commit 68ccc2a

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

pom.xml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>de.zalando</groupId>
66
<artifactId>zalando-sprocwrapper</artifactId>
7-
<version>1.3.1-SNAPSHOT</version>
7+
<version>1.4.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>Stored Procedure Wrapper</name>
1010
<description>Library to make PostgreSQL stored procedures available through simple Java "*SProcService" interfaces including automatic object serialization and deserialization (using typemapper and convention-over-configuration). Supports sharding, advisory locking, statement timeouts and PostgreSQL types such as enums and hstore.</description>
@@ -211,18 +211,7 @@
211211
<dependency>
212212
<groupId>org.reflections</groupId>
213213
<artifactId>reflections</artifactId>
214-
<version>0.9.8</version>
215-
<exclusions>
216-
<exclusion>
217-
<groupId>javassist</groupId>
218-
<artifactId>javassist</artifactId>
219-
</exclusion>
220-
</exclusions>
221-
</dependency>
222-
<dependency>
223-
<groupId>org.javassist</groupId>
224-
<artifactId>javassist</artifactId>
225-
<version>3.18.2-GA</version>
214+
<version>0.9.10</version>
226215
</dependency>
227216
<dependency>
228217
<groupId>com.google.guava</groupId>

src/main/java/de/zalando/sprocwrapper/globalobjecttransformer/GlobalObjectTransformerLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.reflections.Reflections;
88

9+
import org.reflections.scanners.SubTypesScanner;
910
import org.reflections.scanners.TypeAnnotationsScanner;
1011

1112
import org.reflections.util.ClasspathHelper;
@@ -102,7 +103,7 @@ public boolean apply(final String input) {
102103
final Reflections reflections = new Reflections(new ConfigurationBuilder().filterInputsBy(
103104
new FilterBuilder.Include(FilterBuilder.prefix(myNameSpaceToScan))).setUrls(
104105
ClasspathHelper.forPackage(myNameSpaceToScan)).setScanners(new TypeAnnotationsScanner()
105-
.filterResultsBy(filter)));
106+
.filterResultsBy(filter), new SubTypesScanner()));
106107
final Set<Class<?>> objectMapper = reflections.getTypesAnnotatedWith(GlobalObjectMapper.class);
107108

108109
return objectMapper;

0 commit comments

Comments
 (0)