[2899]Update to tycho 0.21

ngiger · Nov 14, 2014 · 8ac0cc7 · 8ac0cc7
1 parent 671f5f1
commit 8ac0cc7
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 52 deletions.
diff --git a/ch.elexis.core.data.tests/META-INF/MANIFEST.MF b/ch.elexis.core.data.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.10.0",
  ch.rgw.utility,
  org.eclipse.swt,
- ch.elexis.core
+ ch.elexis.core,
+ ch.elexis.core.console.application
 Bundle-ClassPath: .,
  rsc/
 Import-Package: ch.elexis.core.data.activator
diff --git a/ch.elexis.core.data.tests/pom.xml b/ch.elexis.core.data.tests/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <elexis.run.dbtests>false</elexis.run.dbtests>
   </properties>
-  
+
   <!-- comment out to enable headless tests and add additional dependencies if needed
     -->
   <build>
@@ -28,11 +28,6 @@
           <useUIHarness>false</useUIHarness>
           <useUIThread>true</useUIThread>
           <dependencies>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.elexis.core.console.application</artifactId>
-              <version>0.0.0</version>
-            </dependency>
               <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-reflect</artifactId>

diff --git a/ch.elexis.core.hl7.v2x.tests/META-INF/MANIFEST.MF b/ch.elexis.core.hl7.v2x.tests/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: ch.elexis
 Fragment-Host: ch.elexis.core.hl7.v2x;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
+ ch.elexis.core.application;bundle-version="3.0.0"
 Import-Package: ch.elexis.data
diff --git a/ch.elexis.core.hl7.v2x.tests/pom.xml b/ch.elexis.core.hl7.v2x.tests/pom.xml
@@ -26,18 +26,8 @@
           <showEclipseLog>true</showEclipseLog>
           <dependencies>
             <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.elexis.core.application</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.navigator</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.views</artifactId>
+              <type>eclipse-feature</type>
+              <artifactId>org.eclipse.platform</artifactId>
               <version>0.0.0</version>
             </dependency>
           </dependencies>

diff --git a/ch.elexis.core.ui.importer.div.tests/META-INF/MANIFEST.MF b/ch.elexis.core.ui.importer.div.tests/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: ch.elexis
 Fragment-Host: ch.elexis.core.ui.importer.div;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
+ ch.elexis.core.application
 Import-Package: ch.elexis.data
diff --git a/ch.elexis.core.ui.importer.div.tests/pom.xml b/ch.elexis.core.ui.importer.div.tests/pom.xml
@@ -25,18 +25,8 @@
           <showEclipseLog>true</showEclipseLog>
           <dependencies>
             <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.elexis.core.application</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.navigator</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.views</artifactId>
+              <type>eclipse-feature</type>
+              <artifactId>org.eclipse.platform</artifactId>
               <version>0.0.0</version>
             </dependency>
           </dependencies>

diff --git a/ch.rgw.utility.tests/pom.xml b/ch.rgw.utility.tests/pom.xml
@@ -22,13 +22,8 @@
           <useUIHarness>true</useUIHarness>
           <dependencies>
             <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.navigator</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.ui.views</artifactId>
+              <type>eclipse-feature</type>
+              <artifactId>org.eclipse.platform</artifactId>
               <version>0.0.0</version>
             </dependency>
           </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -243,17 +243,17 @@
 		<module>ch.elexis.core.hl7.v2x</module>
 		<module>ch.rgw.utility</module>
     <!-- now follow the unit tests in a more or less logical order -->
+    <module>ch.rgw.utility.tests</module>
     <module>ch.elexis.core.data.tests</module>
-    <module>ch.elexis.core.hl7.v2x.tests</module>
     <module>ch.elexis.core.ui.importer.div.tests</module>
-    <module>ch.rgw.utility.tests</module>
+    <module>ch.elexis.core.hl7.v2x.tests</module>
     <!-- the ch.elexis.core.p2site creates an zipped installable application
 			and a p2 update site -->
 		<module>ch.elexis.core.p2site</module>
 	</modules>
 	<properties>
 		<scm_url>git@github.com:elexis/elexis-3-core.git</scm_url>
-		<tycho-version>0.20.0</tycho-version>
+		<tycho-version>0.21.0</tycho-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<tycho-extras.version>${tycho-version}</tycho-extras.version>
 		<repo_name>elexis.3.core</repo_name>
@@ -284,7 +284,7 @@
 							</configuration>
 						</execution>
 					</executions>
-				</plugin>			
+				</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin </artifactId>
@@ -314,8 +314,8 @@
 				<version>${tycho-version}</version>
 			</plugin>
 			<plugin>
-				<!-- we want to ensure that the bin directory created by the Eclipse 
-					gets cleaned, too. Without it Maven would put two versions of each class 
+				<!-- we want to ensure that the bin directory created by the Eclipse
+					gets cleaned, too. Without it Maven would put two versions of each class
 					file into the jars -->
 				<artifactId>maven-clean-plugin </artifactId>
 				<version>2.5</version>
@@ -358,18 +358,18 @@
 				<artifactId>target-platform-configuration </artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<!-- see http://wiki.eclipse.org/Tycho/Target_Platform we want to use 
-						the first alternative: If you are already using a target file in Eclipse, 
-						and that target file only contains "Software Site" locations (i.e. location 
-						elements with type="InstallableUnit"), use that target file for the Tycho 
-						build. This approach is the only way to share the same target platform configuration 
+					<!-- see http://wiki.eclipse.org/Tycho/Target_Platform we want to use
+						the first alternative: If you are already using a target file in Eclipse,
+						and that target file only contains "Software Site" locations (i.e. location
+						elements with type="InstallableUnit"), use that target file for the Tycho
+						build. This approach is the only way to share the same target platform configuration
 						between Tycho and Eclipse. -->
 					<target>
 						<artifact>
 							<groupId>ch.elexis</groupId>
 							<artifactId>juno-target</artifactId>
 							<version>3.0.0-SNAPSHOT</version>
-							<!-- we cannot use a classifier here, or mvn compile would file in 
+							<!-- we cannot use a classifier here, or mvn compile would file in
 								any other project!! classifier>elexis-3</classifier -->
 						</artifact>
 					</target>