Skip to content

Commit 6bc061d

Browse files
ochafikochafik
committed
Regenerated pthreads + updated to maven-shade-plugin 1.6
1 parent d323124 commit 6bc061d

File tree

6 files changed

+1100
-150
lines changed

6 files changed

+1100
-150
lines changed

‎libraries/BridJ/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-shade-plugin</artifactId>
92-
<version>1.4</version>
9392
<configuration>
9493
<relocations>
9594
<relocation>
@@ -354,6 +353,14 @@
354353
<configuration>
355354
<shadedArtifactAttached>true</shadedArtifactAttached>
356355
<shadedClassifierName>android</shadedClassifierName>
356+
<artifactSet>
357+
<includes>
358+
<include>com.google.android.tools:dx</include>
359+
</includes>
360+
<excludes>
361+
<exclude>junit:junit</exclude>
362+
</excludes>
363+
</artifactSet>
357364
<filters>
358365
<filter>
359366
<artifact>com.nativelibs4java:bridj</artifact>

‎libraries/InteropIntegration/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<artifactId>interop-integration-root</artifactId>
66
<packaging>pom</packaging>
77
<name>Interop Integration Root</name>
8+
<version>0.6.1</version>
89

910
<parent>
1011
<groupId>com.nativelibs4java</groupId>
@@ -14,6 +15,8 @@
1415
</parent>
1516

1617
<modules>
18+
<!--
1719
<module>VersionSpecificBridJ</module>
20+
-->
1821
</modules>
1922
</project>

0 commit comments

Comments
 (0)