Skip to content

Commit

Permalink
Merge pull request #108 from xenit-eu/DOCKER-456
Browse files Browse the repository at this point in the history
DOCKER-456 [Add] Solr V2.0.9.1
  • Loading branch information
codingBenVdS authored Jul 26, 2024
2 parents 5377634 + 453974e commit 584fbb3
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased
### Added
* [DOCKER-456] upgrade solr from 2.0.8.1 to 2.0.9.1 [#108]
* [DOCKER-441] improve solr backup documentation and add new env variable for backup and ALFRESCO_SECRET [#97]
* [DOCKER-440] replace 2.0.8.1 with 2.0.8.2 [#96]
* [DOCKER-438] DOCKER-438 add back solr 2.0.6 [#95]
* [DOCKER-438] upgrade solr from 2.0.6 to 2.0.8.1 [#91]

[#108]: https://github.com/xenit-eu/docker-solr/pull/108
[#96]: https://github.com/xenit-eu/docker-solr/pull/97
[#96]: https://github.com/xenit-eu/docker-solr/pull/96
[#95]: https://github.com/xenit-eu/docker-solr/pull/95
Expand Down
6 changes: 5 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@ if (includeCommunity == 'true') {
includeProject('upstream','solr6','alfresco-search-services-community-1.4.3.4')
includeProject('upstream','solr6','alfresco-search-services-community-2.0.6')
includeProject('upstream','solr6','alfresco-search-services-community-2.0.8.2')
includeProject('upstream','solr6','alfresco-search-services-community-2.0.9.1')
includeProject('xenit','solr6','alfresco-search-services-community-1.4.3.4')
includeProject('xenit','solr6','alfresco-search-services-community-2.0.6')
includeProject('xenit','solr6','alfresco-search-services-community-2.0.8.2')
includeProject('xenit','solr6','alfresco-search-services-community-2.0.9.1')
}

if (includeEnterprise == 'true') {
includeProject('upstream','solr6','alfresco-search-services-enterprise-1.4.3.4')
includeProject('upstream','solr6','alfresco-search-services-enterprise-2.0.6')
includeProject('upstream','solr6','alfresco-search-services-enterprise-2.0.8.2')
includeProject('upstream','solr6','alfresco-search-services-enterprise-2.0.9.1')
includeProject('xenit','solr6','alfresco-search-services-enterprise-1.4.3.4')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.8.2')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.6')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.8.2')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.9.1')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ext {
solr = [
version: [
major: 2,
minor: 0,
rev: '9.1'
],
flavor: 'solr6'
]
alfrescoimage ='docker.io/xenit/alfresco-repository-community:6.2'
tests = true
}
dependencies {
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.9.1', ext: 'zip'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ext {
solr = [
version: [
major: 2,
minor: 0,
rev: '9.1'
],
flavor: 'solr6'
]
// default integrationTests (using SSL) is failing when using ACS >= 6.2.1, fallback to 6.2.0
// alfrescoimage ='private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19'
// alfrescoimage ='private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:23.2.0.1'
alfrescoimage ='private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2'
tests = true
testsShardedNonSsl = true
}
dependencies {
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.9.1', ext: 'zip'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ext {
tests = true
// since s.s. 2.0.3 SSL is required
tests_use_ssl = true
composeFiles = ["$composeDir/docker-compose-alfresco.yml",
"$composeDir/docker-compose-solr.yml",
"$composeDir/docker-compose-db.yml"];
}
dependencies {
telemetry group: 'eu.xenit.alfred.telemetry', name: 'alfred-telemetry-solr6', version: "${alfredTelemetryVersion}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ext {
tests = true
// since s.s. 2.0.3 SSL is required
tests_use_ssl = true
composeFiles = ["$composeDir/docker-compose-alfresco.yml",
"$composeDir/docker-compose-solr.yml",
"$composeDir/docker-compose-db.yml"];
}
dependencies {
telemetry group: 'eu.xenit.alfred.telemetry', name: 'alfred-telemetry-solr6', version: "${alfredTelemetryVersion}"
}

0 comments on commit 584fbb3

Please sign in to comment.