Skip to content

Commit 5b4a2e0

Browse files
committed
Merge branch 'master' of github.com:joyent/java-manta
2 parents c772583 + 81082e8 commit 5b4a2e0

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

java-manta-client-unshaded/src/main/java/com/joyent/manta/client/MantaObjectConversionFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class MantaObjectConversionFunction implements Function<Map<String, Objec
7474
/**
7575
* Static instance to be used as a singleton.
7676
*/
77-
static final MantaObjectConversionFunction INSTANCE = new MantaObjectConversionFunction();
77+
public static final MantaObjectConversionFunction INSTANCE = new MantaObjectConversionFunction();
7878

7979
@Override
8080
public MantaObject apply(final Map<String, Object> item) {

java-manta-client/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,11 @@
291291
For SOME reason Maven can build a sources JAR for this module based on the above workaround
292292
*and still* deleting the source files during process-resources in order to avoid the shade plugin
293293
detecting overlapping classes.
294+
295+
Maintainer beware! You might be tempted to add an invocation of the maven-source-plugin directly here
296+
and bind it to a phase after the above two but before packaging (in order to avoid the overlapping
297+
classes error) but this does not work. Relying on the parent-pom definition of maven-source-plugin is
298+
unexpected but functional so that behavior is documented here.
294299
-->
295300
</plugins>
296301
</build>

0 commit comments

Comments
 (0)