Merge remote-tracking branch 'origin/release-3.x' into develop

OpenNMS · Dec 6, 2023 · e9dd5fd · e9dd5fd
2 parents 6f4644c + ae1af8b
commit e9dd5fd
Show file tree

Hide file tree

Showing 33 changed files with 2,731 additions and 368 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -292,6 +292,7 @@ jobs:
           name: Gather artifacts
           command: |
             mkdir -p ~/dist/
+            cp assembly/kar/target/opennms-alec-plugin.kar ~/dist/
             cp assembly/opennms-rpm/target/rpm/opennms-alec-plugin/RPMS/noarch/* ~/dist/
             cp assembly/sentinel-rpm/target/rpm/sentinel-alec-plugin/RPMS/noarch/* ~/dist/
           when: always
@@ -415,8 +416,8 @@ jobs:
           name: Deploy the artifacts
           command: |
             mkdir -p ~/.m2
-            echo "${GPG_SECRET_KEY_RSA_4096}" | base64 -d > ~/.m2/sign-key.asc
-            export SIGN_KEY_PASS="$(echo "${GPG_PASSPHRASE_RSA_4096}" | base64 -d)"
+            echo "${GPG_SECRET_KEY}" | base64 -d > ~/.m2/sign-key.asc
+            export SIGN_KEY_PASS="$(echo "${GPG_PASSPHRASE}" | base64 -d)"
             mvn -s .circleci.settings.xml -DskipTests -Prelease deploy
 
   deploy-packages:

diff --git a/.github/assign-by-files.yml b/.github/assign-by-files.yml
@@ -1,6 +1,6 @@
 ---
 "**/*.adoc":
-  - Bonrob2
+  - indigo423
 
 "docs/**/*":
-  - Bonrob2
+  - indigo423
diff --git a/datasource/opennms-common/pom.xml b/datasource/opennms-common/pom.xml
@@ -10,6 +10,25 @@
     <name>ALEC :: Datasource :: OpenNMS-Common</name>
     <packaging>bundle</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
+                        <Import-Package>
+                            com.google.common.*;version="${guava.major.version}",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.opennms.alec.datasource</groupId>

diff --git a/datasource/opennms-direct/pom.xml b/datasource/opennms-direct/pom.xml
@@ -17,14 +17,15 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Import-Package>
                             org.opennms.integration.api.v1.model,
                             org.opennms.alec.datasource.api,
                             org.opennms.alec.datasource.common,
                             org.opennms.alec.datasource.common.inventory,
+                            com.google.common.*;version="${guava.major.version}",
                             *
                         </Import-Package>
                     </instructions>

diff --git a/datasource/opennms-kafka/pom.xml b/datasource/opennms-kafka/pom.xml
@@ -17,7 +17,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <!-- we need to exclude org.apache.kafka.streams.KafkaStreams because it is otherwise treated as package,
@@ -30,6 +30,7 @@
                             org.opennms.alec.datasource.opennms.processors,
                             org.opennms.alec.datasource.opennms.proto,
                             org.opennms.alec.datasource.opennms.serialization,
+                            com.google.common.*;version="${guava.major.version}",
                             *
                         </Import-Package>
                     </instructions>