Branch: refs/heads/master Home: https://github.com/windup/windup Commit: 514829baba5ed9be84bc94fa9fc91bbbc291bb9e https://github.com/windup/windup/commit/514829baba5ed9be84bc94fa9fc91bbbc... Author: Matej Briskar <mbriskar(a)gmail.com&gt; Date: 2015-09-21 (Mon, 21 Sep 2015) Changed paths: A rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/CleanFromMultipleSourceFiles.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/DecompileClassesRuleProvider.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/FernflowerDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/ProcyonDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaSourceFileModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/IndexJavaSourceFilesRuleProvider.java A test-files/rexster/rexster-onlyclasses/classes/org/jboss/windup/graph/rexster/RexsterInitializer.class A test-files/rexster/rexster-onlyclasses/readme.txt A test-files/rexster/rexster-onlyclasses/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/windup-rexster-2.4.0-SNAPSHOT.jar A tests/src/test/java/org/jboss/windup/tests/application/WindupCompiledWithSourceTest.java Log Message: ----------- WINDUP-770: When .class file and .java files are both present in package, only use one for analysis Commit: 4d85ff4ffdd8a238c29348765f8e37330e3c3cc3 https://github.com/windup/windup/commit/4d85ff4ffdd8a238c29348765f8e37330... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-09-21 (Mon, 21 Sep 2015) Changed paths: A rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/CleanFromMultipleSourceFiles.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/DecompileClassesRuleProvider.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/FernflowerDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/ProcyonDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaSourceFileModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/IndexJavaSourceFilesRuleProvider.java A test-files/rexster/rexster-onlyclasses/classes/org/jboss/windup/graph/rexster/RexsterInitializer.class A test-files/rexster/rexster-onlyclasses/readme.txt A test-files/rexster/rexster-onlyclasses/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/windup-rexster-2.4.0-SNAPSHOT.jar A tests/src/test/java/org/jboss/windup/tests/application/WindupCompiledWithSourceTest.java Log Message: ----------- Merge branch 'WINDUP-770' of https://github.com/mbriskar/windup into mbriskar-WINDUP-770 Commit: 6fd8b922a4d6e4e5d1d3722604d2b3d2dff44713 https://github.com/windup/windup/commit/6fd8b922a4d6e4e5d1d3722604d2b3d2d... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: M graph/api/src/main/java/org/jboss/windup/graph/model/ArchiveModel.java M graph/api/src/main/java/org/jboss/windup/graph/model/ProjectModel.java M graph/impl/src/main/java/org/jboss/windup/graph/GraphContextImpl.java M reporting/api/src/main/java/org/jboss/windup/reporting/model/TechnologyTagModel.java M reporting/api/src/main/java/org/jboss/windup/reporting/service/TechnologyTagService.java M rules-base/tests/src/test/java/org/jboss/windup/rules/apps/condition/FileContentTest.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/CleanFromMultipleSourceFiles.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/DecompileClassesRuleProvider.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/FernflowerDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/ProcyonDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaSourceFileModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/IndexJavaSourceFilesRuleProvider.java M rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/ClassMetadataTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/scan/ast/ASTProcessorIntegrationTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassBindingStatusTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassCompositeTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassSourceMatchTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassWithoutClassificationTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassWithoutHintTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassXmlRulesTest.java M rules-xml/tests/src/test/java/org/jboss/windup/rules/xml/XmlAndJavaParameterizedTest.java A test-files/rexster/jar-with-source-and-class/rexster.jar M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureSmallBinaryModeTest.java M tests/src/test/java/org/jboss/windup/tests/application/WindupCompiledWithSourceTest.java Log Message: ----------- WINDUP-770: Tweaked to deal with the scenario of java source files and .class files in the same jar (same directory) Commit: 65853850396798eb52fa23526beaf4d46cc52517 https://github.com/windup/windup/commit/65853850396798eb52fa23526beaf4d46... Author: Jesse Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: M graph/api/src/main/java/org/jboss/windup/graph/model/ArchiveModel.java M graph/api/src/main/java/org/jboss/windup/graph/model/ProjectModel.java M graph/impl/src/main/java/org/jboss/windup/graph/GraphContextImpl.java M reporting/api/src/main/java/org/jboss/windup/reporting/model/TechnologyTagModel.java M reporting/api/src/main/java/org/jboss/windup/reporting/service/TechnologyTagService.java M rules-base/tests/src/test/java/org/jboss/windup/rules/apps/condition/FileContentTest.java A rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/CleanFromMultipleSourceFiles.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/DecompileClassesRuleProvider.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/FernflowerDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/decompiler/ProcyonDecompilerOperation.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/JavaSourceFileModel.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/IndexJavaSourceFilesRuleProvider.java M rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/ClassMetadataTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/apps/java/scan/ast/ASTProcessorIntegrationTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassBindingStatusTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassCompositeTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassSourceMatchTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassWithoutClassificationTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassWithoutHintTest.java M rules-java/tests/src/test/java/org/jboss/windup/rules/java/JavaClassXmlRulesTest.java M rules-xml/tests/src/test/java/org/jboss/windup/rules/xml/XmlAndJavaParameterizedTest.java A test-files/rexster/jar-with-source-and-class/rexster.jar A test-files/rexster/rexster-onlyclasses/classes/org/jboss/windup/graph/rexster/RexsterInitializer.class A test-files/rexster/rexster-onlyclasses/readme.txt A test-files/rexster/rexster-onlyclasses/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/src/main/java/org/jboss/windup/graph/rexster/RexsterInitializer.java A test-files/rexster/rexster-with-jar/rexster/windup-rexster-2.4.0-SNAPSHOT.jar M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureSmallBinaryModeTest.java A tests/src/test/java/org/jboss/windup/tests/application/WindupCompiledWithSourceTest.java Log Message: ----------- Merge pull request #692 from jsight/mbriskar-WINDUP-770 WINDUP-770 (source and .class in the same place) continued Compare: https://github.com/windup/windup/compare/3ab688a599ab...658538503967