Skip to content

Commit 93d2cff

Browse files
committed
Check for build config in a forbiddenapis for both Search/Validator
1 parent 81a0c62 commit 93d2cff

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

src/main/java/org/hibernate/infra/develocity/plugins/ForbiddenApisConfiguredPlugin.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ private static void configureCheck(GoalMetadataProvider.Context context) {
3939
inputs.fileSet("classpathElements", fs -> fs.normalizationStrategy(NormalizationStrategy.COMPILE_CLASSPATH));
4040
inputs.fileSet("classesDirectory", fs -> fs.normalizationStrategy(NormalizationStrategy.COMPILE_CLASSPATH));
4141

42-
// for now, we push only one signature artifacts but we could explore the config if it was strictly necessary
43-
File hibernateSearchBuildConfigArtifactFile = resolveHibernateSearchBuildConfigArtifact(context);
42+
// for now, we push only one signature artifacts, but we could explore the config if it was strictly necessary
43+
File buildConfigArtifactFile = resolveBuildConfigArtifact(context);
4444

45-
inputs.fileSet("hibernateSearchBuildConfig", hibernateSearchBuildConfigArtifactFile,
45+
inputs.fileSet("buildConfigArtifact", buildConfigArtifactFile,
4646
fs -> fs.normalizationStrategy(NormalizationStrategy.CLASSPATH));
4747

4848
inputs.ignore("signaturesArtifacts", "projectRepos", "repoSession");
@@ -63,9 +63,20 @@ private static void configureTestCheck(GoalMetadataProvider.Context context) {
6363
});
6464
}
6565

66-
private static File resolveHibernateSearchBuildConfigArtifact(GoalMetadataProvider.Context context) {
67-
Artifact hibernateSearchBuildConfigArtifact = new DefaultArtifact("org.hibernate.search",
68-
"hibernate-search-build-config", "jar",
66+
private static File resolveBuildConfigArtifact(GoalMetadataProvider.Context context) {
67+
String groupId = context.metadata().getProject().getModel().getGroupId();
68+
if ("org.hibernate.search".equals(groupId)) {
69+
return resolveBuildConfigArtifact("org.hibernate.search", "hibernate-search-build-config", context);
70+
} else if ("org.hibernate.validator".equals(groupId)) {
71+
return resolveBuildConfigArtifact("org.hibernate.validator", "hibernate-validator-build-config", context);
72+
} else {
73+
throw new IllegalArgumentException("This project is not supported by the extension: %s:%s".formatted(groupId, context.metadata().getProject().getArtifactId()));
74+
}
75+
76+
}
77+
78+
private static File resolveBuildConfigArtifact(String groupId, String artifactId, GoalMetadataProvider.Context context) {
79+
Artifact hibernateSearchBuildConfigArtifact = new DefaultArtifact(groupId, artifactId, "jar",
6980
context.metadata().getProject().getVersion());
7081
File hibernateSearchBuildConfigArtifactFile = context.metadata().getSession().getRepositorySession().getWorkspaceReader()
7182
.findArtifact(hibernateSearchBuildConfigArtifact);

0 commit comments

Comments
 (0)