Skip to content

Commit

Permalink
Merge pull request #95 from xenit-eu/DOCKER-438-h
Browse files Browse the repository at this point in the history
DOCKER-438 add back solr 2.0.6
  • Loading branch information
thijslemmens authored Oct 23, 2023
2 parents f5c1de7 + 536d4b8 commit 42b8ff1
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased
### Added
* [DOCKER-438] DOCKER-438 add back solr 2.0.6 [#95]

### Added
* [DOCKER-438] upgrade solr from 2.0.6 to 2.0.8.1 [#91]

Expand Down
4 changes: 4 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@ def includeProject(String folder,String flavor, String version) {

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.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.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.1')
includeProject('xenit','solr6','alfresco-search-services-enterprise-1.4.3.4')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.8.1')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.6')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ext {
solr = [
version: [
major: 2,
minor: 0,
rev: '6'
],
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.6', ext: 'zip'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ext {
solr = [
version: [
major: 2,
minor: 0,
rev: '6'
],
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:6.2.2'
tests = true
testsShardedNonSsl = true
}
dependencies {
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.6', 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 42b8ff1

Please sign in to comment.