[ https://issues.apache.org/jira/browse/MINDEXER-100?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15931903#comment-15931903 ]
Simon Spero commented on MINDEXER-100: -------------------------------------- The following commits are in 5.x, but are not in master. {code:title=git log --reverse upstream/master..upstream/maven-indexer-5.x} commit 7a0e7ad3d92fc121c2c1e49414d2c1099d945db4 Author: Tamas Cservenak <ta...@cservenak.net> Date: Sat Oct 31 00:10:13 2015 +0100 MINDEXER-94: Temp file cleanup on errors commit 0f1724507b9035d0dd855d2a4f8e2f75c01db277 Author: Tamas Cservenak <ta...@cservenak.net> Date: Sat Oct 31 01:05:08 2015 +0100 Add Idea iml files to rat exclude commit c193888287ca04a7e6038dddf596b13124769180 Author: Tamas Cservenak <ta...@cservenak.net> Date: Sat Oct 31 01:15:45 2015 +0100 MINDEXER-95: Suboptimal indexing execution in updater commit af8783d8fc8dcab6ef6d9a17d04858fd725037a0 Author: Tamas Cservenak <ta...@cservenak.net> Date: Sat Oct 31 01:29:30 2015 +0100 MINDEXER-96: Indexer reader commit b9c4d90810b6174a1851c179ffebf2c3456c4c66 Author: Tamas Cservenak <ta...@cservenak.net> Date: Tue Nov 3 12:28:41 2015 +0100 Added index writer, that writes single chunk for now commit 5c75bbac75a420ed19327c4300eaa6cfbbd771ad Author: Tamas Cservenak <ta...@cservenak.net> Date: Tue Nov 3 14:23:32 2015 +0100 MINDEXER-96: Indexer reader and writer commit be227e284d81507d3f67e54d39e63af55a6feb24 Author: Tamas Cservenak <ta...@cservenak.net> Date: Tue Nov 3 16:38:26 2015 +0100 INDEXER-96: Fix iterators commit c3431b6e84c39a2e4f56fe33e888702f826c701c Author: Tamas Cservenak <csta...@slartibartfast.cservenak.net> Date: Thu Nov 5 10:53:26 2015 +0100 Cleanup commit 4c5d1d61e9691473053551dee7645ebf0873bb26 Author: Tamas Cservenak <csta...@slartibartfast.cservenak.net> Date: Thu Nov 5 13:53:34 2015 +0100 Make the reader an osgi bundle commit 4333789f769e3441ba133207294aae4d3f6a2eb9 Author: Tamas Cservenak <csta...@slartibartfast.cservenak.net> Date: Thu Nov 5 15:36:13 2015 +0100 rename helper class to avoid name clash with other utilities commit ea1205e85f3325263b5319fe6ae9e255733084d0 Author: Tamas Cservenak <ta...@cservenak.net> Date: Wed Nov 11 21:11:06 2015 +0100 Fix classifier separator commit e0570bff5c60604115ab7ad0d5498055a60fc772 Author: Tamas Cservenak <ta...@cservenak.net> Date: Thu Nov 12 11:30:50 2015 +0100 Remove Transform, let user use any lib it wants to for iterable manipulation Also, UTs got new TestUtils based on Guava {code} > Forward port changes in 5.1.2-SNAPSHOT (maven-indexer-5.x) to 6.0.0-SNAPSHOT > (master) > ------------------------------------------------------------------------------------- > > Key: MINDEXER-100 > URL: https://issues.apache.org/jira/browse/MINDEXER-100 > Project: Maven Indexer > Issue Type: Task > Affects Versions: 5.1.2, 6.0 > Reporter: Simon Spero > Fix For: 6.0 > > > The master branch and the 5.x branch have diverged, with new components like > the index-reader module not included in master. > > I have submitted github pull requests against the 5.x (MINDEXER-97) which > should also be included in master. > Commits 5.x made since the divergence from master should be reviewed, and > forward ported to master if still relevant -- This message was sent by Atlassian JIRA (v6.3.15#6346)