Skip to content

Commit 7aa4c37

Browse files
committed
Take into account change of license for Search 7.2.0.Alpha2
1 parent 1f9906d commit 7aa4c37

25 files changed

+82
-7
lines changed

_config/site.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,10 @@ projects:
207207
blog_tag: Hibernate Search
208208
blog_tag_url: hibernate-search
209209
license:
210-
name: LGPL v2.1
211-
url: https://raw.github.com/hibernate/hibernate-search/main/lgpl.txt
210+
name: ASL v2
211+
url: https://raw.github.com/hibernate/hibernate-search/main/LICENSE.txt
212+
# This data is also overridden in relevant series.yml and 7.2.0.Alpha1.yml to display correctly on releases pages
213+
since: "7.2.0.Alpha2"
212214
jira:
213215
key: HSEARCH
214216
github:

_data/projects/search/releases/4.4/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Dynamic index sharding, new Metadata API, Hibernate ORM 4.2.x compatible
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/4.4/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/4.5/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Performance, WildFly 8 compatibility, JPA 2.1 / Hibernate ORM 4.3 compatibility
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/4.5/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.0/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Upgrade to Lucene 4 and much much more ...
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.0/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.1/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Upgrade to Lucene 4 and much much more ...
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.1/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.10/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
summary: ORM 5.3 and JPA 2.2 compatibility, integration to DI frameworks through Hibernate ORM 5.3, upgrade to WildFly 17 and JGroups 4, JPMS automatic module names.
22
status: limited-support
33
displayed: false
4+
license:
5+
name: LGPL v2.1
6+
url: https://raw.github.com/hibernate/hibernate-search/5.10/lgpl.txt
47
links:
58
getting_started_guide:
69
displayed: false

_data/projects/search/releases/5.11/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: ORM 5.4 compatibility.
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.11/lgpl.txt
25
links:
36
getting_started_guide:
47
html: /search/documentation/getting-started/5.11

_data/projects/search/releases/5.2/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Multi-tenancy, optimisations in criteria based loaders
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.2/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.3/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Improved Faceting
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.3/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.4/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Requires Hibernate ORM 5.0.0.Final; Last version compatible with Apache Lucene 4.x
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.4/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.5/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Being maintained as it's included in WildFly. Supports Lucene only, requires Hibernate ORM 5.0.z or 5.1.z
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.5/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.6/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Introduces experimental support for Elasticsearch, last release supporting Hibernate ORM 5.0.z or 5.1.z
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.6/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.7/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Improved integration with Elasticsearch 2.x, compatible with Hibernate ORM 5.2.x
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.7/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.8/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: Experimental integration with Elasticsearch 5.x, AWS integration, improvements and deprecations paving the road to Search 6
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.8/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/5.9/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
summary: JSR 352 (Batch for Java) mass indexing job, WildFly feature packs, improvements and deprecations paving the road to Search 6
2+
license:
3+
name: LGPL v2.1
4+
url: https://raw.github.com/hibernate/hibernate-search/5.9/lgpl.txt
25
links:
36
getting_started_guide:
47
displayed: false

_data/projects/search/releases/6.0/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ summary: >-
22
API overhaul.
33
Safer and more concise Search DSL, more powerful bridges, smarter automatic indexing, nested documents.
44
Upgrades to Lucene 8 and Elasticsearch 7.
5+
license:
6+
name: LGPL v2.1
7+
url: https://raw.github.com/hibernate/hibernate-search/6.0/lgpl.txt
58
links:
69
getting_started_guide:
710
html: https://docs.jboss.org/hibernate/search/{series.version}/reference/en-US/html_single/#getting-started

_data/projects/search/releases/6.1/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ summary: >-
22
Asynchronous, distributed automatic indexing, OpenSearch compatibility, search DSL improvements, conditional mass indexing,
33
ORM 5.6, Lucene 8.11, Elasticsearch 7.16,
44
Jakarta EE artifacts, ORM 6 artifacts.
5+
license:
6+
name: LGPL v2.1
7+
url: https://raw.github.com/hibernate/hibernate-search/6.1/lgpl.txt
58
links:
69
getting_started_guide:
710
html: https://docs.jboss.org/hibernate/search/{series.version}/reference/en-US/html_single/#getting-started

_data/projects/search/releases/6.2/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ summary: >-
88
compatibility with Elasticsearch 8.9 and OpenSearch 2.9,
99
upgrade of `-orm6` artifacts to Hibernate ORM 6.2.
1010
status: limited-support
11+
license:
12+
name: LGPL v2.1
13+
url: https://raw.github.com/hibernate/hibernate-search/6.2/lgpl.txt
1114
maven:
1215
artifacts:
1316
- artifact_id: hibernate-search-mapper-orm-orm6

_data/projects/search/releases/7.0/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ summary: >-
88
dropped compatibility with EOL'd Elasticsearch versions 5.x, 6.x, 7.0-7.9 and OpenSearch versions 1.0-1.2,
99
other bugfixes and improvements
1010
status: limited-support
11+
license:
12+
name: LGPL v2.1
13+
url: https://raw.github.com/hibernate/hibernate-search/7.0/lgpl.txt
1114
maven:
1215
artifacts:
1316
- artifact_id: hibernate-search-bom

_data/projects/search/releases/7.1/series.yml

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ summary: >-
66
compatibility with Elasticsearch 8.12/8.13 and OpenSearch 2.12/2.13,
77
upgrade to Lucene 9.9,
88
other bugfixes, improvements and upgrades
9+
license:
10+
name: LGPL v2.1
11+
url: https://raw.github.com/hibernate/hibernate-search/7.1/lgpl.txt
912
maven:
1013
artifacts:
1114
- artifact_id: hibernate-search-bom

_data/projects/search/releases/7.2/7.2.0.Alpha1.yml

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ summary: >-
99
upgrade to Lucene 9.10,
1010
upgrade to Hibernate ORM 6.5,
1111
other bugfixes, improvements and upgrades
12+
license:
13+
name: LGPL v2.1
14+
url: https://raw.github.com/hibernate/hibernate-search/7.2.0.Alpha1/lgpl.txt

_ext/release_file_parser.rb

+9
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ def createSeries(project, series_dir)
121121
if ( series[:version] == nil )
122122
series[:version] = File.basename( series_dir )
123123
end
124+
125+
if ( series[:license] == nil )
126+
series[:license] = project.license
127+
end
128+
124129
series[:releases] = Array.new
125130
return series
126131
end
@@ -157,6 +162,10 @@ def createRelease(project, series, release_file)
157162
release[:scm_tag] = release.version =~ /^(.*).Final$/ ? $1 : release.version
158163
end
159164
end
165+
166+
if ( release[:license] == nil )
167+
release[:license] = series.license
168+
end
160169

161170
return release
162171
end

_layouts/project/project-releases-series.html.haml

+3
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ project_hero_partial: project/hero-series.html.haml
395395
= version
396396
%p
397397
%small.ui.label= release.date
398+
%p
399+
%small.ui.label
400+
%a{:href => "#{release.license.url}"}= release.license.name
398401
.thirteen.wide.column
399402
- if release[:summary]
400403
%p

_partials/menu/desktop-left-project.html.haml

+4
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,7 @@
5555
.license
5656
Released under the
5757
%a{:href => "#{project_description.license.url}"}= project_description.license.name
58+
- if project_description.license.since
59+
since version
60+
#{project_description.license.since}
61+
(check release descriptions for earlier versions)

community/license.adoc

+2-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,5 @@ In a native image that includes LGPL-licensed code from Hibernate, the Hibernate
4545

4646
== ASL 2.0
4747

48-
Some Hibernate projects are released under link:https://opensource.org/licenses/Apache-2.0[ASL 2.0].
49-
50-
This is mostly due to our work with the Java Community Process: implementing a reference implementation in practice requires such a liberal license (or a fully proprietary one strangely enough).
51-
52-
48+
Some Hibernate projects are released under link:https://opensource.org/licenses/Apache-2.0[ASL 2.0],
49+
and the Hibernate team is link:https://in.relation.to/2023/11/18/license/[trying to move more projects to that license].

0 commit comments

Comments
 (0)