Skip to content

Commit

Permalink
Merge branch 'rc/stable/1.12.8' into 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Reed committed Jun 4, 2014
2 parents 0129e2d + ea9db2e commit 4d0cc24
Show file tree
Hide file tree
Showing 362 changed files with 443 additions and 366 deletions.
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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.osgi</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 @@ -7,7 +7,7 @@
<parent>
<groupId>org.opennms</groupId>
<artifactId>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>

<groupId>org.opennms.container</groupId>
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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>

<groupId>org.opennms.container</groupId>
Expand Down
2 changes: 1 addition & 1 deletion container/standalone/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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<groupId>org.opennms.container</groupId>
<artifactId>standalone</artifactId>
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>container</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/lib/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.opennms.core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/runtime/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/schema/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/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</groupId>
<artifactId>org.opennms.core.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/impl-joesnmp/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.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/impl-mock/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.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/impl-snmp4j/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.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/integration-tests/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.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/joesnmp/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.snmp</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion core/snmp/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/soa/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/tasks/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/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.core</groupId>
<artifactId>org.opennms.core.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/dns/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/http/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/lib/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/schema/a/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.test-api</groupId>
<artifactId>org.opennms.core.test-api.schema</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api.schema</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/schema/b/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.test-api</groupId>
<artifactId>org.opennms.core.test-api.schema</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api.schema</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/schema/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/services/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/snmp/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/test-api/xml/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.test-api</artifactId>
<version>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core.test-api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/upgrade/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/web/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/xml/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>1.12.8-SNAPSHOT</version>
<version>1.12.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opennms.core</groupId>
Expand Down
Loading

0 comments on commit 4d0cc24

Please sign in to comment.