Skip to content

Commit 8a1bf8e

Browse files
committed
Fix pluginmanager shading overriding provided services with defaults
1 parent c4a8080 commit 8a1bf8e

File tree

8 files changed

+11
-7
lines changed

8 files changed

+11
-7
lines changed

API/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.ohnlp.backbone</groupId>
3333
<artifactId>backbone-parent</artifactId>
34-
<version>3.0.23</version>
34+
<version>3.0.24</version>
3535
</parent>
3636

3737
<artifactId>api</artifactId>

Core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.ohnlp.backbone</groupId>
99
<artifactId>backbone-parent</artifactId>
10-
<version>3.0.23</version>
10+
<version>3.0.24</version>
1111
</parent>
1212

1313
<artifactId>core</artifactId>

Example-Backbone-Configs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.ohnlp.backbone</groupId>
99
<artifactId>backbone-parent</artifactId>
10-
<version>3.0.23</version>
10+
<version>3.0.24</version>
1111
</parent>
1212

1313
<artifactId>example-backbone-configs</artifactId>

IO/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.ohnlp.backbone</groupId>
99
<artifactId>backbone-parent</artifactId>
10-
<version>3.0.23</version>
10+
<version>3.0.24</version>
1111
</parent>
1212

1313
<groupId>org.ohnlp.backbone.io</groupId>

Plugin-Manager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.ohnlp.backbone</groupId>
99
<artifactId>backbone-parent</artifactId>
10-
<version>3.0.23</version>
10+
<version>3.0.24</version>
1111
</parent>
1212

1313
<artifactId>plugin-manager</artifactId>

Plugin-Manager/src/main/java/org/ohnlp/backbone/pluginmanager/PluginManager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
137137
return FileVisitResult.CONTINUE;
138138
}
139139
Path tgtPath = fs.getPath(path.toString());
140+
if (tgtPath.toString().contains("META-INF/services") && Files.exists(tgtPath)) {
141+
// This is a service that already exists. Short-circuit for now as we do not support append
142+
return FileVisitResult.CONTINUE;
143+
}
140144
Files.createDirectories(tgtPath.getParent());
141145
Files.copy(path, tgtPath, StandardCopyOption.REPLACE_EXISTING);
142146
return FileVisitResult.CONTINUE;

Transforms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.ohnlp.backbone</groupId>
99
<artifactId>backbone-parent</artifactId>
10-
<version>3.0.23</version>
10+
<version>3.0.24</version>
1111
</parent>
1212

1313
<groupId>org.ohnlp.backbone.transforms</groupId>

pom.xml

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

77
<groupId>org.ohnlp.backbone</groupId>
88
<artifactId>backbone-parent</artifactId>
9-
<version>3.0.23</version>
9+
<version>3.0.24</version>
1010

1111

1212
<properties>

0 commit comments

Comments
 (0)