diff --git a/.gitignore b/.gitignore index 3c7e81093b0..3e7e2e3c8dc 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ atlassian-ide-plugin.xml # Maven wrapper files .mvn mvnw* + +# Cache folders for formatting plugins: +.cache diff --git a/.release/.gitignore b/.release/.gitignore new file mode 100644 index 00000000000..859e52ddf89 --- /dev/null +++ b/.release/.gitignore @@ -0,0 +1,3 @@ +# The folder into which we checkout our release scripts into +* +!.gitignore diff --git a/backends/jgroups/pom.xml b/backends/jgroups/pom.xml index 3b302c10ee6..3e9fc623bf8 100644 --- a/backends/jgroups/pom.xml +++ b/backends/jgroups/pom.xml @@ -19,6 +19,7 @@ Hibernate Search JGroups Backend Hibernate Search JGroup based backend + http://search.hibernate.org diff --git a/backends/jgroups/src/main/java/org/hibernate/search/backend/jgroups/HibernateSearchJgroupsExtension.java b/backends/jgroups/src/main/java/org/hibernate/search/backend/jgroups/HibernateSearchJgroupsExtension.java new file mode 100644 index 00000000000..8dca5415d33 --- /dev/null +++ b/backends/jgroups/src/main/java/org/hibernate/search/backend/jgroups/HibernateSearchJgroupsExtension.java @@ -0,0 +1,16 @@ +/* + * Hibernate Search, full-text search for your domain model + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.search.backend.jgroups; + +/** + * This module provides the Hibernate Search JGroup based backend. + */ +// DO NOT actually remove this one! We need it to let the javadoc plugin to generate the "empty" javadoc jar to comply with the publishign rules. +// (since = "5.10", forRemoval = true) +@Deprecated +public interface HibernateSearchJgroupsExtension { +} diff --git a/backends/jms/pom.xml b/backends/jms/pom.xml index 2541be03116..e31068c565c 100644 --- a/backends/jms/pom.xml +++ b/backends/jms/pom.xml @@ -19,6 +19,7 @@ Hibernate Search JMS Backend Hibernate Search JGroup based backend + http://search.hibernate.org diff --git a/build-config/pom.xml b/build-config/pom.xml index 2df36bc4b88..afe242fc9a7 100644 --- a/build-config/pom.xml +++ b/build-config/pom.xml @@ -16,6 +16,7 @@ Hibernate Search Build Configuration Configuration for the build of Hibernate Search + http://search.hibernate.org true - true diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml index 14a1f11f773..2f9bc6b6f94 100644 --- a/distribution/src/main/assembly/dist.xml +++ b/distribution/src/main/assembly/dist.xml @@ -214,8 +214,8 @@ copyright.txt lgpl.txt - - hibernate-noorm-release-scripts/** + + .release/** .git diff --git a/documentation/pom.xml b/documentation/pom.xml index e1cd01a7af4..225a3c208fc 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -20,6 +20,7 @@ Hibernate Search Manual The Hibernate Search reference manual + http://search.hibernate.org ${project.build.directory}/asciidoctor/en-US @@ -33,7 +34,6 @@ true - true true diff --git a/elasticsearch-aws/pom.xml b/elasticsearch-aws/pom.xml index 3a00c5c4407..e3204d5eef7 100644 --- a/elasticsearch-aws/pom.xml +++ b/elasticsearch-aws/pom.xml @@ -19,6 +19,7 @@ Hibernate Search Elasticsearch AWS integration Configurer for the Hibernate Search Elasticsearch backend enabling connection to an AWS-hosted Elasticsearch cluster + http://search.hibernate.org diff --git a/elasticsearch-aws/src/main/java/org/hibernate/search/elasticsearch/aws/HibernateSearchElasticsearchAwsExtension.java b/elasticsearch-aws/src/main/java/org/hibernate/search/elasticsearch/aws/HibernateSearchElasticsearchAwsExtension.java new file mode 100644 index 00000000000..8f824acf956 --- /dev/null +++ b/elasticsearch-aws/src/main/java/org/hibernate/search/elasticsearch/aws/HibernateSearchElasticsearchAwsExtension.java @@ -0,0 +1,17 @@ +/* + * Hibernate Search, full-text search for your domain model + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.search.elasticsearch.aws; + +/** + * Hibernate Search Elasticsearch AWS is an extension that is the + * configurer for the Hibernate Search Elasticsearch backend enabling connection to an AWS-hosted Elasticsearch cluster + */ +// DO NOT actually remove this one! We need it to let the javadoc plugin to generate the "empty" javadoc jar to comply with the publishign rules. +// (since = "5.10", forRemoval = true) +@Deprecated +public interface HibernateSearchElasticsearchAwsExtension { +} diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 3f8c08c4ec8..3ea9bf7df83 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -19,6 +19,7 @@ Hibernate Search Elasticsearch Hibernate Search backend which has indexing operations forwarded to Elasticsearch + http://search.hibernate.org diff --git a/engine/pom.xml b/engine/pom.xml index 1521a8782ca..ec8f1fd5d14 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -19,6 +19,7 @@ Hibernate Search Engine Core of the Object/Lucene mapper, query engine and index management + http://search.hibernate.org diff --git a/infinispan/pom.xml b/infinispan/pom.xml index 1b452fc2fe0..bd00b42a9fb 100644 --- a/infinispan/pom.xml +++ b/infinispan/pom.xml @@ -16,9 +16,11 @@ hibernate-search-infinispan + pom Hibernate Search Infinispan Directory Provider Hibernate Search Infinispan Directory Provider + http://search.hibernate.org @@ -34,14 +36,6 @@ maven-deploy-plugin - - org.apache.maven.plugins - maven-jar-plugin - - - false - - diff --git a/integrationtest/elasticsearch/pom.xml b/integrationtest/elasticsearch/pom.xml index 604b6f26219..10d9710acfc 100755 --- a/integrationtest/elasticsearch/pom.xml +++ b/integrationtest/elasticsearch/pom.xml @@ -210,13 +210,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/jdk9-modules/pom.xml b/integrationtest/jdk9-modules/pom.xml index 553d2d8b0d7..902caf96684 100644 --- a/integrationtest/jdk9-modules/pom.xml +++ b/integrationtest/jdk9-modules/pom.xml @@ -100,13 +100,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/jms/pom.xml b/integrationtest/jms/pom.xml index b0ad45d0317..13a1ad37446 100644 --- a/integrationtest/jms/pom.xml +++ b/integrationtest/jms/pom.xml @@ -109,13 +109,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/jsr352/pom.xml b/integrationtest/jsr352/pom.xml index 133b35b93fc..d181dbcf759 100755 --- a/integrationtest/jsr352/pom.xml +++ b/integrationtest/jsr352/pom.xml @@ -153,13 +153,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/narayana/pom.xml b/integrationtest/narayana/pom.xml index de287ec822b..86c94f5db8b 100755 --- a/integrationtest/narayana/pom.xml +++ b/integrationtest/narayana/pom.xml @@ -71,13 +71,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/osgi/karaf-features/pom.xml b/integrationtest/osgi/karaf-features/pom.xml index f8f35f42efe..56d1b7bfad4 100644 --- a/integrationtest/osgi/karaf-features/pom.xml +++ b/integrationtest/osgi/karaf-features/pom.xml @@ -82,13 +82,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/osgi/karaf-it/pom.xml b/integrationtest/osgi/karaf-it/pom.xml index cb98adc9117..fe41eb6cf5b 100644 --- a/integrationtest/osgi/karaf-it/pom.xml +++ b/integrationtest/osgi/karaf-it/pom.xml @@ -211,13 +211,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/performance/engine-elasticsearch/pom.xml b/integrationtest/performance/engine-elasticsearch/pom.xml index 6878a0689a3..0f6fcf95f25 100644 --- a/integrationtest/performance/engine-elasticsearch/pom.xml +++ b/integrationtest/performance/engine-elasticsearch/pom.xml @@ -90,13 +90,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/performance/engine-lucene/pom.xml b/integrationtest/performance/engine-lucene/pom.xml index e462f81e056..a3fdabb0e52 100644 --- a/integrationtest/performance/engine-lucene/pom.xml +++ b/integrationtest/performance/engine-lucene/pom.xml @@ -82,13 +82,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/performance/orm/pom.xml b/integrationtest/performance/orm/pom.xml index 7f4e12f4f91..4bbedb49fb5 100755 --- a/integrationtest/performance/orm/pom.xml +++ b/integrationtest/performance/orm/pom.xml @@ -224,13 +224,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/performance/sandbox/pom.xml b/integrationtest/performance/sandbox/pom.xml index 4ae03ab82fe..c861f5bd498 100755 --- a/integrationtest/performance/sandbox/pom.xml +++ b/integrationtest/performance/sandbox/pom.xml @@ -69,13 +69,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/spring/pom.xml b/integrationtest/spring/pom.xml index 550100da699..21b14b4b1a6 100755 --- a/integrationtest/spring/pom.xml +++ b/integrationtest/spring/pom.xml @@ -146,13 +146,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml index 209ccf4205b..5347ec76577 100755 --- a/integrationtest/wildfly/pom.xml +++ b/integrationtest/wildfly/pom.xml @@ -255,13 +255,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-javadoc-plugin diff --git a/jbossmodules/backend-jgroups/pom.xml b/jbossmodules/backend-jgroups/pom.xml index ed545423e38..e4b61aaf8db 100644 --- a/jbossmodules/backend-jgroups/pom.xml +++ b/jbossmodules/backend-jgroups/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules JGroups Backend Hibernate Search JGroups Backend modules to use in JBoss AS / Wildfly + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources diff --git a/jbossmodules/elasticsearch-aws/pom.xml b/jbossmodules/elasticsearch-aws/pom.xml index 5c572f225c4..d7e12ab2db3 100644 --- a/jbossmodules/elasticsearch-aws/pom.xml +++ b/jbossmodules/elasticsearch-aws/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules Elasticsearch AWS Hibernate Search Elasticsearch AWS modules to use in JBoss AS / Wildfly + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources diff --git a/jbossmodules/elasticsearch/pom.xml b/jbossmodules/elasticsearch/pom.xml index 45f2aa187f7..89dc88ec181 100644 --- a/jbossmodules/elasticsearch/pom.xml +++ b/jbossmodules/elasticsearch/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules Elasticsearch Hibernate Search Elasticsearch modules to use in JBoss AS / Wildfly + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources diff --git a/jbossmodules/engine/pom.xml b/jbossmodules/engine/pom.xml index ce198d77567..7d572a902dd 100644 --- a/jbossmodules/engine/pom.xml +++ b/jbossmodules/engine/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules Engine Hibernate Search Engine modules to use in JBoss AS / Wildfly + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources diff --git a/jbossmodules/orm/pom.xml b/jbossmodules/orm/pom.xml index 5d1b001929f..4811e8c06c9 100644 --- a/jbossmodules/orm/pom.xml +++ b/jbossmodules/orm/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules ORM Hibernate Search ORM modules to use in JBoss AS / Wildfly + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources diff --git a/jbossmodules/pom.xml b/jbossmodules/pom.xml index 7ab506ace43..be08a968db9 100644 --- a/jbossmodules/pom.xml +++ b/jbossmodules/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules Aggregator Hibernate Search JBoss Modules Aggregator POM + http://search.hibernate.org engine diff --git a/jbossmodules/testing/pom.xml b/jbossmodules/testing/pom.xml index 7d2af6b5155..ddab332a625 100644 --- a/jbossmodules/testing/pom.xml +++ b/jbossmodules/testing/pom.xml @@ -17,6 +17,7 @@ Hibernate Search JBoss Modules Testing Additional JBoss modules which are meant for internal testing exclusively + http://search.hibernate.org ${project.build.directory}/feature-pack/src/main/resources @@ -66,13 +67,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - - true - - maven-resources-plugin diff --git a/jsr352/core/pom.xml b/jsr352/core/pom.xml index c0ef227014f..44e03ec4ba0 100644 --- a/jsr352/core/pom.xml +++ b/jsr352/core/pom.xml @@ -19,6 +19,7 @@ Hibernate Search JSR-352 Core Core of the Hibernate Search JSR-352 integration + http://search.hibernate.org diff --git a/jsr352/jberet/pom.xml b/jsr352/jberet/pom.xml index d3378f1f3b5..29498542c2b 100644 --- a/jsr352/jberet/pom.xml +++ b/jsr352/jberet/pom.xml @@ -19,6 +19,7 @@ Hibernate Search JSR-352 JBeret Hibernate Search JSR-352 integration - for JBeret + http://search.hibernate.org diff --git a/jsr352/jberet/src/main/java/org/hibernate/search/jsr352/jberet/HibernateSearchJBeretExtension.java b/jsr352/jberet/src/main/java/org/hibernate/search/jsr352/jberet/HibernateSearchJBeretExtension.java new file mode 100644 index 00000000000..5ad2f8837f0 --- /dev/null +++ b/jsr352/jberet/src/main/java/org/hibernate/search/jsr352/jberet/HibernateSearchJBeretExtension.java @@ -0,0 +1,16 @@ +/* + * Hibernate Search, full-text search for your domain model + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.search.jsr352.jberet; + +/** + * This module provides the Hibernate Search JSR-352 integration for JBeret. + */ +// DO NOT actually remove this one! We need it to let the javadoc plugin to generate the "empty" javadoc jar to comply with the publishign rules. +// (since = "5.10", forRemoval = true) +@Deprecated +public interface HibernateSearchJBeretExtension { +} diff --git a/jsr352/pom.xml b/jsr352/pom.xml index 92340c68de5..0e793055288 100644 --- a/jsr352/pom.xml +++ b/jsr352/pom.xml @@ -20,6 +20,7 @@ Hibernate Search JSR-352 Aggregator Hibernate Search JSR-352 integration aggregator POM + http://search.hibernate.org core diff --git a/legacy/pom.xml b/legacy/pom.xml index 72dda5a9639..54e3338a4d3 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -20,6 +20,7 @@ Hibernate Search [Deprecated Module] Hibernate Search [Deprecated Module] + http://search.hibernate.org diff --git a/orm/pom.xml b/orm/pom.xml index b68235e982a..959b2448543 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -19,6 +19,7 @@ Hibernate Search ORM Hibernate Search integration with Hibernate Core + http://search.hibernate.org diff --git a/pom.xml b/pom.xml index 3a47daa0fb0..1781798a2ab 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,11 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + + 4.0.0 org.hibernate @@ -55,7 +59,11 @@ https://hibernate.atlassian.net/browse/HSEARCH - + + scm:git:git://github.com/hibernate/hibernate-search.git scm:git:git@github.com:hibernate/hibernate-search.git http://github.com/hibernate/hibernate-search @@ -320,7 +328,6 @@ 3.0.2 3.0.0 0.4.0 - 2.1 3.2.0 2.9 2.5.3 @@ -335,7 +342,7 @@ 0.8.3 4.3.0 1.5.Final - 3.0.1 + 1.7.0 + staging-deploy + file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven ossrh https://oss.sonatype.org/service/local/staging/deploy/maven2/ ossrh @@ -1280,14 +1289,6 @@ - - org.sonatype.plugins - nexus-maven-plugin - - https://repository.jboss.org/nexus - true - - org.apache.maven.plugins maven-jar-plugin @@ -1459,11 +1460,6 @@ - - org.sonatype.plugins - nexus-maven-plugin - ${version.nexus.plugin} - org.apache.maven.plugins maven-surefire-plugin @@ -1869,13 +1865,24 @@ ${version.org.jboss.bridger.plugin} - org.apache.maven.plugins - maven-gpg-plugin - ${version.gpg.plugin} + org.codehaus.mojo + flatten-maven-plugin + ${version.flatten-maven-plugin} - ${env.RELEASE_GPG_HOMEDIR} - ${env.RELEASE_GPG_PASSPHRASE} + ${project.build.directory} + + ossrh + + + flatten-pom + process-resources + + flatten + + + @@ -1957,6 +1964,27 @@ + + release + + + performRelease + true + + + + + + + maven-deploy-plugin + + ${local.staging.releases.repo.id}::${local.staging.releases.repo.url} + + + + + + @@ -2084,33 +2112,6 @@ - - release - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - jdk8 diff --git a/reports/pom.xml b/reports/pom.xml index a2b79302c3a..166a31587d7 100644 --- a/reports/pom.xml +++ b/reports/pom.xml @@ -23,7 +23,6 @@ true - true true