Improved reloading again

Author: adrienlauer

pom.xml

@@ -23,7 +23,7 @@
     <packaging>maven-plugin</packaging>
 
     <properties>
-        <maven.version>3.1</maven.version>
+        <maven.version>3.3</maven.version>
         <plexus-component.version>1.6</plexus-component.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -80,7 +80,8 @@
                             <licenseMerge>BSD|BSD 3-Clause License</licenseMerge>
                             <licenseMerge>BSD|BSD style modified by Coverity</licenseMerge>
                             <licenseMerge>BSD|The BSD License</licenseMerge>
-                            <licenseMerge>CDDL 1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
+                            <licenseMerge>CDDL 1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+                            </licenseMerge>
                             <licenseMerge>CPL 1.0|Common Public License Version 1.0</licenseMerge>
                             <licenseMerge>EPL 1.0|Eclipse Public License, Version 1.0</licenseMerge>
                             <licenseMerge>EPL 1.0|Eclipse Public License - Version 1.0</licenseMerge>
@@ -93,7 +94,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>${maven.version}</version>
+                    <version>3.5</version>
                     <configuration>
                         <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                     </configuration>
@@ -146,6 +147,16 @@
                 <artifactId>jline</artifactId>
                 <version>2.14.5</version>
             </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>18.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -184,7 +195,7 @@
         <dependency>
             <groupId>org.eclipse.aether</groupId>
             <artifactId>aether-util</artifactId>
-            <version>0.9.0.M2</version>
+            <version>1.0.2.v20150114</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>
@@ -205,25 +216,25 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>${maven.version}.0</version>
+            <version>${maven.version}.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>${maven.version}.0</version>
+            <version>${maven.version}.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>${maven.version}.0</version>
+            <version>${maven.version}.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>${maven.version}.0</version>
+            <version>${maven.version}.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -252,9 +263,9 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
+            <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>3.3.1</version>
+            <version>6.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

src/license/THIRD-PARTY.properties

@@ -13,9 +13,8 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Nov 29 22:13:09 CET 2017
+#Thu Nov 30 15:58:46 CET 2017
 classworlds--classworlds--1.1-alpha-2=
-commons-collections--commons-collections--3.1=
 dom4j--dom4j--1.6.1=
 jdom--jdom--1.0=
 org.codehaus.plexus--plexus-component-api--1.0-alpha-16=

src/main/java/org/seedstack/maven/RefreshException.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package org.seedstack.maven;
+
+class RefreshException extends Exception {
+    public RefreshException() {
+    }
+
+    public RefreshException(String message) {
+        super(message);
+    }
+
+    public RefreshException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/org/seedstack/maven/ReleaseMojo.java

@@ -5,40 +5,40 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 package org.seedstack.maven;
 
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Profile;
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
-
 /**
  * Release the project simply by stripping the -SNAPSHOT part of the version.
  * Useful in continuous delivery pipelines.
@@ -47,49 +47,50 @@
  */
 @Mojo(name = "release", requiresProject = true, threadSafe = false, aggregator = true)
 public class ReleaseMojo extends AbstractSeedStackMojo {
-    public static final String SNAPSHOT_SUFFIX = "-SNAPSHOT";
-
-    @Component
-    private MavenProject executionMavenProject;
-
-    @Component
+    private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT";
+    @Parameter(defaultValue = "${project}", readonly = true)
+    private MavenProject mavenProject;
+    @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession mavenSession;
-
     @Component
     private BuildPluginManager buildPluginManager;
-
     @Component
     private ProjectBuilder projectBuilder;
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        String currentVersion = executionMavenProject.getVersion();
+        String currentVersion = mavenProject.getVersion();
 
-        if (isProjectDirty(getReactorModules("", executionMavenProject))) {
-            throw new MojoFailureException("Cannot continue, a POM transformation is already in progress, commit and revert it before executing the release goal");
+        if (isProjectDirty(getReactorModules("", mavenProject))) {
+            throw new MojoFailureException(
+                    "Cannot continue, a POM transformation is already in progress, commit and revert it before " +
+                            "executing the release goal");
         }
 
-        if (!executionMavenProject.equals(getLocalRoot(executionMavenProject))) {
-            throw new MojoFailureException("Cannot continue, release goal must be executed from the local project root");
+        if (!mavenProject.equals(getLocalRoot(mavenProject))) {
+            throw new MojoFailureException("Cannot continue, release goal must be executed from the local project " +
+                    "root");
         }
 
         if (!currentVersion.endsWith(SNAPSHOT_SUFFIX)) {
             throw new MojoFailureException("Cannot continue, project version is not a SNAPSHOT");
         }
 
-        if (executionMavenProject.hasParent() && executionMavenProject.getParent().getVersion().endsWith(SNAPSHOT_SUFFIX)) {
+        if (mavenProject.hasParent() && mavenProject.getParent()
+                .getVersion()
+                .endsWith(SNAPSHOT_SUFFIX)) {
             throw new MojoFailureException("Cannot continue, parent project is still a SNAPSHOT");
         }
 
         String newVersion = currentVersion.substring(0, currentVersion.length() - SNAPSHOT_SUFFIX.length());
         getLog().info("SNAPSHOT version found, setting release version to " + newVersion);
-        executionMavenProject.getProperties().setProperty("newVersion", newVersion);
-        executeVersionsPlugin("set", executionMavenProject);
+        mavenProject.getProperties().setProperty("newVersion", newVersion);
+        executeVersionsPlugin("set", mavenProject);
 
         boolean shouldRevert = false;
         List<MavenProject> transformedModules = new ArrayList<>();
-        transformedModules.add(executionMavenProject);
-        transformedModules.addAll(getReactorModules("", executionMavenProject).values());
+        transformedModules.add(mavenProject);
+        transformedModules.addAll(getReactorModules("", mavenProject).values());
         getLog().info("Checking transformed modules");
         for (MavenProject transformedModule : transformedModules) {
             try {
@@ -127,17 +128,22 @@ private void commitModule(MavenProject mavenProject) throws MojoExecutionExcepti
     }
 
     private void checkModule(MavenProject mavenProject) throws MojoFailureException {
-        Map<String, Dependency> snapshotDependencies = new HashMap<String, Dependency>();
+        Map<String, Dependency> snapshotDependencies = new HashMap<>();
         for (Dependency dependency : mavenProject.getDependencies()) {
             if (dependency.getVersion().endsWith(SNAPSHOT_SUFFIX)) {
                 snapshotDependencies.put(mavenProject.getArtifactId(), dependency);
             }
         }
 
         if (!snapshotDependencies.isEmpty()) {
-            StringBuilder sb = new StringBuilder("Cannot continue, there are still SNAPSHOT dependencies in the project:\n");
+            StringBuilder sb = new StringBuilder(
+                    "Cannot continue, there are still SNAPSHOT dependencies in the project:\n");
             for (Map.Entry<String, Dependency> dependencyEntry : snapshotDependencies.entrySet()) {
-                sb.append("\t* ").append(dependencyEntry.getKey()).append(": ").append(dependencyEntry.getValue().getManagementKey()).append("\n");
+                sb.append("\t* ")
+                        .append(dependencyEntry.getKey())
+                        .append(": ")
+                        .append(dependencyEntry.getValue().getManagementKey())
+                        .append("\n");
             }
 
             throw new MojoFailureException(sb.toString());
@@ -180,8 +186,8 @@ private Map<String, MavenProject> getReactorModules(String path, MavenProject pr
             path += '/';
         }
 
-        Map<String, MavenProject> result = new LinkedHashMap<String, MavenProject>();
-        Map<String, MavenProject> childResults = new LinkedHashMap<String, MavenProject>();
+        Map<String, MavenProject> result = new LinkedHashMap<>();
+        Map<String, MavenProject> childResults = new LinkedHashMap<>();
 
         Set<String> childModules = getChildModules(project);
         for (String moduleName : childModules) {
@@ -211,9 +217,8 @@ private Map<String, MavenProject> getReactorModules(String path, MavenProject pr
         return result;
     }
 
-
     private Set<String> getChildModules(MavenProject mavenProject) {
-        Set<String> childModules = new TreeSet<String>();
+        Set<String> childModules = new TreeSet<>();
         childModules.addAll(mavenProject.getModules());
         for (Profile profile : mavenProject.getModel().getProfiles()) {
             childModules.addAll(profile.getModules());
@@ -246,7 +251,7 @@ private MavenProject getLocalRoot(MavenProject project) {
     private MavenProject buildProject(File moduleProjectFile) throws ProjectBuildingException {
         DefaultProjectBuildingRequest request = new DefaultProjectBuildingRequest();
         request.setSystemProperties(System.getProperties());
-        request.setRepositorySession(executionMavenProject.getProjectBuildingRequest().getRepositorySession());
+        request.setRepositorySession(mavenProject.getProjectBuildingRequest().getRepositorySession());
         return projectBuilder.build(moduleProjectFile, request).getProject();
     }
 }

src/main/java/org/seedstack/maven/SeedStackUtils.java

@@ -10,7 +10,6 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * SeedStack utils.
@@ -35,11 +34,11 @@ public static Object getSeedLauncher() throws Exception {
             }
             return getLauncherMethod.invoke(null);
         } catch (Exception e) {
-            throw new MojoExecutionException("Cannot launch SeedStack application", unwrapException(e));
+            throw unwrapException(e);
         }
     }
 
-    public static Object getToolLauncher(String tool) throws MojoExecutionException {
+    public static Object getToolLauncher(String tool) throws Exception {
         try {
             Method getLauncherMethod;
             try {
@@ -51,7 +50,7 @@ public static Object getToolLauncher(String tool) throws MojoExecutionException
             }
             return getLauncherMethod.invoke(null, tool);
         } catch (Exception e) {
-            throw new MojoExecutionException("Cannot launch SeedStack tool", unwrapException(e));
+            throw unwrapException(e);
         }
     }
 
@@ -60,8 +59,7 @@ public static void launch(Object seedLauncher, String[] args) throws Exception {
             Method launchMethod = seedLauncher.getClass().getMethod("launch", String[].class);
             launchMethod.invoke(seedLauncher, new Object[]{args});
         } catch (Exception e) {
-            throw new MojoExecutionException("Cannot launch SeedStack application", unwrapException(e));
-
+            throw unwrapException(e);
         }
     }
 
@@ -70,7 +68,7 @@ public static void shutdown(Object seedLauncher) throws Exception {
             Method shutdownMethod = seedLauncher.getClass().getMethod("shutdown");
             shutdownMethod.invoke(seedLauncher);
         } catch (Exception e) {
-            throw new MojoExecutionException("Cannot shutdown SeedStack application", unwrapException(e));
+            throw unwrapException(e);
         }
     }
 
@@ -79,22 +77,23 @@ public static void refresh(Object seedLauncher) throws Exception {
         try {
             refreshMethod = seedLauncher.getClass().getMethod("refresh");
         } catch (NoSuchMethodException e) {
-            throw new MojoExecutionException("Application refresh is not supported before Seed 3.4.0", e);
+            throw new RuntimeException("Application refresh is not supported before Seed 3.4.0", e);
         }
         try {
             refreshMethod.invoke(seedLauncher);
         } catch (Exception e) {
-            throw new MojoExecutionException("Unable to refresh SeedStack application", unwrapException(e));
+            throw unwrapException(e);
         }
     }
 
-    private static Throwable unwrapException(Exception e) {
-        Throwable t;
-        if (e instanceof InvocationTargetException) {
-            t = ((InvocationTargetException) e).getTargetException();
+    private static Exception unwrapException(Exception e) {
+        Exception unwrapped;
+        if (e instanceof InvocationTargetException
+                && ((InvocationTargetException) e).getTargetException() instanceof Exception) {
+            unwrapped = (Exception) ((InvocationTargetException) e).getTargetException();
         } else {
-            t = e;
+            unwrapped = e;
         }
-        return t;
+        return unwrapped;
     }
 }