Minor project adjustments.

turesheim · Sep 27, 2015 · d00529d · d00529d
1 parent ea961fe
commit d00529d
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 13 deletions.
diff --git a/net.resheim.eclipse.timekeeper-feature/pom.xml b/net.resheim.eclipse.timekeeper-feature/pom.xml
@@ -4,15 +4,53 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
+	<artifactId>net.resheim.eclipse.timekeeper</artifactId>
+	<packaging>eclipse-feature</packaging>
+
 	<parent>
 		<artifactId>net.resheim.eclipse.timekeeper-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
 		<groupId>net.resheim.eclipse.timekeeper</groupId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>net.resheim.eclipse.timekeeper</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<version>1.1.0-SNAPSHOT</version>
-
+	<build>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-packaging-plugin
+										</artifactId>
+										<versionRange>
+											[0.22.0,)
+										</versionRange>
+										<goals>
+											<goal>
+												build-qualifier-aggregator
+											</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/...resheim.eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/ActivatorTest.java b/...resheim.eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/ActivatorTest.java
@@ -28,16 +28,15 @@
 @SuppressWarnings("restriction")
 public class ActivatorTest {
 
-
 	private LocalTask task;
 
 	@Before
-	public void before(){
+	public void before() {
 		task = new LocalTask("1", "TestTask");
 	}
 
 	@After
-	public void after(){
+	public void after() {
 		try {
 			TasksUi.getTaskDataManager().discardEdits(task);
 		} catch (CoreException e) {
@@ -54,6 +53,10 @@ public void testStartTime() {
 		assertTrue(Duration.between(expected, actual).toMillis() < 500);
 	}
 
+	/**
+	 * Verifies that the active time is correctly registered when a task has
+	 * been activated.
+	 */
 	@Test
 	public void testActiveTime() {
 		TasksUi.getTaskActivityManager().activateTask(task);

diff --git a/....eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/export/CSVExportTest.java b/....eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/export/CSVExportTest.java
@@ -19,8 +19,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
-
 import net.resheim.eclipse.timekeeper.ui.Activator;
 
 @SuppressWarnings("restriction")

diff --git a/...eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/export/HTMLExportTest.java b/...eclipse.timekeeper.tests/src/net/resheim/eclipse/timekeeper/ui/export/HTMLExportTest.java
@@ -19,8 +19,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
-
 import net.resheim.eclipse.timekeeper.ui.Activator;
 
 @SuppressWarnings("restriction")

diff --git a/net.resheim.eclipse.timekeeper.ui/.classpath b/net.resheim.eclipse.timekeeper.ui/.classpath
@@ -2,9 +2,8 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jna-4.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jna-platform-4.1.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>