diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a46aa5cf..3ca57e593 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,7 +106,7 @@ jobs: - name: Build code and run tests and basic checks (Standalone) run: | ./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean install \ - -Pjqassistant -Pdist -Prelocation + -Pjqassistant -Pdist env: DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}" # For jobs running on 'pull_request', upload build scan data. diff --git a/Jenkinsfile b/Jenkinsfile index f5fea20d5..a5af5f8b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -150,8 +150,6 @@ stage('Configure') { maven { defaultTool MAVEN_TOOL producedArtifactPattern "org/hibernate/validator/*" - // Relocation artifacts - producedArtifactPattern "org/hibernate/hibernate-validator*" } } diff --git a/pom.xml b/pom.xml index c51ed4c1a..212a7360d 100644 --- a/pom.xml +++ b/pom.xml @@ -1666,12 +1666,6 @@ distribution - - relocation - - relocation - - release diff --git a/relocation/annotation-processor/pom.xml b/relocation/annotation-processor/pom.xml deleted file mode 100644 index ac591c365..000000000 --- a/relocation/annotation-processor/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 4.0.0 - - org.hibernate.validator - hibernate-validator-relocation - 9.0.0-SNAPSHOT - - - org.hibernate - hibernate-validator-annotation-processor - Hibernate Validator Annotation Processor - Relocation Artifact - - - - false - - - - - org.hibernate.validator - - - diff --git a/relocation/cdi/pom.xml b/relocation/cdi/pom.xml deleted file mode 100644 index ef3e8b270..000000000 --- a/relocation/cdi/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 4.0.0 - - org.hibernate.validator - hibernate-validator-relocation - 9.0.0-SNAPSHOT - - - org.hibernate - hibernate-validator-cdi - Hibernate Validator CDI Portable Extension - Relocation Artifact - - - - false - - - - - org.hibernate.validator - - - diff --git a/relocation/engine/pom.xml b/relocation/engine/pom.xml deleted file mode 100644 index d03486cc7..000000000 --- a/relocation/engine/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 4.0.0 - - org.hibernate.validator - hibernate-validator-relocation - 9.0.0-SNAPSHOT - - - org.hibernate - hibernate-validator - Hibernate Validator Engine - Relocation Artifact - - - - false - - - - - org.hibernate.validator - - - diff --git a/relocation/pom.xml b/relocation/pom.xml deleted file mode 100644 index a1b5353b4..000000000 --- a/relocation/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - org.hibernate.validator - hibernate-validator-parent - 9.0.0-SNAPSHOT - - - hibernate-validator-relocation - pom - - Hibernate Validator Relocation Artifacts - - - annotation-processor - cdi - engine - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - bom - - - remove - remove - - keep - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - -