fix #11 - updating dependencies for jdepend to a fork supporting java 8

Author: galan

README.md

@@ -12,7 +12,7 @@ Usage: Add the following plugin to your POM:
 		<dependency>
 			<groupId>de.andrena.tools.nopackagecycles</groupId>
 			<artifactId>no-package-cycles-enforcer-rule</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.6</version>
 		</dependency>
 	</dependencies>
 	<executions>

pom.xml

@@ -5,13 +5,12 @@
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
 		<artifactId>oss-parent</artifactId>
-		<version>7</version>
+		<version>9</version>
 	</parent>
 
 	<groupId>de.andrena.tools.nopackagecycles</groupId>
 	<artifactId>no-package-cycles-enforcer-rule</artifactId>
 	<version>1.0.6-SNAPSHOT</version>
-	<packaging>jar</packaging>
 
 	<name>NoPackageCyclesEnforcerRule</name>
 	<description>A rule for the maven-enforcer-plugin that detects and prevents package cycles.</description>
@@ -43,24 +42,23 @@
 	</developers>
 
 	<properties>
-		<api.version>1.0</api.version>
 		<maven.version>2.2.1</maven.version>
 	</properties>
 
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.2</version>
+				<version>3.6.0</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.14.1</version>
+				<version>2.19.1</version>
 				<configuration>
 					<excludes>
 						<exclude>*-target/**</exclude>
@@ -71,7 +69,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.14.1</version>
+				<version>2.19.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -92,7 +90,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.2</version>
+				<version>1.4.1</version>
 				<dependencies>
 					<dependency>
 						<groupId>de.andrena.tools.nopackagecycles</groupId>
@@ -122,7 +120,7 @@
 		<dependency>
 			<groupId>org.apache.maven.enforcer</groupId>
 			<artifactId>enforcer-api</artifactId>
-			<version>${api.version}</version>
+			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
@@ -147,12 +145,12 @@
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-container-default</artifactId>
-			<version>1.5.5</version>
+			<version>1.7.1</version>
 		</dependency>
 		<dependency>
-			<groupId>jdepend</groupId>
+			<groupId>guru.nidi</groupId>
 			<artifactId>jdepend</artifactId>
-			<version>2.9.1</version>
+			<version>2.9.5</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.jgrapht</groupId>
@@ -163,7 +161,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -179,4 +177,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>

src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java

@@ -1,21 +1,21 @@
 package de.andrena.tools.nopackagecycles;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import de.andrena.tools.nopackagecycles.mock.EnforcerRuleHelperMock;
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
-import de.andrena.tools.nopackagecycles.mock.EnforcerRuleHelperMock;
 
 public class NoPackageCyclesRuleIntegrationTest {
+
 	private static final URL FITNESSE_TARGET_FOLDER = getResource("fitnesse-target");
 	private static final URL FITNESSE_EXPECTED_OUTPUT = getResource("fitnesse-expected-output.txt");
 	private static final URL JUNIT_TARGET_FOLDER = getResource("junit-target");
@@ -24,38 +24,45 @@ public class NoPackageCyclesRuleIntegrationTest {
 	private NoPackageCyclesRule rule;
 	private EnforcerRuleHelperMock helper;
 
+
 	@Before
 	public void setUp() throws Exception {
 		rule = new NoPackageCyclesRule();
 		helper = new EnforcerRuleHelperMock();
 	}
 
+
 	@Test
 	public void fitnesseIntegrationTest() throws Exception {
 		assertPackageCycles(FITNESSE_TARGET_FOLDER, FITNESSE_EXPECTED_OUTPUT);
 	}
 
+
 	@Test
 	public void junitIntegrationTest() throws Exception {
 		assertPackageCycles(JUNIT_TARGET_FOLDER, JUNIT_EXPECTED_OUTPUT);
 	}
 
+
 	private void assertPackageCycles(URL targetFolder, URL expectedOutput) throws URISyntaxException, IOException {
 		helper.setTestClassesDir(new File("non-existent"));
 		helper.setClassesDir(new File(targetFolder.toURI()));
 		try {
 			rule.execute(helper);
 			fail("expected EnforcerRuleException");
-		} catch (EnforcerRuleException e) {
+		}
+		catch (EnforcerRuleException e) {
 			// using assertEquals to get a nice comparison editor in eclipse
-			assertEquals(getExpectedOutput(expectedOutput), e.getMessage());
+			assertEquals(getExpectedOutput(expectedOutput), e.getMessage() + "\n");
 		}
 	}
 
+
 	private String getExpectedOutput(URL expectedOutput) throws IOException {
 		return IOUtils.toString(expectedOutput.openStream()).replaceAll("\r", "");
 	}
 
+
 	private static URL getResource(String path) {
 		return Thread.currentThread().getContextClassLoader().getResource(path);
 	}

src/test/resources/fitnesse-expected-output.txt

@@ -295,4 +295,4 @@ Package-cycle found involving fit, fit.decorator.util, fit.testFxtr, fitnesse, f
         fitnesse.http (TemplateUtilTest)
         fitnesse.responders.editing (TemplateUtilTest)
         fitnesse.testutil (TemplateUtilTest)
-        fitnesse.wiki (TemplateUtil, TemplateUtilTest)
+        fitnesse.wiki (TemplateUtil, TemplateUtilTest)

src/test/resources/junit-expected-output.txt

@@ -16,7 +16,7 @@ Package-cycle found involving junit.extensions, junit.framework, junit.runner, o
         org.junit.runners (FixMethodOrder)
     org.junit.experimental.theories depends on:
         org.junit (Theories$TheoryAnchor, Theories$TheoryAnchor$1, Theories$TheoryAnchor$2)
-        org.junit.experimental.theories.internal (Theories$TheoryAnchor, Theories$TheoryAnchor$1, Theories$TheoryAnchor$1$1, Theories$TheoryAnchor$2)
+        org.junit.experimental.theories.internal (FromDataPoints, Theories$TheoryAnchor, Theories$TheoryAnchor$1, Theories$TheoryAnchor$1$1, Theories$TheoryAnchor$2)
         org.junit.internal (Theories$TheoryAnchor, Theories$TheoryAnchor$1$1)
         org.junit.runners (Theories, Theories$TheoryAnchor$1)
         org.junit.runners.model (Theories, Theories$TheoryAnchor, Theories$TheoryAnchor$1, Theories$TheoryAnchor$1$1, Theories$TheoryAnchor$2)
@@ -109,4 +109,4 @@ Package-cycle found involving junit.extensions, junit.framework, junit.runner, o
         org.junit.internal (TestClass)
         org.junit.internal.runners (RunnerBuilder)
         org.junit.internal.runners.model (FrameworkMethod$1, MultipleFailureException)
-        org.junit.runner (RunnerBuilder)
+        org.junit.runner (RunnerBuilder)