Build updates.

.drone.yml

@@ -0,0 +1,26 @@
+---
+kind: pipeline
+name: default
+type: docker
+
+steps:
+- name: test
+  image: eclipse-temurin:8-jdk
+  commands:
+    - ./gradlew test
+- name: build
+  image: eclipse-temurin:8-jdk
+  environment:
+    AUTH_TOKEN:           # Gitea access token ENV variable
+      from_secret: auth   # Name of DroneCI secret exposed above
+  commands:
+  - ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository
+  - for file in server/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  - for file in server/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  - for file in client/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  - for file in client/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  - for file in plugins/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  - for file in plugins/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
+  when:
+    event:
+    - tag

.editorconfig

@@ -5,4 +5,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[*.yml]
+indent_size = 2

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.1] - 2022-12-xx
+## [1.1.1] - 2023-01-xx
 - Simplify plugin naming
+- Initial support for calling (groovy) scripts
 
 ## [1.1.0] - 2022-12-17
 - Lower influx time precision from milliseconds to seconds

build.gradle

@@ -27,11 +27,14 @@ subprojects {
         mavenCentral()
     }
 
-    sourceCompatibility = 1.8
+    java {
-    targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
 }
 
-tasks.create("packages") {
+tasks.register("packages") {
     group "build"
 
     dependsOn ":client:buildDeb"

client/build.gradle

@@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
     id 'application'
 
-    id "com.github.johnrengelman.shadow" version "7.1.2"
     id "net.nemerosa.versioning" version "2.15.1"
-    id "nebula.ospackage" version "9.1.1"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.netflix.nebula.ospackage" version "10.0.0"
 }
 
 dependencies {
@@ -76,7 +76,6 @@ shadowJar {
     mergeServiceFiles() // Tell plugin to merge duplicate service files
 }
 
-apply plugin: 'nebula.ospackage'
 ospackage {
     packageName = projectName
     release = '1'

plugins/build.gradle

@@ -1,7 +1,7 @@
 import org.redline_rpm.header.Os
 
 plugins {
-    id "nebula.ospackage" version "9.1.1"
+    id "com.netflix.nebula.ospackage" version "10.0.0"
 }
 
 
@@ -82,7 +82,6 @@ tasks.clean.dependsOn(tasks.customCleanUp)
 def projectName = "sysmon-plugins"
 
 
-apply plugin: 'nebula.ospackage'
 ospackage {
     packageName = projectName
     release = '1'

server/build.gradle

@@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
     id 'application'
 
-    id "com.github.johnrengelman.shadow" version "7.1.2"
     id "net.nemerosa.versioning" version "2.15.1"
-    id "nebula.ospackage" version "9.1.1"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.netflix.nebula.ospackage" version "10.0.0"
 }
 
 dependencies {
@@ -40,7 +40,6 @@ tasks.named('test') {
     useJUnitPlatform()
 }
 
-apply plugin: 'nebula.ospackage'
 ospackage {
     packageName = projectName
     release = '1'

shared/build.gradle

@@ -36,19 +36,22 @@ tasks.named('test') {
 }
 
 publishing {
+    publications {
+        library(MavenPublication) {
+            groupId = 'sysmon'
+            artifactId = 'shared'
+
+            from components.java
+        }
+    }
     repositories {
         maven {
-            name = "GitHubPackages"
+            name = "gitea"
-            url = uri("https://maven.pkg.github.com/Danish-Sensor-Engineering/libsensor")
+            url = uri("https://git.data.coop/api/packages/$System.env.DRONE_REPO_OWNER/maven")
             credentials {
-                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                username = "$System.env.DRONE_REPO_OWNER"
-                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+                password = "$System.env.AUTH_TOKEN"
             }
         }
     }
-    publications {
-        gpr(MavenPublication) {
-            from(components.java)
-        }
-    }
 }