This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new eae5475236 QPID-8729: [Broker-J] Update parent pom org.apache:apache
to version 37 (#372)
eae5475236 is described below
commit eae547523665c82a7d0464ec2a62eba57986a57a
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Thu Feb 19 10:25:10 2026 +0100
QPID-8729: [Broker-J] Update parent pom org.apache:apache to version 37
(#372)
---
broker-core/pom.xml | 4 ++--
.../qpid/server/store/TestMessageMetaDataType.java | 2 ++
.../server/virtualhost/TestMemoryVirtualHost.java | 2 ++
.../virtualhostnode/TestVirtualHostNodeFactory.java | 2 ++
...he.qpid.server.plugin.ConfiguredObjectTypeFactory | 20 --------------------
...org.apache.qpid.server.plugin.MessageMetaDataType | 19 -------------------
perftests/pom.xml | 2 +-
perftests/visualisation-jfc/pom.xml | 2 +-
pom.xml | 5 +++--
systests/qpid-systests-http-management/pom.xml | 2 +-
10 files changed, 14 insertions(+), 46 deletions(-)
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index f1d99b0432..0c7c90c374 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -122,7 +122,7 @@
<resource>
<directory>src/main/java</directory>
<excludes>
- <exclude>**/*.java/</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
@@ -131,7 +131,7 @@
<testResource>
<directory>${basedir}/src/test/java</directory>
<excludes>
- <exclude>**/*.java/</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
b/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
index dceb2d7d0c..a93ab8f7dd 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
@@ -25,7 +25,9 @@ import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.plugin.MessageMetaDataType;
+import org.apache.qpid.server.plugin.PluggableService;
+@PluggableService
public class TestMessageMetaDataType implements
MessageMetaDataType<TestMessageMetaData>
{
//largest metadata type value the BDBMessageStore can store (it uses a
byte)
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/TestMemoryVirtualHost.java
b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/TestMemoryVirtualHost.java
index 2ae626cec5..48fb778a64 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/TestMemoryVirtualHost.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/TestMemoryVirtualHost.java
@@ -25,9 +25,11 @@ import java.util.Map;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestMemoryMessageStore;
+@PluggableService
@ManagedObject(category = false, type =
TestMemoryVirtualHost.VIRTUAL_HOST_TYPE)
public class TestMemoryVirtualHost extends
AbstractVirtualHost<TestMemoryVirtualHost>
{
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java
b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java
index 94b133b988..0f36b5ae7f 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java
@@ -25,7 +25,9 @@ import java.util.Map;
import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.PluggableService;
+@PluggableService
public class TestVirtualHostNodeFactory extends
AbstractConfiguredObjectTypeFactory<TestVirtualHostNode>
{
public TestVirtualHostNodeFactory()
diff --git
a/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory
b/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory
deleted file mode 100644
index 58b646abbf..0000000000
---
a/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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.
-#
-org.apache.qpid.server.virtualhostnode.TestVirtualHostNodeFactory
-
diff --git
a/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
b/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
deleted file mode 100644
index 5edf3448f9..0000000000
---
a/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-org.apache.qpid.server.store.TestMessageMetaDataType
diff --git a/perftests/pom.xml b/perftests/pom.xml
index 3b7225b6e4..71468768ec 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -128,7 +128,7 @@
<resource>
<directory>src/main/java</directory>
<excludes>
- <exclude>**/*.java/</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
diff --git a/perftests/visualisation-jfc/pom.xml
b/perftests/visualisation-jfc/pom.xml
index ffae515c6f..3147e371e3 100644
--- a/perftests/visualisation-jfc/pom.xml
+++ b/perftests/visualisation-jfc/pom.xml
@@ -88,7 +88,7 @@
<resource>
<directory>src/main/java</directory>
<excludes>
- <exclude>**/*.java/</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
diff --git a/pom.xml b/pom.xml
index e4e4da976a..5a64c79065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>35</version>
+ <version>37</version>
</parent>
<groupId>org.apache.qpid</groupId>
@@ -76,8 +76,9 @@
</distributionManagement>
<properties>
+ <javaVersion>17</javaVersion>
<minimum-maven-version>3.0.0</minimum-maven-version>
- <minimum-java-version>17</minimum-java-version>
+ <minimum-java-version>${javaVersion}</minimum-java-version>
<maven.compiler.source>${minimum-java-version}</maven.compiler.source>
<maven.compiler.target>${minimum-java-version}</maven.compiler.target>
<skipTests>false</skipTests>
diff --git a/systests/qpid-systests-http-management/pom.xml
b/systests/qpid-systests-http-management/pom.xml
index 042d2f7da2..488fb956ea 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -147,7 +147,7 @@
<testResource>
<directory>${basedir}/src/test/java</directory>
<excludes>
- <exclude>**/*.java/</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
