Skip to content

Commit bfa6806

Browse files
committed
Use an aggregator POM for Hibernate Search demos
Mainly to simplify the build, but also to simplify dependabot config, and to make sure we only get one PR for each dependency when dependabot updates it.
1 parent c9bc8b3 commit bfa6806

File tree

4 files changed

+26
-85
lines changed

4 files changed

+26
-85
lines changed

.github/dependabot.yml

+2-66
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,21 @@
11
version: 2
22
updates:
33
- package-ecosystem: "maven"
4-
directory: "/hibernate-search/hsearch-with-elasticsearch"
4+
directory: "/hibernate-search/"
55
schedule:
66
interval: "daily"
77
allow:
8-
- dependency-name: "org.hibernate:*"
9-
- dependency-name: "org.hibernate.*:*"
10-
ignore:
118
- dependency-name: "io.quarkus:*"
12-
update-types: [ "version-update:semver-major" ]
139
- dependency-name: "io.quarkus.*:*"
14-
update-types: [ "version-update:semver-major" ]
15-
- dependency-name: "org.hibernate:*"
16-
update-types: [ "version-update:semver-major" ]
17-
- dependency-name: "org.hibernate.*:*"
18-
update-types: [ "version-update:semver-major" ]
19-
- package-ecosystem: "maven"
20-
directory: "/hibernate-search/hsearch-elasticsearch-wikipedia"
21-
schedule:
22-
interval: "daily"
23-
allow:
2410
- dependency-name: "org.springframework*:*"
2511
- dependency-name: "org.hibernate:*"
2612
- dependency-name: "org.hibernate.*:*"
27-
ignore:
28-
- dependency-name: "org.springframework*:*"
29-
update-types: [ "version-update:semver-major" ]
30-
- dependency-name: "org.hibernate:*"
31-
update-types: [ "version-update:semver-major" ]
32-
- dependency-name: "org.hibernate.*:*"
33-
update-types: [ "version-update:semver-major" ]
34-
- package-ecosystem: "maven"
35-
directory: "/hibernate-search/hsearch-feature-examples"
36-
schedule:
37-
interval: "daily"
38-
allow:
39-
- dependency-name: "io.quarkus:*"
40-
- dependency-name: "io.quarkus.*:*"
41-
- dependency-name: "org.hibernate:*"
42-
- dependency-name: "org.hibernate.*:*"
43-
ignore:
44-
- dependency-name: "io.quarkus:*"
45-
update-types: [ "version-update:semver-major" ]
46-
- dependency-name: "io.quarkus.*:*"
47-
update-types: [ "version-update:semver-major" ]
48-
- dependency-name: "org.hibernate:*"
49-
update-types: [ "version-update:semver-major" ]
50-
- dependency-name: "org.hibernate.*:*"
51-
update-types: [ "version-update:semver-major" ]
52-
- package-ecosystem: "maven"
53-
directory: "/hibernate-search/hsearch-quarkus"
54-
schedule:
55-
interval: "daily"
56-
allow:
57-
- dependency-name: "io.quarkus:*"
58-
- dependency-name: "io.quarkus.*:*"
59-
- dependency-name: "org.hibernate:*"
60-
- dependency-name: "org.hibernate.*:*"
6113
ignore:
6214
- dependency-name: "io.quarkus:*"
6315
update-types: [ "version-update:semver-major" ]
6416
- dependency-name: "io.quarkus.*:*"
6517
update-types: [ "version-update:semver-major" ]
66-
- dependency-name: "org.hibernate:*"
67-
update-types: [ "version-update:semver-major" ]
68-
- dependency-name: "org.hibernate.*:*"
69-
update-types: [ "version-update:semver-major" ]
70-
- package-ecosystem: "maven"
71-
directory: "/hibernate-search/hsearch-outbox-polling"
72-
schedule:
73-
interval: "daily"
74-
allow:
75-
- dependency-name: "io.quarkus:*"
76-
- dependency-name: "io.quarkus.*:*"
77-
- dependency-name: "org.hibernate:*"
78-
- dependency-name: "org.hibernate.*:*"
79-
ignore:
80-
- dependency-name: "io.quarkus:*"
81-
update-types: [ "version-update:semver-major" ]
82-
- dependency-name: "io.quarkus.*:*"
18+
- dependency-name: "org.springframework*:*"
8319
update-types: [ "version-update:semver-major" ]
8420
- dependency-name: "org.hibernate:*"
8521
update-types: [ "version-update:semver-major" ]

Jenkinsfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ pipeline {
1515
stages {
1616
stage('Build Hibernate Search Demos') {
1717
steps {
18-
sh "./ci/build-hibernate-search.sh"
18+
sh "mvn -f hibernate-search -B -q clean package -DskipTests=true -Dtest.containers.run.skip=true"
19+
}
20+
}
21+
stage('Test Hibernate Search Demos') {
22+
steps {
23+
sh "mvn -f hibernate-search -B verify -Dstart-containers"
1924
}
2025
}
2126
}

ci/build-hibernate-search.sh

-18
This file was deleted.

hibernate-search/pom.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.hibernate.demos</groupId>
6+
<artifactId>hsearch-demo-aggregator</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>pom</packaging>
9+
<name>Hibernate Search Demos - Aggregator POM</name>
10+
<description>An aggregator POM to build all demos in one command, or to simplify configuration of dependabot</description>
11+
<modules>
12+
<module>hsearch-with-elasticsearch</module>
13+
<module>hsearch-elasticsearch-wikipedia</module>
14+
<module>hsearch-quarkus</module>
15+
<module>hsearch-outbox-polling</module>
16+
<module>hsearch-feature-examples</module>
17+
</modules>
18+
</project>

0 commit comments

Comments
 (0)