Commit Graph
25 Commits
Author SHA1 Message Date
Tom Page c453a64143 Merge master into release/V2.0.x. 2020-01-23 09:28:29 +00:00
Tom Page f708f89bb2 SEARCH-2067 Try fixing integration test order as alphabetical.
Some of our integration tests fail if they are run after other tests.
2020-01-22 15:02:10 +00:00
Tom Page 783f4af2e7 Merge master into V2.0.x. 2019-12-20 11:01:06 +00:00
Tom Page 0bda0f928c SEARCH-1974 SEARCH-1975 Upgrade to Solr 6.6.5-patched.2.
This includes later versions of commons-fileupload and bcprov.
2019-11-27 08:28:35 +00:00
Tom Page d5106cf423 Merge master into release/V2.0.x. 2019-11-06 13:41:37 +00:00
Tom Page 0a5d7dda67 Merge branch 'feature/SEARCH-1763_ExtractIntegrationTests' into 'master'
Feature/search 1763 extract integration tests

See merge request search_discovery/insightengine!208
2019-11-06 11:01:51 +00:00
Tom Page e450152807 SEARCH-1906 Upgrade to solr 6.6.5-patched.1.
This contains the upgrade to Jetty 9.3.27.v20190418.
2019-11-04 16:29:20 +00:00
Tom Page 5a0e9a66ee SEARCH-1763 Ensure we run renamed integration tests during integration-test phase. 2019-11-01 11:18:14 +00:00
Tom Page d7daf09904 Make e2e test a submodule of the main project.
This cannot be done on some older branches as the java versions are
different, but on master everything is Java 11.

Also fix target version to be Java 11, so that IDEs pick the right
version of Java when running tests.
2019-09-16 09:09:12 +01:00
Tom Page 17ad0455f0 Use the maven compiler plugin to tell IDEs what version of Java to use. 2019-09-12 08:57:45 +01:00
Tom Page b0154af4ab Merge master into release/V2.0.x. 2019-09-06 11:46:19 +01:00
Angel Borroy 0feafa51df Merge branch 'fix/SEARCH-1827_BugsRankedD' into 'master'
Fix/search 1827 bugs ranked d

See merge request search_discovery/insightengine!146
2019-09-02 08:16:36 +01:00
Angel Borroy eba5581355 Remove class to use local AtomicInteger property. 2019-08-28 15:15:41 +02:00
Tom Page 460226d0da Update version to 1.5.0-SNAPSHOT. 2019-08-27 15:02:35 +01:00
bamboo_auth 81a4717c51 [maven-release-plugin] prepare release 1.1.0 2019-08-19 10:41:13 +00:00
Tom Page d743cec51a Update version to 1.5.0-SNAPSHOT. 2019-08-09 08:29:42 +01:00
Tom Page 797a932ce2 SEARCH-1748 Ensure we get libs from patched Solr. 2019-07-22 16:15:10 +01:00
Angel Borroy 2aa674923f Revert "[maven-release-plugin] prepare release 1.4.0-RC1"
This reverts commit d525200edee6a2198530b279e78e43bd523843d0.
2019-07-12 15:07:42 +02:00
bamboo_auth 7c6f1a7500 [maven-release-plugin] prepare release 1.4.0-RC1 2019-07-12 11:52:33 +00:00
bamboo_auth a9bcdc93c2 [maven-release-plugin] prepare for next development iteration 2019-06-04 14:23:44 +00:00
bamboo_auth 1b5120d0ca [maven-release-plugin] prepare release 1.4.0-RC1 2019-06-04 14:23:41 +00:00
Tom Page 68517bffee Merge master into release/alfresco-search-serices/V2.0.x to create release/V2.0.x. 2019-05-28 09:39:42 +01:00
Tom Page 03dcc0a9e8 SEARCH-1625 Unify distribution and SCM management. 2019-05-23 06:32:02 +01:00
Tom Page ca66ed0af7 Set master version to 1.4.0-SNAPSHOT. 2019-05-22 08:30:41 +01:00
Tom Page 39f3f5fbcb Merge history of SearchServices 1.4.0-IE1.2-1 and InsightEngine master.
Also updating SearchServices version to 1.4.0-IE1.2.0-SNAPSHOT.
2019-05-22 08:30:34 +01:00