update circle

.circleci/config.yml

@@ -15,7 +15,7 @@ executors:
       - image: opennms/antora:2.3.4-b6293
   integration-test-executor:
     machine:
-     image: ubuntu-2004:202010-01
+      image: ubuntu-2004:202010-01
   smoke-test-executor:
     machine:
       image: ubuntu-2004:202010-01
@@ -31,27 +31,27 @@ defaults: &defaults
     previous_branch:
       description: the previous branch, if any
       type: string
-      default: foundation-2021
+      default: release-29.x
     previous_branch_label:
       description: the previous branch, if any (escaped, no slashes)
       type: string
-      default: foundation-2021
+      default: release-29.x
     main_branch:
       description: the auto-merge main branch
       type: string
-      default: release-28.x
+      default: master-29
     main_branch_label:
       description: the auto-merge main branch (escaped, no slashes)
       type: string
-      default: release-28.x
+      default: master-29
     next_branch:
       description: the auto-merge target branch
       type: string
-      default: develop
+      default: ""
     next_branch_label:
       description: the auto-merge target branch (escaped, no slashes)
       type: string
-      default: develop
+      default: ""
 
 aliases:
   - &setup_dct_env
@@ -147,12 +147,12 @@ commands:
             keys:
               - maven-dependencies-v3-{{ checksum "pom-version-cache.key" }}-{{ checksum "maven-dependency-pom-cache.key" }}
               - maven-dependencies-v3-{{ checksum "pom-version-cache.key" }}-
-  update-maven-cache:
-      description: "Maven: Refresh local repository from POM files"
-      steps:
         - run:
             name: Remove old artifacts to keep workspace size down
             command: .circleci/scripts/clean-m2.sh
+  update-maven-cache:
+      description: "Maven: Refresh local repository from POM files"
+      steps:
         - run:
             name: Collect Maven Dependencies
             command: |
@@ -315,6 +315,7 @@ commands:
             .circleci/scripts/configure-signing.sh
             ./clean.pl
             << parameters.node-memory >>
+            export MAVEN_OPTS="$MAVEN_OPTS -Xmx8g -XX:ReservedCodeCacheSize=1g"
             ./compile.pl -DskipTests=true -Dbuild.skip.tarball=false \
               -DupdatePolicy=never \
               -Daether.connector.resumeDownloads=false \
@@ -359,7 +360,6 @@ commands:
         default: true
         type: boolean
     steps:
-      - update-maven-cache
       - run:
           name: Monitor JVM processes
           background: true

.circleci/scripts/itest.sh

@@ -50,7 +50,7 @@ echo "#### Installing other dependencies"
 # limit the sources we need to update
 sudo rm -f /etc/apt/sources.list.d/*
 
-# kill other apt-gets first to avoid problems locking /var/lib/apt/lists/lock - see https://discuss.circleci.com/t/could-not-get-lock-var-lib-apt-lists-lock/28337/6
+# kill other apt commands first to avoid problems locking /var/lib/apt/lists/lock - see https://discuss.circleci.com/t/could-not-get-lock-var-lib-apt-lists-lock/28337/6
 sudo killall -9 apt || true && \
             sudo apt update && \
             sudo env DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install \
@@ -71,7 +71,7 @@ sudo add-apt-repository 'deb http://debian.opennms.org stable main'
 # add the R repository
 sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"
 
-sudo apt-get update && \
+sudo apt update && \
             RRDTOOL_VERSION=$(apt-cache show rrdtool | grep Version: | grep -v opennms | awk '{ print $2 }') && \
             echo '* libraries/restart-without-asking boolean true' | sudo debconf-set-selections && \
             sudo env DEBIAN_FRONTEND=noninteractive apt -f --no-install-recommends install \

.circleci/scripts/smoke.sh

@@ -53,20 +53,21 @@ export MAVEN_OPTS="-Xmx1g -Xms1g"
 cd ~/project/smoke-test
 if [ $SUITE = "minimal" ]; then
   echo "#### Executing minimal set smoke/system tests"
-  # Run a set of known tests
-  for TEST_CLASS in "MenuHeaderIT" "SinglePortFlowsIT"
-  do
-    echo "###### Testing: ${TEST_CLASS}"
-    ../compile.pl -N -DskipTests=false -DskipITs=false -Dtest.fork.count=0 -Dit.test=$TEST_CLASS install verify
-  done
+  IT_TESTS="MenuHeaderIT,SinglePortFlowsIT"
 else
-  echo "#### Executing complete suite of smoke/system tests"
   find_tests
-  # Iterate through the tests and stop after the first failure
-  while read -r TEST_CLASS
-  do
-    echo "###### Testing: ${TEST_CLASS}"
-    ../compile.pl -N -DskipTests=false -DskipITs=false -DfailIfNoTests=false -Dtest.fork.count=0 -Dit.test="$TEST_CLASS" '-P!smoke.all' "-Psmoke.$SUITE" install verify
-  done < /tmp/this_node_it_tests
+  echo "#### Executing complete suite of smoke/system tests"
+  IT_TESTS="$(< /tmp/this_node_it_tests paste -s -d, -)"
 fi
 
+../compile.pl \
+  -DskipTests=false \
+  -DskipITs=false \
+  -DfailIfNoTests=false \
+  -Dtest.fork.count=0 \
+  -Dit.test="$IT_TESTS" \
+  --fail-fast \
+  -N \
+  '-P!smoke.all' \
+  "-Psmoke.$SUITE" \
+  install verify

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,32 @@
 ### All Contributors
 
-* [ ] Have you read and followed our [Contribution Guidelines](https://github.com/OpenNMS/opennms/blob/develop/CONTRIBUTING.md)?
+* [ ] Have you read our [Contribution Guidelines](https://github.com/OpenNMS/opennms/blob/develop/CONTRIBUTING.md)?
 * [ ] Have you (electronically) signed the [OpenNMS Contributor Agreement](https://cla-assistant.io/OpenNMS/opennms)?
-* [ ] Have you [made an issue in the OpenNMS issue tracker](https://issues.opennms.org)?<br>If so, you should:
-  1. update the title of this PR to be of the format: `${JIRA-ISSUE-NUMBER}: subject of pull request`
+
+### Contribution Checklist
+
+* Please [make an issue in the OpenNMS issue tracker](https://issues.opennms.org) if there isn't one already.<br />Once there is an issue, please:
+  1. update the title of this PR to be in the format: `${JIRA-ISSUE-NUMBER}: subject of pull request`
   2. update the JIRA link at the bottom of this comment to refer to the real issue number
   3. prefix your commit messages with the issue number, if possible
-  If you're not sure how to do this, we can help you get things set up properly.
-* [ ] Have you made a comment in that issue which points back to this PR?
-* [ ] Have you updated the JIRA link at the bottom of this comment to link to your issue?
-* [ ] If this is a new or updated feature, is there documentation for the new behavior?
-* [ ] If this is new code, are there unit and/or integration tests?
-* [ ] If this PR targets a `foundation-*` branch, does it avoid changing files in `$OPENNMS_HOME/etc/`?
+  4. once you've created this PR, please link to it in a comment in the JIRA issue
+  Don't worry if this sounds like a lot, we can help you get things set up properly.
+* If this is a new or updated feature, is there documentation for the new behavior?
+* If this is new code, are there unit and/or integration tests?
+* If this PR targets a `foundation-*` branch, does it try to avoid changing files in `$OPENNMS_HOME/etc/`?
 
-### Pull Request Process
+### What's Next?
 
-One or more reviewers should be assigned to each PR.
+A PR should be assigned at least 2 reviewers.  If you know that someone would be a good person to review your code, feel free to add them.
 
-If you know that a particular person is subject matter expert in the area your PR affects, feel free to assign one or more reviewers when you create this PR, otherwise reviewers will be assigned for you.
+If you need help making additions or changes to the documentation related to your changes, please let us know.
 
-If you have made additions or changes to the documentation, or if you _need_ documentation for these code changes, please make sure a technical writer has looked it over.
+In any case, if anything is unclear or you want help getting your PR ready for merge, please don't hesitate to say something in the comments here,
+or in [the #opennms-development chat channel](https://chat.opennms.com/opennms/channels/opennms-development).
 
-Once the reviewer(s) accept the PR and the branch passes continuous integration, the PR is eligible for merge.
+Once reviewer(s) accept the PR and the branch passes continuous integration, the PR is eligible for merge.
 
-At that time, if you have commit access (are an OpenNMS Group employee or a member of the Order of the Green Polo) you are welcome to merge the PR.
+At that time, if you have commit access (are an OpenNMS Group employee or a member of the OGP) you are welcome to merge the PR when you're ready.
 Otherwise, a reviewer can merge it for you.
 
 Thanks for taking time to contribute!

.github/label-pr.yml

@@ -0,0 +1,6 @@
+- regExp: "^docs/.*$"
+  labels: ["docs"]
+- regExp: "^opennms-doc/.*$"
+  labels: ["docs"]
+- regExp: "^.*\\.adoc$"
+  labels: ["docs"]

.github/workflows/labeler.yml

@@ -0,0 +1,16 @@
+# Workflow to associate labels automatically
+name: PR-Labeler
+# Trigger the workflow on pull request events
+on: [pull_request]
+jobs:
+  label:
+    runs-on: ubuntu-18.04
+    steps:
+      # We need to checkout the repository to access the configured file (.github/label-pr.yml)
+      - uses: actions/checkout@v2
+      - name: Labeler
+        uses: docker://decathlon/pull-request-labeler-action:2.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Here we can override the path for the action configuration. If none is provided, default one is `.github/label-pr.yml`
+          CONFIG_PATH: ${{ secrets.GITHUB_WORKSPACE }}/.github/label-pr.yml

.nightly

@@ -1,2 +1,2 @@
 repo: develop
-parent_branch: release-28.x
+parent_branch: develop

LICENSE.md

@@ -91,32 +91,4 @@ view the header in each file:
 * opennms-services/src/main/java/org/opennms/netmgt/xmlrpcd/TimeoutSecureXmlRpcTransport.java
 * opennms-services/src/main/java/org/opennms/netmgt/xmlrpcd/TimeoutSecureXmlRpcTransportFactory.java
 * opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogClient.java
-* opennms-tools/m2eclipse-integration/org.opennms.m2e.castor/src/org/opennms/m2e/castor/internal/CastorBuildParticipant.java
-* opennms-tools/m2eclipse-integration/org.opennms.m2e.castor/src/org/opennms/m2e/castor/internal/CastorProjectConfigurator.java
-* opennms-tools/m2eclipse-integration/org.opennms.m2e.castor.feature/feature.properties
-* opennms-tools/opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/qosd/ejb/AlarmListJ2eeConnectionManagerThread.java
-* opennms-tools/OpenNMSXMLClient/src/main/java/com/bt/bcos/adapter/AdapterIf.java
-* opennms-tools/OpenNMSXMLClient/src/main/java/org/opennms/xmlclient/BasicHttpMethods.java
-* opennms-tools/OpenNMSXMLClient/src/main/java/org/opennms/xmlclient/ClientPropertiesLoader.java
-* opennms-tools/OpenNMSXMLClient/src/main/java/org/opennms/xmlclient/OpenNmsXmlClient.java
-* opennms-tools/OpenNMSXMLClient/src/main/java/org/opennms/xmlclient/bcos/OpenNmsBcosAdapter.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xml/model/client/GetNodesTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xml/model/client/GetRrdDataTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/InterfaceAddTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/InterfaceRemoveTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/NodeAddTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/NodeRemoveTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/RequisitionAddTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/RequisitionImportTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/RequisitionListTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/RequisitionRemoveDeployedTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/RequisitionRemoveTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/XMLMarshalTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/BcosAddTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/BcosCommitTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/BcosRemoveTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/catalyst/CatalystAddTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/catalyst/CatalystCommitTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/catalyst/CatalystRemoveTest.java
-* opennms-tools/OpenNMSXMLClient/src/test/java/org/opennms/xmlclient/bcos/catalyst/RepeatingAddRemoveTest.java
 

checkstyle/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms</groupId>
   <artifactId>org.opennms.checkstyle</artifactId>
-  <version>28.1.1</version>
+  <version>29.0.0-SNAPSHOT</version>
   <name>OpenNMS :: Checkstyle</name>
   <build>
     <plugins>

container/branding/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.container</artifactId>
-    <version>28.1.1</version>
+    <version>29.0.0-SNAPSHOT</version>
   </parent>
 
     <groupId>org.opennms.container</groupId>

container/bridge/api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>28.1.1</version>
+        <version>29.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.api</artifactId>

container/bridge/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>28.1.1</version>
+        <version>29.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.opennms.container</groupId>
     <artifactId>org.opennms.container.bridge</artifactId>

container/bridge/proxy/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>28.1.1</version>
+        <version>29.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.proxy</artifactId>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

container/bridge/rest/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>28.1.1</version>
+        <version>29.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.rest</artifactId>
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
             <version>${osgiCompendiumVersion}</version>
             <scope>provided</scope>
         </dependency>
@@ -42,18 +42,14 @@
     <!-- Required for com.eclipsesource.jaxrs/* -->
     <repositories>
         <repository>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-            <id>opennms-repo</id>
-            <name>OpenNMS Maven Repository</name>
-            <url>http://maven.opennms.org/content/groups/opennms.org-release</url>
-        </repository>
-        <repository>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-            <id>opennms-snapshots</id>
-            <name>OpenNMS Snapshot Maven Repository</name>
-            <url>http://maven.opennms.org/content/groups/opennms.org-snapshot</url>
+            <id>opennms-maven-3rdparty</id>
+            <url>https://packages.opennms.com/public/3rdparty/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
 </project>

container/extender/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>28.1.1</version>
+        <version>29.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.container</groupId>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>