Skip to content

Commit 9570966

Browse files
authored
Merge pull request #29 from marko-bekhta/shared-extension
Shared extension
2 parents 6c36917 + 1cd2aa5 commit 9570966

21 files changed

+157
-116
lines changed

MAINTAINERS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ i.e. anybody with direct push access to the git repository.
66

77
## Continuous integration
88

9-
Continuous integration happens on a self-hosted Jenkins instance at https://ci.hibernate.org/job/hibernate-search-develocity-extension/.
9+
Continuous integration happens on a self-hosted Jenkins instance at https://ci.hibernate.org/job/hibernate-develocity-maven-extension/.
1010

1111
## Release
1212

13-
* Go to [CI](https://ci.hibernate.org/job/hibernate-search-develocity-extension/).
13+
* Go to [CI](https://ci.hibernate.org/job/hibernate-develocity-maven-extension/).
1414
* Click the "play" button (green triangle) to launch a build.
1515
* Input the parameters.
1616
* Click "Build".
17-
* If something doesn't work, [call for help](https://hibernate.org/community/#contribute).
17+
* If something doesn't work, [call for help](https://hibernate.org/community/#contribute).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maven extension configuring the Develocity build cache configuration for the Hibernate Search project
22

3-
[![Version](https://img.shields.io/maven-central/v/org.hibernate.search.develocity/hibernate-search-develocity-extension?logo=apache-maven&style=for-the-badge)](https://central.sonatype.com/artifact/org.hibernate.search.develocity/hibernate-search-develocity-extension)
3+
[![Version](https://img.shields.io/maven-central/v/org.hibernate.infra.develocity/hibernate-develocity-maven-extension?logo=apache-maven&style=for-the-badge)](https://central.sonatype.com/artifact/org.hibernate.infra.develocity/hibernate-develocity-maven-extension)
44

55
## About
66

pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.hibernate.search.develocity</groupId>
4-
<artifactId>hibernate-search-develocity-extension</artifactId>
3+
<groupId>org.hibernate.infra.develocity</groupId>
4+
<artifactId>hibernate-develocity-maven-extension</artifactId>
55
<packaging>jar</packaging>
66
<version>2.0.1-SNAPSHOT</version>
7-
<name>Hibernate Search Develocity extension</name>
8-
<description>A Maven extension to configure the Develocity build cache for the Hibernate Search project</description>
9-
<url>https://github.com/hibernate/hibernate-search-develocity-extension</url>
7+
<name>Hibernate Develocity extension for Maven Projects</name>
8+
<description>A Maven extension to configure the Develocity build cache for the Hibernate projects using Maven as a build tool.</description>
9+
<url>https://github.com/hibernate/hibernate-develocity-maven-extension</url>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1313

14-
<develocity-maven-extension.version>1.21</develocity-maven-extension.version>
14+
<develocity-maven-extension.version>1.22.2</develocity-maven-extension.version>
1515
<maven-core.version>3.9.6</maven-core.version>
1616
<plexus-component.version>2.2.0</plexus-component.version>
1717
<sisu-inject.version>0.3.5</sisu-inject.version>
@@ -192,15 +192,15 @@
192192
</distributionManagement>
193193

194194
<scm>
195-
<url>https://github.com/hibernate/hibernate-search-develocity-extension</url>
196-
<connection>scm:git:[email protected]:hibernate/hibernate-search-develocity-extension.git</connection>
197-
<developerConnection>scm:git:[email protected]:hibernate/hibernate-search-develocity-extension.git</developerConnection>
195+
<url>https://github.com/hibernate/hibernate-develocity-maven-extension</url>
196+
<connection>scm:git:[email protected]:hibernate/hibernate-develocity-maven-extension.git</connection>
197+
<developerConnection>scm:git:[email protected]:hibernate/hibernate-develocity-maven-extension.git</developerConnection>
198198
<tag>HEAD</tag>
199199
</scm>
200200

201201
<issueManagement>
202202
<system>GitHub</system>
203-
<url>https://github.com/hibernate/hibernate-search-develocity-extension/issues</url>
203+
<url>https://github.com/hibernate/hibernate-develocity-maven-extension/issues</url>
204204
</issueManagement>
205205

206206
<profiles>

src/main/java/org/hibernate/search/develocity/ConfiguredPlugin.java renamed to src/main/java/org/hibernate/infra/develocity/ConfiguredPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hibernate.search.develocity;
1+
package org.hibernate.infra.develocity;
22

33
import org.apache.maven.execution.MavenSession;
44

src/main/java/org/hibernate/search/develocity/GoalMetadataProvider.java renamed to src/main/java/org/hibernate/infra/develocity/GoalMetadataProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.hibernate.search.develocity;
1+
package org.hibernate.infra.develocity;
22

33
import java.util.function.Consumer;
44

5-
import org.hibernate.search.develocity.util.MavenMojoExecutionConfig;
6-
import org.hibernate.search.develocity.util.MavenProperties;
5+
import org.hibernate.infra.develocity.util.MavenMojoExecutionConfig;
6+
import org.hibernate.infra.develocity.util.MavenProperties;
77

88
import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;
99
import com.gradle.develocity.agent.maven.api.scan.BuildScanApi;
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.hibernate.search.develocity;
1+
package org.hibernate.infra.develocity;
22

33
import java.util.List;
44

55
import com.gradle.develocity.agent.maven.api.scan.BuildScanPublishing;
66
import org.apache.maven.execution.MavenSession;
77
import org.codehaus.plexus.component.annotations.Component;
8-
import org.hibernate.search.develocity.normalization.Normalization;
9-
import org.hibernate.search.develocity.plugins.CompilerConfiguredPlugin;
10-
import org.hibernate.search.develocity.plugins.FailsafeConfiguredPlugin;
11-
import org.hibernate.search.develocity.plugins.ForbiddenApisConfiguredPlugin;
12-
import org.hibernate.search.develocity.plugins.SurefireConfiguredPlugin;
13-
import org.hibernate.search.develocity.scan.BuildScanMetadata;
8+
import org.hibernate.infra.develocity.normalization.Normalization;
9+
import org.hibernate.infra.develocity.plugins.CompilerConfiguredPlugin;
10+
import org.hibernate.infra.develocity.plugins.FailsafeConfiguredPlugin;
11+
import org.hibernate.infra.develocity.plugins.ForbiddenApisConfiguredPlugin;
12+
import org.hibernate.infra.develocity.plugins.SurefireConfiguredPlugin;
13+
import org.hibernate.infra.develocity.scan.BuildScanMetadata;
1414

1515
import com.gradle.develocity.agent.maven.api.DevelocityApi;
1616
import com.gradle.develocity.agent.maven.api.DevelocityListener;
@@ -26,7 +26,7 @@ public void configure(DevelocityApi develocityApi, MavenSession mavenSession) {
2626
develocityApi.getBuildScan().getPublishing()
2727
.onlyIf( BuildScanPublishing.PublishingContext::isAuthenticated );
2828

29-
BuildScanMetadata.addMainMetadata(develocityApi.getBuildScan());
29+
BuildScanMetadata.addMainMetadata(develocityApi.getBuildScan(), mavenSession);
3030

3131
Normalization.configureNormalization(develocityApi.getBuildCache());
3232

src/main/java/org/hibernate/search/develocity/Log.java renamed to src/main/java/org/hibernate/infra/develocity/Log.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hibernate.search.develocity;
1+
package org.hibernate.infra.develocity;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

src/main/java/org/hibernate/search/develocity/SimpleConfiguredPlugin.java renamed to src/main/java/org/hibernate/infra/develocity/SimpleConfiguredPlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.hibernate.search.develocity;
1+
package org.hibernate.infra.develocity;
22

33
import java.util.Collections;
44
import java.util.Map;
55
import java.util.Map.Entry;
66
import java.util.function.Function;
77

8-
import org.hibernate.search.develocity.scan.BuildScanMetadata;
9-
import org.hibernate.search.develocity.util.JavaVersions;
8+
import org.hibernate.infra.develocity.scan.BuildScanMetadata;
9+
import org.hibernate.infra.develocity.util.JavaVersions;
1010

1111
import com.gradle.develocity.agent.maven.api.DevelocityApi;
1212
import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;

src/main/java/org/hibernate/search/develocity/normalization/Normalization.java renamed to src/main/java/org/hibernate/infra/develocity/normalization/Normalization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hibernate.search.develocity.normalization;
1+
package org.hibernate.infra.develocity.normalization;
22

33
import com.gradle.develocity.agent.maven.api.cache.BuildCacheApi;
44

src/main/java/org/hibernate/search/develocity/plugins/CompilerConfiguredPlugin.java renamed to src/main/java/org/hibernate/infra/develocity/plugins/CompilerConfiguredPlugin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.hibernate.search.develocity.plugins;
1+
package org.hibernate.infra.develocity.plugins;
22

33
import java.util.Map;
44

5-
import org.hibernate.search.develocity.GoalMetadataProvider;
6-
import org.hibernate.search.develocity.SimpleConfiguredPlugin;
7-
import org.hibernate.search.develocity.scan.BuildScanMetadata;
8-
import org.hibernate.search.develocity.util.JavaVersions;
5+
import org.hibernate.infra.develocity.GoalMetadataProvider;
6+
import org.hibernate.infra.develocity.SimpleConfiguredPlugin;
7+
import org.hibernate.infra.develocity.scan.BuildScanMetadata;
8+
import org.hibernate.infra.develocity.util.JavaVersions;
99

1010
public class CompilerConfiguredPlugin extends SimpleConfiguredPlugin {
1111

0 commit comments

Comments
 (0)