Skip to content

Commit 1583f66

Browse files
committed
Remove hard dependency on org.apache.felix:org.osgi.core
closes #18
1 parent 940dfe3 commit 1583f66

File tree

3 files changed

+7
-37
lines changed

3 files changed

+7
-37
lines changed

pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
<overWriteReleases>false</overWriteReleases>
219219
<overWriteSnapshots>false</overWriteSnapshots>
220220
<overWriteIfNewer>true</overWriteIfNewer>
221+
<includeScope>runtime</includeScope>
221222
</configuration>
222223
</execution>
223224
</executions>

webcam-capture/pom.xml

+6-9
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>com.nativelibs4java</groupId>
7979
<artifactId>bridj</artifactId>
80-
<version>0.6.1</version>
80+
<version>0.6.2</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.slf4j</groupId>
@@ -88,11 +88,7 @@
8888
<groupId>ch.qos.logback</groupId>
8989
<artifactId>logback-classic</artifactId>
9090
<version>1.0.7</version>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.apache.felix</groupId>
94-
<artifactId>org.osgi.core</artifactId>
95-
<version>1.4.0</version>
91+
<scope>provided</scope>
9692
</dependency>
9793
<dependency>
9894
<groupId>junit</groupId>
@@ -119,15 +115,16 @@
119115
<Bundle-Name>${project.name}</Bundle-Name>
120116
<Bundle-Version>${project.version}</Bundle-Version>
121117
<Bundle-DocURL>${project.url}</Bundle-DocURL>
122-
<Bundle-Activator>com.github.sarxos.webcam.WebcamActivator</Bundle-Activator>
123118
<Import-Package>
124119
*,
125120
</Import-Package>
126121
<Export-Package>
127-
com.github.sarxos.webcam*
122+
com.github.sarxos.webcam,
123+
com.github.sarxos.webcam.log,
124+
com.github.sarxos.webcam.util,
128125
</Export-Package>
129126
<Private-Package>
130-
com.github.sarxos.webcam.ds.buildin*
127+
!*,
131128
</Private-Package>
132129
<Include-Resources>{maven-resources}</Include-Resources>
133130
</instructions>

webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamActivator.java

-28
This file was deleted.

0 commit comments

Comments
 (0)