fix(packaging): move to net.laprun.sustainability package / group id

.github/workflows/release.yml

@@ -1,13 +1,13 @@
-name: Quarkiverse Release
+name: Release
 
 on:
   pull_request:
-    types: [closed]
+    types: [ closed ]
     paths:
       - '.github/project.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
 
 defaults:
@@ -17,7 +17,7 @@ defaults:
 jobs:
   release:
     runs-on: ubuntu-latest
-    name: release
+    name: Maven release
     if: ${{github.event.pull_request.merged == true}}
 
     steps:
@@ -28,24 +28,18 @@ jobs:
           github-token: ${{secrets.GITHUB_TOKEN}}
           metadata-file-path: '.github/project.yml'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Import GPG key
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v5
+      - uses: actions/setup-java@v4
         with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
           cache: 'maven'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Configure Git author
         run: |
@@ -62,13 +56,14 @@ jobs:
 
       - name: Maven release ${{steps.metadata.outputs.current-version}}
         run: |
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
-          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
+          mvn -B release:prepare -Prelease -Darguments="-DskipTests" -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          mvn -B release:perform -Darguments="-DperformRelease -DskipTests" -DperformRelease -Prelease
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_USERNAME: "${{ secrets.OSSRH_USERNAME }}"
+          MAVEN_PASSWORD: "${{ secrets.OSSRH_TOKEN }}"
+          MAVEN_GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
 
       - name: Push changes to ${{github.base_ref}} branch
         run: |
           git push
-          git push origin ${{steps.metadata.outputs.current-version}}
+          git push origin ${{steps.metadata.outputs.current-version}}

README.md

@@ -25,7 +25,7 @@ To use the extension:
    your application:
     ```xml
    <dependency>
-     <groupId>io.quarkiverse.power</groupId>
+     <groupId>net.laprun.sustainability.power.quarkus</groupId>
      <artifactId>quarkus-power</artifactId>
     <version>${project.version}</version>
    </dependency>

contributing/eclipse.importorder

@@ -0,0 +1,7 @@
+#Organize Import Order
+#Wed Jan 23 12:03:29 AEDT 2019
+0=java
+1=javax
+2=jakarta
+3=org
+4=com

deployment/pom.xml

@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>io.quarkiverse.power</groupId>
+    <groupId>net.laprun.sustainability</groupId>
     <artifactId>quarkus-power-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
@@ -23,7 +23,7 @@
       <artifactId>quarkus-rest-jackson-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.quarkiverse.power</groupId>
+      <groupId>net.laprun.sustainability</groupId>
       <artifactId>quarkus-power</artifactId>
       <version>${project.version}</version>
     </dependency>

deployment/src/main/java/io/quarkiverse/power/deployment/PowerProcessor.java → deployment/src/main/java/net/laprun/sustainability/power/quarkus/deployment/PowerProcessor.java

@@ -1,12 +1,12 @@
-package io.quarkiverse.power.deployment;
+package net.laprun.sustainability.power.quarkus.deployment;
 
-import io.quarkiverse.power.deployment.devui.commands.PowerCommands;
-import io.quarkiverse.power.runtime.PowerMeasurer;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ConsoleCommandBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import net.laprun.sustainability.power.quarkus.deployment.devui.commands.PowerCommands;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasurer;
 
 class PowerProcessor {
 

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/PowerCommands.java → deployment/src/main/java/net/laprun/sustainability/power/quarkus/deployment/devui/commands/PowerCommands.java

@@ -1,19 +1,21 @@
-package io.quarkiverse.power.deployment.devui.commands;
+package net.laprun.sustainability.power.quarkus.deployment.devui.commands;
 
 import java.util.List;
 
-import org.aesh.command.*;
+import org.aesh.command.Command;
+import org.aesh.command.CommandResult;
+import org.aesh.command.GroupCommand;
+import org.aesh.command.GroupCommandDefinition;
 import org.aesh.command.invocation.CommandInvocation;
 
-import io.quarkiverse.power.runtime.PowerMeasurer;
-import io.quarkiverse.power.runtime.SensorMeasure;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasurer;
 
 @GroupCommandDefinition(name = "power", description = "Power consumption commands", generateHelp = true)
 @SuppressWarnings("rawtypes")
 public class PowerCommands implements GroupCommand {
-    private final PowerMeasurer<? extends SensorMeasure> sensor;
+    private final PowerMeasurer sensor;
 
-    public PowerCommands(PowerMeasurer<? extends SensorMeasure> sensor) {
+    public PowerCommands(PowerMeasurer sensor) {
         this.sensor = sensor;
     }
 
@@ -23,7 +25,7 @@ public List<Command> getCommands() {
     }
 
     @Override
-    public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException {
+    public CommandResult execute(CommandInvocation commandInvocation) {
         commandInvocation.println(commandInvocation.getHelpInfo());
         return CommandResult.SUCCESS;
     }

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/StartCommand.java → deployment/src/main/java/net/laprun/sustainability/power/quarkus/deployment/devui/commands/StartCommand.java

@@ -1,18 +1,17 @@
-package io.quarkiverse.power.deployment.devui.commands;
+package net.laprun.sustainability.power.quarkus.deployment.devui.commands;
 
 import org.aesh.command.CommandDefinition;
 import org.aesh.command.CommandResult;
 import org.aesh.command.invocation.CommandInvocation;
 import org.aesh.command.option.Option;
 
-import io.quarkiverse.power.runtime.PowerMeasure;
-import io.quarkiverse.power.runtime.PowerMeasurer;
-import io.quarkiverse.power.runtime.SensorMeasure;
 import io.quarkus.deployment.console.QuarkusCommand;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasure;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasurer;
 
 @CommandDefinition(name = "start", description = "Starts measuring power consumption of the current application")
 public class StartCommand extends QuarkusCommand {
-    private final PowerMeasurer<? extends SensorMeasure> sensor;
+    private final PowerMeasurer sensor;
     private PowerMeasure baseline;
 
     @Option(name = "stopAfter", shortName = 's', description = "Automatically stop the measures after the specified duration in seconds", defaultValue = "-1")
@@ -21,7 +20,7 @@ public class StartCommand extends QuarkusCommand {
     @Option(name = "frequency", shortName = 'f', description = "The frequency at which measurements should be taken, in milliseconds", defaultValue = "1000")
     private long frequency;
 
-    public StartCommand(PowerMeasurer<? extends SensorMeasure> sensor) {
+    public StartCommand(PowerMeasurer sensor) {
         this.sensor = sensor;
     }
 
@@ -41,10 +40,7 @@ public CommandResult doExecute(CommandInvocation commandInvocation) {
                     commandInvocation.println("Establishing baseline for 30s, please do not use your application until done.");
                     commandInvocation.println("Power measurement will start as configured after this initial measure is done.");
                     sensor.start(30, 1000);
-                    sensor.onError(e -> {
-                        commandInvocation.println("An error occurred: " + e.getMessage());
-                        e.printStackTrace();
-                    });
+                    sensor.onError(e -> commandInvocation.println("An error occurred: " + e.getMessage()));
                     sensor.onCompleted((m) -> {
                         baseline = m;
                         outputConsumptionSinceStarted(baseline, commandInvocation, true);

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/StopCommand.java → deployment/src/main/java/net/laprun/sustainability/power/quarkus/deployment/devui/commands/StopCommand.java

@@ -1,19 +1,18 @@
-package io.quarkiverse.power.deployment.devui.commands;
+package net.laprun.sustainability.power.quarkus.deployment.devui.commands;
 
 import org.aesh.command.CommandDefinition;
 import org.aesh.command.CommandResult;
 import org.aesh.command.invocation.CommandInvocation;
 
-import io.quarkiverse.power.runtime.PowerMeasurer;
-import io.quarkiverse.power.runtime.SensorMeasure;
 import io.quarkus.deployment.console.QuarkusCommand;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasurer;
 
 @CommandDefinition(name = "stop", description = "Stops power measurement and outputs accumulated power since measures were started")
 public class StopCommand extends QuarkusCommand {
 
-    private final PowerMeasurer<? extends SensorMeasure> sensor;
+    private final PowerMeasurer sensor;
 
-    public StopCommand(PowerMeasurer<? extends SensorMeasure> sensor) {
+    public StopCommand(PowerMeasurer sensor) {
         this.sensor = sensor;
     }
 

deployment/src/test/java/io/quarkiverse/power/deployment/PowerMeasurerTest.java → deployment/src/test/java/net/laprun/sustainability/power/quarkus/deployment/PowerMeasurerTest.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.deployment;
+package net.laprun.sustainability.power.quarkus.deployment;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -7,11 +7,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkiverse.power.runtime.PowerMeasurer;
-import io.quarkiverse.power.runtime.ServerSampler;
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.http.TestHTTPResource;
 import net.laprun.sustainability.power.PowerResource;
+import net.laprun.sustainability.power.quarkus.runtime.PowerMeasurer;
+import net.laprun.sustainability.power.quarkus.runtime.ServerSampler;
 
 public class PowerMeasurerTest {
     @TestHTTPResource
@@ -22,12 +22,10 @@ public class PowerMeasurerTest {
             .withApplicationRoot((jar) -> jar.addClasses(PowerResource.class, TestPowerMeasurer.class, TestPowerSensor.class));
 
     @Test
-    void startShouldAccumulateOverSpecifiedDurationAndStop() throws Exception {
-        final var measurer = new PowerMeasurer<>(new ServerSampler(uri));
+    void startShouldAccumulateOverSpecifiedDurationAndStop() {
+        final var measurer = new PowerMeasurer(new ServerSampler(uri));
 
         measurer.start(1, 100);
-        measurer.onCompleted(measure -> {
-            assertEquals(10, measure.numberOfSamples());
-        });
+        measurer.onCompleted(measure -> assertEquals(10, measure.numberOfSamples()));
     }
 }

deployment/src/test/java/io/quarkiverse/power/deployment/TestPowerMeasurer.java → deployment/src/test/java/net/laprun/sustainability/power/quarkus/deployment/TestPowerMeasurer.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.deployment;
+package net.laprun.sustainability.power.quarkus.deployment;
 
 import io.quarkus.test.Mock;
 import net.laprun.sustainability.power.PowerMeasurer;

deployment/src/test/java/io/quarkiverse/power/deployment/TestPowerSensor.java → deployment/src/test/java/net/laprun/sustainability/power/quarkus/deployment/TestPowerSensor.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.deployment;
+package net.laprun.sustainability.power.quarkus.deployment;
 
 import io.quarkus.test.Mock;
 

deployment/src/test/java/io/quarkiverse/power/test/PowerDevModeTest.java → deployment/src/test/java/net/laprun/sustainability/power/quarkus/test/PowerDevModeTest.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.test;
+package net.laprun.sustainability.power.quarkus.test;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;

deployment/src/test/java/io/quarkiverse/power/test/PowerTest.java → deployment/src/test/java/net/laprun/sustainability/power/quarkus/test/PowerTest.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.test;
+package net.laprun.sustainability.power.quarkus.test;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;

docs/modules/ROOT/pages/index.adoc

@@ -6,14 +6,14 @@ TIP: Describe what the extension does here.
 
 == Installation
 
-If you want to use this extension, you need to add the `io.quarkiverse.power:quarkus-power` extension first to your build file.
+If you want to use this extension, you need to add the `net.laprun.sustainability:quarkus-power` extension first to your build file.
 
 For instance, with Maven, add the following dependency to your POM file:
 
 [source,xml,subs=attributes+]
 ----
 <dependency>
-    <groupId>io.quarkiverse.power</groupId>
+    <groupId>net.laprun.sustainability</groupId>
     <artifactId>quarkus-power</artifactId>
     <version>{project-version}</version>
 </dependency>

integration-tests/pom.xml

@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>io.quarkiverse.power</groupId>
+    <groupId>net.laprun.sustainability</groupId>
     <artifactId>quarkus-power-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
@@ -18,9 +18,9 @@
       <artifactId>quarkus-rest</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.quarkiverse.power</groupId>
+      <groupId>net.laprun.sustainability</groupId>
       <artifactId>quarkus-power</artifactId>
-      <version>${project.version}</version>
+      <version>0.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

integration-tests/src/main/java/io/quarkiverse/power/it/PowerResource.java → integration-tests/src/main/java/net/laprun/sustainability/power/quarkus/it/PowerResource.java

@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package io.quarkiverse.power.it;
+package net.laprun.sustainability.power.quarkus.it;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.ws.rs.GET;

integration-tests/src/test/java/io/quarkiverse/power/it/PowerResourceIT.java → integration-tests/src/test/java/net/laprun/sustainability/power/quarkus/it/PowerResourceIT.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.it;
+package net.laprun.sustainability.power.quarkus.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 

integration-tests/src/test/java/io/quarkiverse/power/it/PowerResourceTest.java → integration-tests/src/test/java/net/laprun/sustainability/power/quarkus/it/PowerResourceTest.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.power.it;
+package net.laprun.sustainability.power.quarkus.it;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>quarkiverse-parent</artifactId>
     <version>16</version>
   </parent>
-  <groupId>io.quarkiverse.power</groupId>
+  <groupId>net.laprun.sustainability</groupId>
   <artifactId>quarkus-power-parent</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>

runtime/pom.xml

@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>io.quarkiverse.power</groupId>
+    <groupId>net.laprun.sustainability</groupId>
     <artifactId>quarkus-power-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>

runtime/src/main/java/io/quarkiverse/power/runtime/AbstractPowerMeasure.java → runtime/src/main/java/net/laprun/sustainability/power/quarkus/runtime/AbstractPowerMeasure.java

@@ -1,7 +1,9 @@
-package io.quarkiverse.power.runtime;
+package net.laprun.sustainability.power.quarkus.runtime;
 
 import java.util.List;
 
+import net.laprun.sustainability.power.SensorMetadata;
+
 abstract class AbstractPowerMeasure implements PowerMeasure {
     private final SensorMetadata sensorMetadata;
     private final List<double[]> measures;