Merge pull request #72 from hazendaz/master

Pom updates, fix config error logging, and removed link from readme
revelc · Sep 8, 2015 · 3e277d7 · 3e277d7
2 parents bb2490c + 13f1965
commit 3e277d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ before using this plugin.
 ##How to use
 
 View the Maven site documentation for the latest release [here](http://code.revelc.net/formatter-maven-plugin/)
-http://code.revelc.net/formatter-maven-plugin/0.4/
 
 ##Eclipse Compatibility
 

diff --git a/maven-plugin/src/main/java/net/revelc/code/formatter/FormatterMojo.java b/maven-plugin/src/main/java/net/revelc/code/formatter/FormatterMojo.java
@@ -568,20 +568,20 @@ private Map<String, String> getOptionsFromConfigFile(String newConfigFile) throw
 			this.resourceManager.addSearchPath(FileResourceLoader.ID, this.basedir.getAbsolutePath());
 			configInput = this.resourceManager.getResourceAsInputStream(newConfigFile);
 		} catch (ResourceNotFoundException e) {
-			throw new MojoExecutionException("Config file [" + this.configFile + "] cannot be found", e);
+			throw new MojoExecutionException("Config file [" + newConfigFile + "] cannot be found", e);
 		}
 
 		if (configInput == null) {
-			throw new MojoExecutionException("Config file [" + this.configFile + "] does not exist");
+			throw new MojoExecutionException("Config file [" + newConfigFile + "] does not exist");
 		}
 		try {
 
 			ConfigReader configReader = new ConfigReader();
 			return configReader.read(configInput);
 		} catch (IOException e) {
-			throw new MojoExecutionException("Cannot read config file [" + this.configFile + "]", e);
+			throw new MojoExecutionException("Cannot read config file [" + newConfigFile + "]", e);
 		} catch (SAXException e) {
-			throw new MojoExecutionException("Cannot parse config file [" + this.configFile + "]", e);
+			throw new MojoExecutionException("Cannot parse config file [" + newConfigFile + "]", e);
 		} catch (ConfigReadException e) {
 			throw new MojoExecutionException(e.getMessage(), e);
 		} finally {

diff --git a/pom.xml b/pom.xml
@@ -142,7 +142,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>1.4.1</version>
                     <configuration>
                         <rules>
                             <requireMavenVersion>
@@ -382,7 +382,7 @@
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>
                         <artifactId>plexus-utils</artifactId>
-                        <version>2.1</version>
+                        <version>3.0.22</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -454,7 +454,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.2</version>
+                        <version>2.10.3</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -572,7 +572,7 @@
                                             <pluginExecutionFilter>
                                                 <groupId>org.apache.maven.plugins</groupId>
                                                 <artifactId>maven-enforcer-plugin</artifactId>
-                                                <versionRange>[1.4,)</versionRange>
+                                                <versionRange>[1.4.1,)</versionRange>
                                                 <goals>
                                                     <goal>enforce</goal>
                                                 </goals>