[jenkinsci/stepcounter-plugin] 8b0c5c: stepcounter3.0.3に対応

Sun, 26 Jun 2016 20:15:09 -0700 

  Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/stepcounter-plugin
  Commit: 8b0c5cd0eda67a81278763356ba4d50db1c958a9
      
https://github.com/jenkinsci/stepcounter-plugin/commit/8b0c5cd0eda67a81278763356ba4d50db1c958a9
  Author: takuma02141978 <[email protected]>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M .classpath
    M .project
    M .settings/org.eclipse.core.resources.prefs
    M .settings/org.eclipse.jdt.core.prefs
    R lib/build-count.xml
    R lib/commons-logging-1.1.jar
    R lib/fisshplate-0.1.4.jar
    R lib/grouplayout.jar
    R lib/log4j-1.2.12.jar
    R lib/ognl-2.6.9-patch-20090427.jar
    R lib/org.apache.commons.jrcs.diff.jar
    R lib/poi-3.2-FINAL.jar
    R lib/stepcounter.jar
    R lib/swingx-1.6.jar
    M pom.xml
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterResultAction.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/CSVStepCounterFileParser.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
    M src/main/java/org/jenkinsci/plugins/stepcounter/util/FileFinder.java
    M src/main/java/tk/stepcounter/AreaComment.java
    M src/main/java/tk/stepcounter/DefaultStepCounter.java
    M src/main/java/tk/stepcounter/Main.java
    M src/main/java/tk/stepcounter/PythonCounter.java
    M src/main/java/tk/stepcounter/StepCounter.java
    M src/main/java/tk/stepcounter/StepCounterFactory.java
    M src/main/java/tk/stepcounter/diffcount/Cutter.java
    M src/main/java/tk/stepcounter/diffcount/CutterFactory.java
    M src/main/java/tk/stepcounter/diffcount/DiffCounter.java
    M src/main/java/tk/stepcounter/diffcount/DiffCounterUtil.java
    M src/main/java/tk/stepcounter/diffcount/FileComparator.java
    M src/main/java/tk/stepcounter/diffcount/diff/IDiffHandler.java
    M src/main/java/tk/stepcounter/diffcount/object/AbstractDiffResult.java
    M src/main/java/tk/stepcounter/diffcount/object/DiffFileResult.java
    M src/main/java/tk/stepcounter/diffcount/object/DiffFolderResult.java
    M src/main/java/tk/stepcounter/diffcount/object/DiffStatus.java

  Log Message:
  -----------
  stepcounter3.0.3に対応


  Commit: 3f0efc3786ac0eec219dc35501c871527cfdbd48
      
https://github.com/jenkinsci/stepcounter-plugin/commit/3f0efc3786ac0eec219dc35501c871527cfdbd48
  Author: takuma02141978 <[email protected]>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    A src/main/java/org/jenkinsci/plugins/stepcounter/util/Util.java

  Log Message:
  -----------
  追加


  Commit: d1f3c63b526f84a57b7eb0cdb098cb0f70f61444
      
https://github.com/jenkinsci/stepcounter-plugin/commit/d1f3c63b526f84a57b7eb0cdb098cb0f70f61444
  Author: takuma02141978 <[email protected]>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M .classpath
    M .settings/org.eclipse.jdt.core.prefs
    M pom.xml
    A src/main/java/org/jenkinsci/plugins/stepcounter/FileSetting.java
    M src/main/java/org/jenkinsci/plugins/stepcounter/StepCounter.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterResultAction.java
    A 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/OriginalStepCounterFactory.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/floatingBox.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain.jelly

  Log Message:
  -----------
  ファイル出力オプション追加


  Commit: a52b206d39836c53a77c736bd733b0de29c7155c
      
https://github.com/jenkinsci/stepcounter-plugin/commit/a52b206d39836c53a77c736bd733b0de29c7155c
  Author: takuma02141978 <[email protected]>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M .settings/org.eclipse.core.resources.prefs
    R src/main/java/tk/stepcounter/AreaComment.java
    R src/main/java/tk/stepcounter/CountResult.java
    R src/main/java/tk/stepcounter/DefaultStepCounter.java
    R src/main/java/tk/stepcounter/Main.java
    R src/main/java/tk/stepcounter/PythonCounter.java
    R src/main/java/tk/stepcounter/StepCounter.java
    R src/main/java/tk/stepcounter/StepCounterFactory.java
    R src/main/java/tk/stepcounter/Util.java
    R src/main/java/tk/stepcounter/diffcount/Cutter.java
    R src/main/java/tk/stepcounter/diffcount/CutterFactory.java
    R src/main/java/tk/stepcounter/diffcount/DiffCounter.java
    R src/main/java/tk/stepcounter/diffcount/DiffCounterUtil.java
    R src/main/java/tk/stepcounter/diffcount/DiffSource.java
    R src/main/java/tk/stepcounter/diffcount/FileComparator.java
    R src/main/java/tk/stepcounter/diffcount/Main.java
    R src/main/java/tk/stepcounter/diffcount/diff/DiffEngine.java
    R src/main/java/tk/stepcounter/diffcount/diff/IDiffHandler.java
    R src/main/java/tk/stepcounter/diffcount/object/AbstractDiffResult.java
    R src/main/java/tk/stepcounter/diffcount/object/DiffFileResult.java
    R src/main/java/tk/stepcounter/diffcount/object/DiffFolderResult.java
    R src/main/java/tk/stepcounter/diffcount/object/DiffStatus.java

  Log Message:
  -----------
  不要になったファイルを削除


  Commit: 8519fda78abe823ede57a45b26be787dfe1142b6
      
https://github.com/jenkinsci/stepcounter-plugin/commit/8519fda78abe823ede57a45b26be787dfe1142b6
  Author: takuma02141978 <[email protected]>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M .classpath
    M .gitignore
    M .settings/org.eclipse.core.resources.prefs
    R .settings/org.eclipse.m2e.core.prefs
    R README
    A README.md
    M pom.xml
    M src/main/java/org/jenkinsci/plugins/stepcounter/StepCounter.java
    R src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterFileParser.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterFileParserFactory.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterResultAction.java
    M src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterSetting.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/CSVStepCounterFileParser.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/XMLStepCounterFileParser.java
    A src/main/java/org/jenkinsci/plugins/stepcounter/util/PathUtil.java
    R src/main/java/org/jenkinsci/plugins/stepcounter/util/Util.java
    A src/main/resources/org/jenkinsci/plugins/stepcounter/Messages.properties
    A 
src/main/resources/org/jenkinsci/plugins/stepcounter/Messages_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/help_ja.html
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/floatingBox.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/floatingBox_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain.jelly
    A 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/result.jelly
    A 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/result_ja.properties
    R 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/summary.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterSetting/config.jelly
    R 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterSetting/config.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterSetting/config_ja.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into local

Conflicts:
        .classpath
        .project
        .settings/org.eclipse.core.resources.prefs
        .settings/org.eclipse.jdt.core.prefs
        pom.xml
        
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction.java
        
src/main/java/org/jenkinsci/plugins/stepcounter/parser/CSVStepCounterFileParser.java
        
src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
        
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.jelly
        
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.properties
        
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config_ja.properties
        
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain.jelly


  Commit: f8376235cfa664c94af22079e127c397f4d74105
      
https://github.com/jenkinsci/stepcounter-plugin/commit/f8376235cfa664c94af22079e127c397f4d74105
  Author: Takuma Ishibashi <[email protected]>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    A .classpath
    A .project
    A .settings/org.eclipse.core.resources.prefs
    A .settings/org.eclipse.jdt.core.prefs
    M pom.xml
    A src/main/java/org/jenkinsci/plugins/stepcounter/FileSetting.java
    M src/main/java/org/jenkinsci/plugins/stepcounter/StepCounter.java
    R src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterFileParser.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterFileParserFactory.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/StepCounterResultAction.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/CSVStepCounterFileParser.java
    A 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/OriginalStepCounterFactory.java
    M 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
    R 
src/main/java/org/jenkinsci/plugins/stepcounter/parser/XMLStepCounterFileParser.java
    M src/main/java/org/jenkinsci/plugins/stepcounter/util/FileFinder.java
    M src/main/resources/org/jenkinsci/plugins/stepcounter/Messages.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/Messages_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.jelly
    A 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/config_ja.properties
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounter/help_ja.html
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/floatingBox.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain.jelly
    M 
src/main/resources/org/jenkinsci/plugins/stepcounter/StepCounterProjectAction/jobMain_ja.properties

  Log Message:
  -----------
  Merge pull request #4 from jenkinsci/local

ようやく・・


Compare: 
https://github.com/jenkinsci/stepcounter-plugin/compare/e76e9aa8b88a...f8376235cfa6

-- 
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