diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java index 7fe66659d5..0cdd9beb9e 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java @@ -405,17 +405,18 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo */ private void readClasspathFile(List classpath, File classpathFile) { - try - { - JAXBContext context = JAXBContext.newInstance(Classpath.class); + try + { + JAXBContext context = JAXBContext.newInstance(Classpath.class); Unmarshaller unmarshaller = context.createUnmarshaller(); - Classpath c = (Classpath) unmarshaller.unmarshal(classpathFile); - classpath.addAll(c.getClasspathElements()); - } - catch (JAXBException ex) - { - throw new RuntimeException(ex); - } + Classpath c = (Classpath) unmarshaller.unmarshal(classpathFile); + + classpath.addAll(c.getClasspathElements()); + } + catch (JAXBException ex) + { + throw new RuntimeException(ex); + } } /** @@ -430,16 +431,18 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo Classpath c = new Classpath(); c.setClasspathElements(classpath); - try - { - JAXBContext context = JAXBContext.newInstance(Classpath.class); + + try + { + JAXBContext context = JAXBContext.newInstance(Classpath.class); Marshaller marshaller = context.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - marshaller.marshal(c, classpathFile); - } - catch (JAXBException ex) - { - throw new RuntimeException(ex); - } + + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + marshaller.marshal(c, classpathFile); + } + catch (JAXBException ex) + { + throw new RuntimeException(ex); + } } } diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java index c83c986a69..fafd8b8a24 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java @@ -117,6 +117,17 @@ public class RunMojo extends AbstractBaseScmMojo return port; } + /** + * Method description + * + * + * @return + */ + public String getStage() + { + return stage; + } + /** * Method description * @@ -219,6 +230,17 @@ public class RunMojo extends AbstractBaseScmMojo this.port = port; } + /** + * Method description + * + * + * @param stage + */ + public void setStage(String stage) + { + this.stage = stage; + } + /** * Method description * @@ -258,6 +280,8 @@ public class RunMojo extends AbstractBaseScmMojo try { System.setProperty("scm.home", scmHome); + System.setProperty("scm.stage", stage); + System.out.println("SET STAGE " + stage); // enable debug logging System.setProperty("logback.configurationFile", loggginConfiguration); @@ -318,6 +342,11 @@ public class RunMojo extends AbstractBaseScmMojo */ private int port = 8081; + /** + * @parameter expression="${scm.stage}" default-value="DEVELOPMENT" + */ + private String stage = "DEVELOPMENT"; + /** * @parameter */