Branch: refs/heads/master Home: https://github.com/windup/windup Commit: 8e0173c6e736dab3b4b63d7da65d4f34b5ab0157 https://github.com/windup/windup/commit/8e0173c6e736dab3b4b63d7da65d4f34b... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2014-09-02 (Tue, 02 Sep 2014) Changed paths: R rules/app/java-decompiler/pom.xml R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/DecompileArchivesRuleProvider.java R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/DecompilerRuleMetadata.java R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/ProcyonDecompilerOperation.java R rules/app/java-decompiler/src/main/resources/META-INF/beans.xml M rules/app/java-ee/pom.xml M rules/app/java/pom.xml A rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/binary/DecompileArchivesRuleProvider.java A rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/binary/ProcyonDecompilerOperation.java M rules/app/java/src/test/java/org/jboss/windup/rules/java/JavaClassTest.java M rules/pom.xml M rules/server/java-ee-server/pom.xml M tests/core/pom.xml M tests/core/src/test/java/org/jboss/windup/tests/application/WindupRuleMetadataTest.java Log Message: ----------- WINDUP-258: merge java-decompiler into rules-java Commit: 0b20725610569a05087b8dde066a54a9d6f47d8e https://github.com/windup/windup/commit/0b20725610569a05087b8dde066a54a9d... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2014-09-02 (Tue, 02 Sep 2014) Changed paths: M config/api/src/main/java/org/jboss/windup/config/query/QueryBuilderFrom.java M config/api/src/main/java/org/jboss/windup/config/query/QueryBuilderWith.java M config/tests/src/test/java/org/jboss/windup/config/model/TestXmlMetaFacetModel.java M graph/api/src/main/java/org/jboss/windup/graph/service/GraphService.java M graph/api/src/main/java/org/jboss/windup/graph/service/Service.java M reporting/api/src/main/java/org/jboss/windup/reporting/model/FileLocationModel.java M reporting/api/src/main/java/org/jboss/windup/reporting/service/ClassificationService.java M rules/app/java-ee/pom.xml A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbBeanBaseModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbDeploymentDescriptorModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbEntityBeanModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbMessageDrivenModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbSessionBeanModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/EnvironmentReferenceModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/model/WebXmlModel.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbConfigurationXmlRuleProvider.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverWebXmlRuleProvider.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/service/EnvironmentReferenceService.java A rules/app/java-ee/src/main/java/org/jboss/windup/rules/apps/javaee/service/WebXmlService.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/model/JarArchiveModel.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/model/project/MavenProjectModel.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/DiscoverMavenProjectsRuleProvider.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/DiscoverXmlFilesRuleProvider.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/service/DoctypeMetaService.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/service/JavaClassService.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/service/NamespaceService.java A rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/service/XmlFileService.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/maven/dao/MavenModelService.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/xml/DoctypeMetaModel.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/xml/NamespaceMetaModel.java A rules/app/java/src/main/java/org/jboss/windup/rules/apps/xml/XmlFileModel.java R rules/app/java/src/main/java/org/jboss/windup/rules/apps/xml/XmlResourceModel.java M rules/app/java/src/test/java/org/jboss/windup/rules/java/JavaClassTest.java A test-files/src_example/src/main/resources/WEB-INF/web.xml A tests/core/src/test/java/org/jboss/windup/tests/application/WindupArchitectureJEEExampleTest.java M tests/core/src/test/java/org/jboss/windup/tests/application/WindupArchitectureSourceModeTest.java Log Message: ----------- Merge from upstream/master Commit: 8b626d975b20617f4e164a94668c7a7eab223171 https://github.com/windup/windup/commit/8b626d975b20617f4e164a94668c7a7ea... Author: Jesse Sightler <jesse.sightler(a)gmail.com&gt; Date: 2014-09-02 (Tue, 02 Sep 2014) Changed paths: R rules/app/java-decompiler/pom.xml R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/DecompileArchivesRuleProvider.java R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/DecompilerRuleMetadata.java R rules/app/java-decompiler/src/main/java/org/jboss/windup/rules/apps/javadecompiler/ProcyonDecompilerOperation.java R rules/app/java-decompiler/src/main/resources/META-INF/beans.xml M rules/app/java-ee/pom.xml M rules/app/java/pom.xml A rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/binary/DecompileArchivesRuleProvider.java A rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/binary/ProcyonDecompilerOperation.java M rules/app/java/src/test/java/org/jboss/windup/rules/java/JavaClassTest.java M rules/pom.xml M rules/server/java-ee-server/pom.xml M tests/core/pom.xml M tests/core/src/test/java/org/jboss/windup/tests/application/WindupRuleMetadataTest.java Log Message: ----------- Merge pull request #231 from lincolnthree/WINDUP-258 WINDUP-258: merge java-decompiler into rules-java Compare: https://github.com/windup/windup/compare/e6de6ddff5d1...8b626d975b20