From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Thu, 5 Mar 2020 14:51:51 +0000 (+0000)
Subject: Merge "Include interop.diagram in P2 repo"
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=fe7288d63062dd6ef72c6163f3d6133e287a2fb7;hp=-c;p=simantics%2Finterop.git

Merge "Include interop.diagram in P2 repo"
---

fe7288d63062dd6ef72c6163f3d6133e287a2fb7
diff --combined pom.xml
index a9faec5,de5bfd2..f7b1864
--- a/pom.xml
+++ b/pom.xml
@@@ -55,67 -55,21 +55,69 @@@
  		</plugins>
  	</build>
  
 +	<profiles>
 +		<profile>
 +			<id>sign</id>
 +			<activation>
 +				<property>
 +					<name>sign</name>
 +					<value>true</value>
 +				</property>
 +			</activation>
 +			<build>
 +				<plugins>
 +					<plugin>
 +						<groupId>org.codehaus.mojo</groupId>
 +						<artifactId>properties-maven-plugin</artifactId>
 +						<version>1.0.0</version>
 +						<executions>
 +							<execution>
 +								<phase>initialize</phase>
 +								<goals>
 +									<goal>read-project-properties</goal>
 +								</goals>
 +							</execution>
 +						</executions>
 +						<configuration>
 +							<files>
 +								<file>${sign.properties}</file>
 +							</files>
 +						</configuration>
 +					</plugin>
 +					<plugin>
 +						<groupId>org.apache.maven.plugins</groupId>
 +						<artifactId>maven-jarsigner-plugin</artifactId>
 +						<version>3.0.0</version>
 +						<executions>
 +							<execution>
 +								<id>sign</id>
 +								<goals>
 +									<goal>sign</goal>
 +									<goal>verify</goal>
 +								</goals>
 +							</execution>
 +						</executions>
 +					</plugin>
 +				</plugins>
 +			</build>
 +		</profile>
 +	</profiles>
 +
  	<modules>
  		<module>org.simantics.excel.poi</module>
  		<!--<module>org.simantics.express</module>-->
  		<module>org.simantics.interop</module>
+ 		<module>org.simantics.interop.diagram</module>
  		<module>org.simantics.interop.mapping</module>
  		<module>org.simantics.interop.update</module>
  		<module>org.simantics.interop.xmlio</module>
+ 		<module>org.simantics.interop.scl</module>
+ 		
  		<module>org.simantics.xml.sax</module>
  		<module>org.simantics.xml.sax.base</module>
  		<module>org.simantics.xml.sax.ontology</module>
  		<module>org.simantics.xml.sax.ui</module>
- 		<module>org.simantics.interop.scl</module>
- 
+ 		
  		<module>org.simantics.excel.poi.feature</module>
  		<module>org.simantics.interop.feature</module>
  		<module>org.simantics.xml.sax.feature</module>