Skip to content

Commit

Permalink
Merge pull request #96 from xenit-eu/DOCKER-440
Browse files Browse the repository at this point in the history
  • Loading branch information
wimfabri authored Oct 26, 2023
2 parents 42b8ff1 + d916a7a commit af3870a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
11 changes: 7 additions & 4 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-440] replace 2.0.8.1 with 2.0.8.2

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

Expand All @@ -26,8 +29,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Removed
* [DOCKER-391] Deprecate solr1 [#57]

[#57]: https://github.com/xenit-eu/docker-solr/pull/57
[#57]: https://github.com/xenit-eu/docker-solr/pull/57

### Added
* [DOCKER-404] Alfresco search services 2.0.2.2 [#64]
* [ALFREDOPS-784] Released version of solr-backup [#55]
Expand All @@ -43,7 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
[#52]: https://github.com/xenit-eu/docker-solr/pull/52
[#50]: https://github.com/xenit-eu/docker-solr/pull/50

[#40]: https://github.com/xenit-eu/docker-solr/pull/40
[#40]: https://github.com/xenit-eu/docker-solr/pull/40
[#41]: https://github.com/xenit-eu/docker-solr/pull/41

[#49]: https://github.com/xenit-eu/docker-solr/pull/49
Expand Down Expand Up @@ -71,7 +74,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

[#39]: https://github.com/xenit-eu/docker-solr/pull/39
[#37]: https://github.com/xenit-eu/docker-solr/pull/37

## [v1.1.0] - 2020-12-14 New versions, refactorings
### Added
* [DOCKER-360] Alfresco-search-services-2.0.0
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ 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('upstream','solr6','alfresco-search-services-community-2.0.8.2')
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')
includeProject('xenit','solr6','alfresco-search-services-community-2.0.8.2')
}

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('upstream','solr6','alfresco-search-services-enterprise-2.0.8.2')
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.8.2')
includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.6')
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ ext {
version: [
major: 2,
minor: 0,
rev: '8.1'
rev: '8.2'
],
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.8.1', ext: 'zip'
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.8.2', ext: 'zip'
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ext {
version: [
major: 2,
minor: 0,
rev: '8.1'
rev: '8.2'
],
flavor: 'solr6'
]
Expand All @@ -14,5 +14,5 @@ ext {
testsShardedNonSsl = true
}
dependencies {
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.8.1', ext: 'zip'
runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.8.2', ext: 'zip'
}

0 comments on commit af3870a

Please sign in to comment.