Suppress self-imports to avoid dependency cycles in Eclipse.

Change-Id: Ie3bf8145db5a95ee1c73c2c130986a0e74fea466
enilink · Mar 30, 2016 · 975efdb · 975efdb
1 parent 38eb2d8
commit 975efdb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/llrp4j-core/pom.xml b/llrp4j-core/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -33,13 +34,8 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Export-Package>net.enilink.llrp4j,
-							net.enilink.llrp4j.annotations,
-							net.enilink.llrp4j.bitbuffer,
-							net.enilink.llrp4j.types,
-							net.enilink.llrp4j.xml,
-							org.llrp.ltk.schema.core</Export-Package>
-						<Import-Package>org.slf4j;version="1.7.2",*</Import-Package>
+						<Export-Package>net.enilink.llrp4j.*,org.llrp.ltk.schema.core</Export-Package>
+						<Import-Package>org.slf4j;version="1.7.2",!net.enilink.llrp4j.*,!org.llrp.ltk.schema.core,*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/llrp4j-impinj-module/pom.xml b/llrp4j-impinj-module/pom.xml
@@ -86,7 +86,7 @@
 				<configuration>
 					<instructions>
 						<Export-Package>org.llrp.impinj.*</Export-Package>
-						<Import-Package>*</Import-Package>
+						<Import-Package>!org.llrp.impinj.*, *</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/llrp4j-llrp-module/pom.xml b/llrp4j-llrp-module/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -80,7 +81,7 @@
 				<configuration>
 					<instructions>
 						<Export-Package>org.llrp.*</Export-Package>
-						<Import-Package>*</Import-Package>
+						<Import-Package>org.llrp.ltk.*, !org.llrp.*, *</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>