Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/maven-hudson-dev-plugin
  Commit: 38d2f17500f6e4ef0328027169a4356d31a96938
      
https://github.com/jenkinsci/maven-hudson-dev-plugin/commit/38d2f17500f6e4ef0328027169a4356d31a96938
  Author: Kohsuke Kawaguchi <[email protected]>
  Date:   2016-02-21 (Sun, 21 Feb 2016)

  Changed paths:
    M pom.xml
    A src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyStartMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
    A 
src/main/java/org/eclipse/jetty/maven/plugin/MavenQuickStartConfiguration.java
    A src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java
    A src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
    A src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java
    A src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
    A src/main/java/org/eclipse/jetty/maven/plugin/PluginLog.java
    A src/main/java/org/eclipse/jetty/maven/plugin/ScanTargetPattern.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SelectiveJarResource.java
    A src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SystemProperties.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SystemProperty.java
    A src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/package-info.java
    R src/main/java/org/mortbay/jetty/plugin/AbstractJettyMojo.java
    R src/main/java/org/mortbay/jetty/plugin/ConsoleScanner.java
    R src/main/java/org/mortbay/jetty/plugin/JettyDeployWar.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunForkedMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunWarExplodedMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunWarMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyServer.java
    R src/main/java/org/mortbay/jetty/plugin/JettyStartMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyStopMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyWebAppContext.java
    R src/main/java/org/mortbay/jetty/plugin/MavenAnnotationConfiguration.java
    R src/main/java/org/mortbay/jetty/plugin/MavenWebInfConfiguration.java
    R src/main/java/org/mortbay/jetty/plugin/Monitor.java
    R src/main/java/org/mortbay/jetty/plugin/PluginLog.java
    R src/main/java/org/mortbay/jetty/plugin/ScanTargetPattern.java
    R src/main/java/org/mortbay/jetty/plugin/Starter.java
    R src/main/java/org/mortbay/jetty/plugin/SystemProperties.java
    R src/main/java/org/mortbay/jetty/plugin/SystemProperty.java

  Log Message:
  -----------
  Imported 9.2.15.v20160210

From
https://github.com/eclipse/jetty.project/tree/jetty-9.2.15.v20160210


  Commit: 8948f5f8d86eb77b33f1a4d039c7bbeced26c3aa
      
https://github.com/jenkinsci/maven-hudson-dev-plugin/commit/8948f5f8d86eb77b33f1a4d039c7bbeced26c3aa
  Author: Kohsuke Kawaguchi <[email protected]>
  Date:   2016-02-21 (Sun, 21 Feb 2016)

  Changed paths:
    R deploy.sh

  Log Message:
  -----------
  this module is using maven release plugin now


  Commit: ceacac5a603716ad5ff75efdbe64aeccb7541e45
      
https://github.com/jenkinsci/maven-hudson-dev-plugin/commit/ceacac5a603716ad5ff75efdbe64aeccb7541e45
  Author: Kohsuke Kawaguchi <[email protected]>
  Date:   2016-02-21 (Sun, 21 Feb 2016)

  Changed paths:
    M pom.xml
    A src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyStartMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
    A src/main/java/org/eclipse/jetty/maven/plugin/MaskingClassLoader.java
    A 
src/main/java/org/eclipse/jetty/maven/plugin/MavenQuickStartConfiguration.java
    A src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java
    A src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
    A src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java
    A src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
    A src/main/java/org/eclipse/jetty/maven/plugin/PluginLog.java
    A src/main/java/org/eclipse/jetty/maven/plugin/ScanTargetPattern.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SelectiveJarResource.java
    A src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SystemProperties.java
    A src/main/java/org/eclipse/jetty/maven/plugin/SystemProperty.java
    A src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
    A src/main/java/org/eclipse/jetty/maven/plugin/package-info.java
    R src/main/java/org/mortbay/jetty/plugin/AbstractJettyMojo.java
    R src/main/java/org/mortbay/jetty/plugin/ConsoleScanner.java
    R src/main/java/org/mortbay/jetty/plugin/JettyDeployWar.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunForkedMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunWarExplodedMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyRunWarMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyServer.java
    R src/main/java/org/mortbay/jetty/plugin/JettyStartMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyStopMojo.java
    R src/main/java/org/mortbay/jetty/plugin/JettyWebAppContext.java
    R src/main/java/org/mortbay/jetty/plugin/MaskingClassLoader.java
    R src/main/java/org/mortbay/jetty/plugin/MavenAnnotationConfiguration.java
    R src/main/java/org/mortbay/jetty/plugin/MavenWebInfConfiguration.java
    R src/main/java/org/mortbay/jetty/plugin/Monitor.java
    R src/main/java/org/mortbay/jetty/plugin/PluginLog.java
    R src/main/java/org/mortbay/jetty/plugin/ScanTargetPattern.java
    R src/main/java/org/mortbay/jetty/plugin/Starter.java
    R src/main/java/org/mortbay/jetty/plugin/SystemProperties.java
    R src/main/java/org/mortbay/jetty/plugin/SystemProperty.java

  Log Message:
  -----------
  Merge branch 'incoming'

Conflicts:
        src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java


Compare: 
https://github.com/jenkinsci/maven-hudson-dev-plugin/compare/b6b7b164fbd9...ceacac5a6037

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to