formatting and version bump

questdb · Apr 16, 2024 · 398285a · 398285a
1 parent 930f177
commit 398285a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 33 deletions.
diff --git a/jar-jni/pom.xml b/jar-jni/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.questdb</groupId>
     <artifactId>jar-jni</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>JAR JNI Loader</name>

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <groupId>org.questdb</groupId>
     <artifactId>rust-maven</artifactId>
     <packaging>pom</packaging>

diff --git a/rust-maven-jna-example/pom.xml b/rust-maven-jna-example/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.questdb</groupId>
     <artifactId>rust-maven-jna-example</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Rust Maven Plugin JNA Usage Example</name>

diff --git a/rust-maven-jni-example/pom.xml b/rust-maven-jni-example/pom.xml
@@ -22,12 +22,12 @@
   ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.questdb</groupId>
     <artifactId>rust-maven-jni-example</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Rust Maven Plugin Usage Example</name>
@@ -173,27 +173,6 @@
                         <!-- 
                             This is an example of how to skip an execution.
                             You can use this to skip both "build" and "test" executions.
-
-                            The example below configures
-
-                                <skip>true</skip>
-
-                            But you could use a property here too:
-
-                                <skip>${dummy.skip}</skip>
-
-                            If you wanted to always build unless specifed on the command line,
-                            you can default it in config in the properties section of your pom.xml:
-
-                                <properties>
-                                    <dummy.skip>false</dummy.skip>
-                                </properties>
-
-                            Then you can run:
-
-                                mvn clean package -Ddummy.skip=true
-
-                            To skip the specific execution.
                         -->
                         <id>dummy</id>
                         <goals>

diff --git a/rust-maven-plugin/pom.xml b/rust-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.questdb</groupId>
     <artifactId>rust-maven-plugin</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Rust Maven Plugin</name>

diff --git a/rust-maven-plugin/src/main/java/io/questdb/maven/rust/CargoMojoBase.java b/rust-maven-plugin/src/main/java/io/questdb/maven/rust/CargoMojoBase.java
@@ -38,6 +38,15 @@ public abstract class CargoMojoBase extends AbstractMojo {
     @Parameter(property = "project", readonly = true)
     protected MavenProject project;
 
+    /**
+     * Skip this configured execution.
+     */
+    @Parameter(property = "skip", defaultValue = "false")
+    protected boolean skip;
+
+    /**
+     * Additional environment variables set when running `cargo`.
+     */
     @Parameter(property = "environmentVariables")
     private HashMap<String, String> environmentVariables;
 
@@ -47,12 +56,6 @@ public abstract class CargoMojoBase extends AbstractMojo {
     @Parameter(property = "cargoPath", defaultValue = "cargo")
     private String cargoPath;
 
-    /**
-     * Skip this configured execution.
-     */
-    @Parameter(property = "skip", defaultValue = "false")
-    protected boolean skip;
-
     /**
      * Path to the Rust crate to build.
      */