From 2d4aa880062698b7bb9a7eb3fa9e8b57986cdc8e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 7 Sep 2015 19:47:20 -0400 Subject: [PATCH 1/5] Updated maven-enforcer-plugin to 1.4.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c1793d5f2..85b46d922 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4 + 1.4.1 @@ -572,7 +572,7 @@ org.apache.maven.plugins maven-enforcer-plugin - [1.4,) + [1.4.1,) enforce From 9f59d6e11a2d769023a5d0a85fa4553b41b63272 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 7 Sep 2015 19:47:32 -0400 Subject: [PATCH 2/5] Updated maven-javadoc-plugin to 2.10.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85b46d922..fab14a97a 100644 --- a/pom.xml +++ b/pom.xml @@ -454,7 +454,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.2 + 2.10.3 attach-javadocs From 70cf7b340daf1c1fbace92258bafbf68d8ecc819 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 7 Sep 2015 19:47:43 -0400 Subject: [PATCH 3/5] Updated plexus-utils to 3.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fab14a97a..00fa8cf5a 100644 --- a/pom.xml +++ b/pom.xml @@ -382,7 +382,7 @@ org.codehaus.plexus plexus-utils - 2.1 + 3.0.22 From 20c6ffc28c36aad98c13fea73c72d0f20cce7b26 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 7 Sep 2015 20:02:14 -0400 Subject: [PATCH 4/5] Fixed configFile noted for exceptions - it was wrong and wouldn't show javascript --- .../java/net/revelc/code/formatter/FormatterMojo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 index e515ec7e8..1d54d87e3 100644 --- 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 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 { From 13f19658140fd8e18ec1bea8ce3dab0e8600e8ad Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 7 Sep 2015 20:08:39 -0400 Subject: [PATCH 5/5] Removed old link from readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0dc8403c6..3c50b35e5 100644 --- 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