Merge 7c1d49f into 81840de

agreementmaker · Jul 19, 2018 · 29f7bb9 · 29f7bb9
2 parents 81840de + 7c1d49f
commit 29f7bb9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/AgreementMaker-OSGi/AgreementMaker-UI/pom.xml b/AgreementMaker-OSGi/AgreementMaker-UI/pom.xml
@@ -15,6 +15,7 @@
 	<packaging>bundle</packaging>
 
 	<properties>
+		<bundle.symbolicName>am.ui</bundle.symbolicName>
 		<bundle.namespace>am.ui</bundle.namespace>
 	</properties>
 
@@ -47,28 +48,36 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
 						<!-- <Export-Package>${bundle.namespace}.*,am.visualization.*</Export-Package> -->
-						<_exportcontents>
-							!target.dependency,
-							${bundle.namespace}.*,
-							am.visualization.*,
-							*
-						</_exportcontents>
-						<Bundle-Activator>${bundle.namespace}.UIActivator</Bundle-Activator>
+						<Bundle-Activator>am.ui.UIActivator</Bundle-Activator>
+						<Export-Package>
+							am.ui.*,
+							am.visualization.*
+						</Export-Package>
+						<Private-Package>
+							com.tomgibara.cluster.*,
+							com.jidesoft.*,
+							com.kitfox.*
+						</Private-Package>
 						<Import-Package>
 							!apple.laf.*,
-							!com.sun.java.swing.plaf.windows.*,
+							!com.sun.*,
+							!com.ibm.*,
 							!org.apache.tools.ant.*,
 							!sun.awt.*,
 							!sun.misc.*,
 							!sun.reflect.*,
 							!sun.swing.*,
+							!ch.toe.famix.*,
+							!ch.unibern.graphmatching2.*,
+							!com.tomgibara.cluster.*,
 							org.xml.sax;version="0.0.0",
 							org.w3c.dom;version="0.0.0",
-							org.osgi.*,am.*,org.apache.log4j.*,com.hp.hpl.*,*</Import-Package>
-						<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-						<Embed-Directory>target/dependency</Embed-Directory>
-						<Embed-StripGroup>true</Embed-StripGroup>
-						<Embed-Transitive>true</Embed-Transitive>
+							org.osgi.*,
+							am.*,
+							org.apache.log4j.*,
+							com.hp.hpl.*,
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -91,16 +100,19 @@
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>AgreementMaker-Core</artifactId>
 			<version>${project.parent.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>AgreementMaker-Matchers</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>Matcher-BaseSimilarity</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -115,11 +127,17 @@
 			<version>1.0.0-build001</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.agreementmaker</groupId>
+			<artifactId>cluster-gvm</artifactId>
+			<version>1.1</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<version>2.10.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>
diff --git a/AgreementMaker-OSGi/pom.xml b/AgreementMaker-OSGi/pom.xml
@@ -27,7 +27,7 @@
     <properties>
         <org.osgi.service.http.port>8080</org.osgi.service.http.port>
         <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
-        <maven.bundle.plugin.version>3.0.1</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>3.5.1</maven.bundle.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.jupiter.version>5.0.1</junit.jupiter.version>
         <junit.vintage.version>4.12.2</junit.vintage.version>