Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-31.x' into master-31
Browse files Browse the repository at this point in the history
  • Loading branch information
@mershad-manesh
mershad-manesh committed Jun 13, 2023
2 parents 1e3cfaa + b70fecd commit 2c0fe07
Show file tree
Hide file tree
Showing 902 changed files with 1,365 additions and 1,019 deletions.
4 changes: 2 additions & 2 deletions .circleci/main/parameters.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ parameters:
next_branch:
description: the auto-merge target branch
type: string
default: develop
default: release-32.x
next_branch_label:
description: the auto-merge target branch (escaped, no slashes)
type: string
default: develop
default: release-32.x

### sub-tree "module" build setup ###
trigger-docs:
Expand Down
2 changes: 1 addition & 1 deletion .version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
31.0.8
31.0.9-SNAPSHOT
2 changes: 1 addition & 1 deletion container/branding/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>

<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/bridge/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.container</groupId>
<artifactId>org.opennms.container.bridge</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<groupId>org.opennms.container.bridge</groupId>
<artifactId>org.opennms.container.bridge.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<groupId>org.opennms.container</groupId>
<artifactId>org.opennms.container.bridge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/bridge/proxy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.container</groupId>
<artifactId>org.opennms.container.bridge</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<groupId>org.opennms.container.bridge</groupId>
<artifactId>org.opennms.container.bridge.proxy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/bridge/rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.container</groupId>
<artifactId>org.opennms.container.bridge</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<groupId>org.opennms.container.bridge</groupId>
<artifactId>org.opennms.container.bridge.rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/extender/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.karaf</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/jaas-login-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>

<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/karaf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.container</groupId>
Expand Down
6 changes: 3 additions & 3 deletions container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ log4j2.logger.opennmsTopology.level = WARN
log4j2.logger.opennmsContainerBridge.name = org.opennms.container.web.bridge.rest
log4j2.logger.opennmsContainerBridge.level = INFO

# OPENNMS: Display all WARN logs for our code
# OPENNMS: Display all DEBUG logs for our code
log4j2.logger.opennms.name = org.opennms
log4j2.logger.opennms.level = WARN
log4j2.logger.opennms.level = DEBUG

# Appenders configuration

Expand Down Expand Up @@ -117,7 +117,7 @@ log4j2.appender.osgi.filter = *
#log4j2.logger.aether.name = shaded.org.eclipse.aether
#log4j2.logger.aether.level = TRACE
#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
#log4j2.logger.http-headers.level = WARN
#log4j2.logger.http-headers.level = DEBUG
#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
#log4j2.logger.maven.level = TRACE

Expand Down
2 changes: 1 addition & 1 deletion container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>opennms</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.opennms.container</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion container/servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>

<groupId>org.opennms.container</groupId>
Expand Down
7 changes: 4 additions & 3 deletions container/shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.container</groupId>
Expand Down Expand Up @@ -96,8 +96,9 @@
<!-- make sure the custom opennms features don't make it in -->
<feature>opennms-bridge-http-service</feature>
<feature>opennms-http-whiteboard</feature>
<feature>jetty/9.4.40.v20210413</feature>
<feature>pax-jetty/9.4.40.v20210413</feature>

<feature>jetty/9.4.43.v20210629</feature>
<feature>pax-jetty/9.4.43.v20210629</feature>
<feature>ssh/${karafVersion}</feature>
</blacklistedFeatures>
<installedBundles>
Expand Down
2 changes: 1 addition & 1 deletion container/spring-extender/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.container</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/cache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/commands/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/criteria/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/daemon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/db-install/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/encrypt-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>org.opennms.core</artifactId>
<groupId>org.opennms</groupId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/grpc/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>org.opennms.core.grpc</artifactId>
<groupId>org.opennms.core</groupId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/grpc/osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>org.opennms.core.grpc</artifactId>
<groupId>org.opennms.core</groupId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>org.opennms.core</artifactId>
<groupId>org.opennms</groupId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/health/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.health</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.health</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/health/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.health</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.health</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/health/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/health/rest-cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.health</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.health</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/health/rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.health</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.health</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/health/shell/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.health</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.health</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/icmp-jna/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.core</artifactId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/common/kafka-shell/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>org.opennms.core.ipc.common</artifactId>
<groupId>org.opennms.core.ipc</groupId>
<version>31.0.8</version>
<version>31.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit 2c0fe07

Please sign in to comment.