Merged pom changes and fixed a couple of bugs

Author: brianhks

build.bsh

@@ -111,7 +111,7 @@ jc = jp.getCompileRule();
 jc.addClasspath(classpath);
 jc.addSource(versionSrcFile);
 jc.addDepend(versionRule);
-jc.getDefinition().set("target", "1.8");
+jc.getDefinition().set("target", "1.5");
 
 jp.getTestCompileRule().addClasspath(classpath);
 

src/main/java/tablesaw/MakeEngine.java

@@ -769,14 +769,12 @@ private DependencyAnnotations createDependencyAnnotations(Class ruleClass)
 				//System.out.println("Adding consumes "+m.getName());
 				da.addConsumesMethod(consumes.value(), m);
 				}
-			else
+
+			Provides provides = m.getAnnotation(Provides.class);
+			if (provides != null)
 				{
-				Provides provides = m.getAnnotation(Provides.class);
-				if (provides != null)
-					{
-					//System.out.println("Adding provides "+m.getName());
-					da.addProvidesMethod(provides.value(), m);
-					}
+				//System.out.println("Adding provides "+m.getName());
+				da.addProvidesMethod(provides.value(), m);
 				}
 			}
 

src/main/java/tablesaw/rules/AbstractPatternRule.java

@@ -119,6 +119,16 @@ public Set<String> getRebuildSources()
 		return (m_rebuildSources);
 		}
 
+	//---------------------------------------------------------------------------
+	/**
+	 Called to force this Rule to always run regardless of dependencies
+	 */
+	public T alwaysRun()
+		{
+		m_needToRun = true;
+		return ((T)this);
+		}
+
 	//---------------------------------------------------------------------------
 	public T dontDeleteTargets()
 		{
@@ -209,8 +219,6 @@ public void preBuild(DependencyCache cache, Map<String, Long> modificationCache)
 					}
 				}
 			}
-		else
-			m_needToRun = false;
 		}
 
 	//---------------------------------------------------------------------------