Skip to content

Commit

Permalink
Merge remote-tracking branch 'horizon/release-22.0.2' into master-22
Browse files Browse the repository at this point in the history
  • Loading branch information
@opennms-bamboo
opennms-bamboo committed Jul 19, 2018
2 parents 24f9e6d + b0e2348 commit dbd0687
Show file tree
Hide file tree
Showing 723 changed files with 4,467 additions and 2,801 deletions.
2 changes: 1 addition & 1 deletion checkstyle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms</groupId>
<artifactId>org.opennms.checkstyle</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
<name>OpenNMS :: Checkstyle</name>
<build>
<plugins>
Expand Down
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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>

<groupId>org.opennms.container</groupId>
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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>

<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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-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 @@ -49,9 +49,9 @@ log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
log4j2.logger.opennmsTopology.name = org.opennms.features.topology
log4j2.logger.opennmsTopology.level = WARN

# 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 @@ -100,6 +100,6 @@ 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
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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>

<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/web/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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>

<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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/build/keystore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.build</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.build</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/build/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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
23 changes: 15 additions & 8 deletions core/db-install/src/main/resources/org/opennms/core/db/install/iplike.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean
c_rulework text;
c_ruletemp text;
c_scopeid text;
c_rulescope text;

i integer;

Expand Down Expand Up @@ -47,7 +48,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean
c_r := c_rulework;
end if;

if not check_rule(c_i, c_r) then
if check_rule(c_i, c_r) is not true then
return 'f';
end if;

Expand All @@ -56,12 +57,10 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean
i := i + 1;
end loop;
-- IPv6
elsif i_ipaddress ~ E'^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+(%[0-9]+)?$' and i_rule ~ E'^[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+(%[0-9*,-]+)?$' then
elsif i_ipaddress ~ E'^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+(%.+)?$' and i_rule ~ E'^[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+(%.+)?$' then
c_addrwork := i_ipaddress;
c_rulework := i_rule;

-- TODO Add support for scope identifiers

i := 0;
while i < 8 loop
if (strpos(c_addrwork, ':') > 0) then
Expand All @@ -87,11 +86,17 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean

if (strpos(c_rulework, ':') > 0) then
c_r := substr(c_rulework, 0, strpos(c_rulework, ':'));
elsif (strpos(c_rulework, '%') > 0) then
c_rulescope := substr(c_rulework, strpos(c_rulework, '%') + 1);
c_r := substr(c_rulework, 0, strpos(c_rulework, '%'));
else
c_r := c_rulework;
end if;

if not check_hex_rule(c_i, c_r) then
if check_hex_rule(c_i, c_r) is not true then
return 'f';
end if;
if (c_rulescope is not null) and ((c_scopeid = c_rulescope) is not true) then
return 'f';
end if;

Expand All @@ -101,7 +106,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean
end loop;
else
return 'f';
end if;
end if;

return 't';
end;
Expand Down Expand Up @@ -149,7 +154,7 @@ $$ language plpgsql;
create or replace function check_rule (i_octet integer, i_rule text) returns boolean as $$
declare
c_element text;
c_work text;
c_work text;
begin
if i_rule = '*' then -- * matches anything!
return 't';
Expand All @@ -171,7 +176,9 @@ begin
return 't';
end if;
else
if i_octet = to_number(c_element, '99999') then
if c_element = '*' then
return 't';
elsif i_octet = to_number(c_element, '99999') then
return 't';
end if;
end if;
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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/doc/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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/common/aws-sqs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.common</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.common</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.ipc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/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>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/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.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/aws-sqs-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/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.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/jms-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/mock-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core</groupId>
<artifactId>org.opennms.core.ipc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/shell-commands/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/ipc/rpc/utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opennms.core.ipc</groupId>
<artifactId>org.opennms.core.ipc.rpc</artifactId>
<version>22.0.1</version>
<version>22.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.ipc.rpc</groupId>
Expand Down
Loading

0 comments on commit dbd0687

Please sign in to comment.