diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39c630d90126..e4796dbd0c22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,38 +17,24 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: - contents: read - pull-requests: write - issues: write - env: MAVEN_OPTS: '-Xmx4G -Xms1G -XX:+ClassUnloadingWithConcurrentMark -Djava.security.egd=file:/dev/./urandom' MAVEN_CLI_OPTS: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' jobs: - # Notify build started (for PRs) - notify-start: - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - steps: - - name: Post PR comment - uses: actions/github-script@v7 - with: - script: | - github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - body: `🚀 Build started! [View workflow run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})` - }) - # Incremental build for PRs incremental-build: if: github.event_name == 'pull_request' runs-on: ubuntu-latest timeout-minutes: 180 steps: + - name: Free disk space + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + sudo rm -rf /opt/ghc + df -h + - name: Checkout uses: actions/checkout@v4 with: @@ -77,6 +63,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 180 steps: + - name: Free disk space + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + sudo rm -rf /opt/ghc + df -h + - name: Checkout uses: actions/checkout@v4 @@ -104,6 +97,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 steps: + - name: Free disk space + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + sudo rm -rf /opt/ghc + df -h + - name: Checkout uses: actions/checkout@v4 @@ -252,45 +252,23 @@ jobs: -DskipTests=true \ -DretryFailedDeploymentCount=10 - # Final status notification - notify-result: - needs: [incremental-build, full-build, integration-tests, dependency-check] - if: always() + # Slack notification (non-PR builds only) + notify-slack: + needs: [full-build, dependency-check] + if: always() && github.event_name != 'pull_request' runs-on: ubuntu-latest steps: - name: Determine build result id: result run: | - # Check for failures (skipped jobs are OK) - FAILED=false - if [[ "${{ needs.incremental-build.result }}" == "failure" ]]; then FAILED=true; fi - if [[ "${{ needs.full-build.result }}" == "failure" ]]; then FAILED=true; fi - if [[ "${{ needs.integration-tests.result }}" == "failure" ]]; then FAILED=true; fi - if [[ "${{ needs.dependency-check.result }}" == "failure" ]]; then FAILED=true; fi - - if [[ "$FAILED" == "true" ]]; then + if [[ "${{ needs.full-build.result }}" == "failure" ]] || \ + [[ "${{ needs.dependency-check.result }}" == "failure" ]]; then echo "status=failure" >> $GITHUB_OUTPUT else echo "status=success" >> $GITHUB_OUTPUT fi - - name: Post PR comment with result - if: github.event_name == 'pull_request' - uses: actions/github-script@v7 - with: - script: | - const status = '${{ steps.result.outputs.status }}'; - const emoji = status === 'success' ? '✅' : '❌'; - const message = status === 'success' ? 'Build succeeded!' : 'Build failed.'; - github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - body: `${emoji} ${message} [View workflow run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})` - }) - - name: Slack notification - if: github.event_name != 'pull_request' uses: slackapi/slack-github-action@v1.26.0 with: payload: | diff --git a/catalog/rest/catalog-rest-endpoint/pom.xml b/catalog/rest/catalog-rest-endpoint/pom.xml index 51922e43cdd7..c241c103d027 100644 --- a/catalog/rest/catalog-rest-endpoint/pom.xml +++ b/catalog/rest/catalog-rest-endpoint/pom.xml @@ -196,11 +196,6 @@ catalog-rest-api ${project.version} - - jakarta.activation - jakarta.activation-api - ${jakarta.activation.version} - org.apache.servicemix.specs org.apache.servicemix.specs.jaxb-api-2.2 diff --git a/distribution/docker/ddf-docker/pom.xml b/distribution/docker/ddf-docker/pom.xml index 24825b5a0e4f..db1cdb419ad1 100644 --- a/distribution/docker/ddf-docker/pom.xml +++ b/distribution/docker/ddf-docker/pom.xml @@ -26,7 +26,7 @@ - 2.29-alpine + 3.0 @@ -74,6 +74,22 @@ files.xml + + localhost + + custom + solrcloud_solrcloud + + + 8993:8993 + 8181:8181 + 8101:8101 + + + http://solr1:8994/solr + zoo:2181 + + diff --git a/distribution/docker/ddf-docker/src/main/docker/Dockerfile b/distribution/docker/ddf-docker/src/main/docker/Dockerfile index e5ed40bebd4f..4336c2e4bcf0 100644 --- a/distribution/docker/ddf-docker/src/main/docker/Dockerfile +++ b/distribution/docker/ddf-docker/src/main/docker/Dockerfile @@ -18,6 +18,7 @@ LABEL maintainer=codice ENV APP_HOME=/app ENV APP_NAME=/ddf ENV APP_LOG=$APP_HOME/data/log/$APP_NAME.log +ENV INSTALL_FEATURES=profile-standard COPY --from=prep /prep/ddf $APP_HOME diff --git a/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml b/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml index 61e4e7c5ad31..8b0744487a97 100644 --- a/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml +++ b/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml @@ -24,15 +24,14 @@ services: solr1: image: codice/ddf-solr:${project.version} container_name: solr1 - hostname: localhost + hostname: solr1 restart: always entrypoint: docker-entrypoint.sh command: solr-fg ports: - "8994:8994" - - "8995:8995" environment: - - SOLR_HOST=localhost + - SOLR_HOST=solr1 - SOLR_PORT=8994 - SOLR_OPTS=-Djute.maxbuffer=2097152 - ZK_HOST=zoo:2181 @@ -46,17 +45,21 @@ services: solr2: image: codice/ddf-solr:${project.version} container_name: solr2 + hostname: solr2 restart: always entrypoint: docker-entrypoint.sh command: solr-fg + ports: + - "8995:8995" environment: - - SOLR_HOST=localhost + - SOLR_HOST=solr2 - SOLR_PORT=8995 - SOLR_OPTS=-Djute.maxbuffer=2097152 - ZK_HOST=zoo:2181 volumes: - solr2_data:/var/solr - network_mode: "service:solr1" + networks: + - solrcloud depends_on: - zoo - solr1 diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml index 747ad6dc3530..ae21fc0dbe66 100644 --- a/distribution/kernel/pom.xml +++ b/distribution/kernel/pom.xml @@ -227,10 +227,11 @@ ${setup.folder}/jdk9plus + - jakarta.activation - jakarta.activation-api - ${jakarta.activation.version} + com.sun.activation + javax.activation + ${javax.activation.version} ${setup.folder}/jdk9plus diff --git a/features/admin/src/main/feature/feature.xml b/features/admin/src/main/feature/feature.xml index d335a144abef..18c1925cfe5e 100644 --- a/features/admin/src/main/feature/feature.xml +++ b/features/admin/src/main/feature/feature.xml @@ -56,8 +56,6 @@ - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0 - camel-blueprint camel-http cxf-jaxrs diff --git a/features/solr/src/main/feature/feature.xml b/features/solr/src/main/feature/feature.xml index 24177c3e5128..fa9523df17dc 100644 --- a/features/solr/src/main/feature/feature.xml +++ b/features/solr/src/main/feature/feature.xml @@ -33,7 +33,6 @@ mvn:org.apache.httpcomponents/httpcore-osgi/${solr.httpcore.version} mvn:org.apache.httpcomponents/httpclient-osgi/${solr.httpclient.version} mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0 mvn:ddf.platform.solr/solr-dependencies/${project.version} diff --git a/platform/landing-page/pom.xml b/platform/landing-page/pom.xml index 784005a94ae0..5d7125db1f4b 100644 --- a/platform/landing-page/pom.xml +++ b/platform/landing-page/pom.xml @@ -46,9 +46,8 @@ slf4j-api - org.apache.servicemix.specs - org.apache.servicemix.specs.jsr339-api-2.0 - ${jsr339-api.bundle.version} + jakarta.ws.rs + jakarta.ws.rs-api org.apache.commons diff --git a/platform/mime/core/platform-mime-core-impl/pom.xml b/platform/mime/core/platform-mime-core-impl/pom.xml index 3efc11dadedf..3e53bda87307 100644 --- a/platform/mime/core/platform-mime-core-impl/pom.xml +++ b/platform/mime/core/platform-mime-core-impl/pom.xml @@ -64,10 +64,9 @@ test - org.apache.servicemix.specs - org.apache.servicemix.specs.jsr339-api-2.0 - ${jsr339-api.bundle.version} - test + jakarta.ws.rs + jakarta.ws.rs-api + test ddf.mime.tika diff --git a/pom.xml b/pom.xml index d17243a9d833..9f1d12bd40ec 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,7 @@ 1.2.2 1.6.7 1.9.3 + 1.2.0 1.3.5 1.1.1 1.1.1_1 @@ -237,7 +238,6 @@ 1.18.3 3.0.2 ${jsr305.version}_1 - 2.6.0 1.20.0 1.17.1 2.6.1 @@ -345,7 +345,7 @@ 20240303 - https://dlcdn.apache.org + https://archive.apache.org/dist ${project.build.directory}/site/${project.report.output.directory}/jacoco/jacoco.xml