Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,34 @@ github:
- stomp
- java
- jms

enabled_merge_buttons:
squash: true
merge: true
rebase: true
merge: false
rebase: false

del_branch_on_merge: true

protected_branches:
main:
required_pull_request_reviews:
require_code_owner_reviews: false
required_approving_review_count: 0
required_linear_history: true
required_status_checks:
strict: false
contexts:
- build
- test

features:
wiki: false
issues: false
projects: false

autolink_jira:
- AMQ

notifications:
commits: commits@activemq.apache.org
issues: gitbox@activemq.apache.org
Expand Down
36 changes: 36 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 50
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
73 changes: 73 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: Build

on:
push:
branches: [ "main", "activemq-6.1.x", "activemq-5.19.x" ]
pull_request:
branches: [ "main", "activemq-6.1.x", "activemq-5.19.x" ]

jobs:
build:

permissions:
contents: read

strategy:
matrix:
os: [ ubuntu-24.04, ubuntu-22.04, macos-26, macos-15, macos-14, macos-13, windows-2025, windows-2022 ]
java-version: [ 17, 21, 24 ]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: temurin
- name: Build
run: mvn -U -B -e clean install -DskipTests
- name: Verify
run: mvn apache-rat:check

test:

permissions:
contents: read

strategy:
matrix:
os: [ ubuntu-24.04, ubuntu-22.04, macos-26, macos-15, macos-14, macos-13, windows-2025, windows-2022 ]
java-version: [ 17 ]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: temurin
- name: Test
run: mvn -B -e -fae test "-Dsurefire.rerunFailingTestsCount=3"
42 changes: 42 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: Deploy

on:
schedule:
- cron: '0 0 * * *'

jobs:
deploy:

permissions:
contents: read

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- name: Deploy
run: mvn -B -e deploy -Pdeploy -DskipTests
26 changes: 6 additions & 20 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ pipeline {
}
}

triggers {
cron('0 0 * * *')
}

tools {
// ... tell Jenkins what java version, maven version or other tools are required ...
maven 'maven_3_latest'
Expand All @@ -42,10 +46,9 @@ pipeline {
}

parameters {
choice(name: 'nodeLabel', choices: ['ubuntu', 's390x', 'arm', 'Windows'])
choice(name: 'nodeLabel', choices: [ 's390x'])
choice(name: 'jdkVersion', choices: ['jdk_17_latest', 'jdk_21_latest', 'jdk_24_latest', 'jdk_17_latest_windows', 'jdk_21_latest_windows', 'jdk_24_latest_windows'])
booleanParam(name: 'deployEnabled', defaultValue: false)
booleanParam(name: 'sonarEnabled', defaultValue: false)
booleanParam(name: 'sonarEnabled', defaultValue: true)
booleanParam(name: 'testsEnabled', defaultValue: true)
}

Expand Down Expand Up @@ -141,23 +144,6 @@ pipeline {
}
}

stage('Deploy') {
tools {
jdk params.jdkVersion
}
when {
expression {
params.deployEnabled && env.BRANCH_NAME ==~ /(activemq-5.19.x|activemq-6.1.x|main)/
}
}
steps {
echo 'Deploying'
sh 'java -version'
sh 'mvn -version'
sh 'mvn -B -e deploy -Pdeploy -DskipTests'
}
}

stage('Quality') {
when { expression { return params.sonarEnabled } }

Expand Down
4 changes: 4 additions & 0 deletions activemq-kahadb-store/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<name>ActiveMQ :: KahaDB Store</name>
<description>The ActiveMQ KahaDB Store Implementation</description>

<properties>
<surefire.argLine>-Xmx512M</surefire.argLine>
</properties>

<dependencies>

<!-- =============================== -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,13 @@
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.LoggingEvent;


@Ignore("Temporary to test GitHub Action")
public class JournalCorruptionEofIndexRecoveryTest {

private static final Logger LOG = LoggerFactory.getLogger(JournalCorruptionEofIndexRecoveryTest.class);
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -968,13 +968,12 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<argLine>-enableassertions</argLine>
<failIfNoTests>false</failIfNoTests>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
<org.apache.activemq.kahaDB.files.skipMetadataUpdate>true</org.apache.activemq.kahaDB.files.skipMetadataUpdate>
</systemPropertyVariables>
<argLine>-Xmx512m</argLine>
<argLine>-enableassertions -Xmx1G</argLine>
</configuration>
</plugin>
<plugin>
Expand Down
Loading