Flatten POMs (#77)

* Flatten child poms to remove the need to publish the parent pom * Add surefire plugin to kusto-data to run unit-tests * change key file to 128bit to avoid the need for JCE
2019-03-11 23:21:22 +02:00 · 2019-03-11 23:21:22 +02:00 · d58292a76f
--- a/.gitignore
+++ b/.gitignore
@ -22,8 +22,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

-
-target/
 out/

 *.logs
@ -42,9 +40,11 @@ pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
+.flattened-pom.xml
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar

+
--- a/data/pom.xml
+++ b/data/pom.xml
@ -2,14 +2,15 @@
 <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">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kusto-data</artifactId>
+
    <parent>
        <artifactId>kusto-client</artifactId>
        <groupId>com.microsoft.azure.kusto</groupId>
-        <version>1.0.0-BETA-03</version>
+        <!--suppress MavenPropertyInParent -->
+        <version>${revision}</version>
    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>kusto-data</artifactId>

    <build>
        <plugins>
@ -23,7 +24,9 @@
                </configuration>
            </plugin>
            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
                <configuration>
                    <archive>
                        <manifest>
@ -46,6 +49,28 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                    </excludes>
+                </configuration>
+                <!-- JUnit 5 Support -->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>1.2.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-source-plugin</artifactId>
--- a/data/src/test/resources/key.pem
+++ b/data/src/test/resources/key.pem
@ -1,54 +1,28 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
-r7BT0P4uc8DLIC+xUlmfkXaEHQ==
-----END ENCRYPTED PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxLlqOxVbcrxz8
+CiVihZZBEXoopAg9hvbBkza0WM8mqkCvDVWG2K1lu9h/pXe+Yqf/JYZrRzYytNBa
+1Bc1Mykyf2dtkwVxvTuDspTfcB1WXpQ2/e61+U8Wn6ebzqxSZ97xPzRABJdqpHUr
+rr08pOJYFipkHLAbuyn/y+XaFXmDNQNXm23RxMw6FAA2gQrJRYL+HkpS9jNJJEgT
+1nQhAYRkL3SG8JPBe22RJrsN1E/IbhVzTO8nPH0KiL0f2i3rFLCLjQ1Jn7JsEBXh
+39ERuleNJGl1OVTZ9NbX7t5cddI3nmjZrq4lvKd86MHIEzbmYCHXUL+DCI5bvpGe
+dC4sY0PjAgMBAAECggEBAI7TG+KsxulcK5QsJZi2sLlA+mUaXR4j1nOSVO2qDUpQ
+wZWavQ/XSGeSteGno9APvPaa7DE8FT9oq/AbuZ2D4Ti4pMoaUrAt53SxFvrKaIu/
+7+AocC22i39kMXsSbax72KZF2bulN92aNm2BDUB+dYqmS4Op8HhaNm/hkCZtWydc
+0to0I+mryMejNQAtKQh+BGRkjReKdQd/DzQju4OhFl4esHnnUa/+rKFdp+9XHNL3
+bjQbFtbGbeV/ndfPppf60OIv3nb1eAfXU25ol/jR+xwlleAvk8R5RCtbZBBpzz+z
+KTjKxUBqIqwDnn0lF+tImiSCc0itXexJN9UpqffzWmkCgYEA6OJitVdJH5drFBG5
+qvCHHoo45Unp8x2iWnfjgRJExmHe8F0MdyKzuyfhdH0aH3bVTXIGkL6+55lBv0Rz
+77XKZzpL+ZFXssELelVnHGfgVe4kYDGeIIwoz1u+W9Mnu3mLYwk0MoP1uVRDqtmm
+zCcsqIx4/AyWHR6Z0S3p9zh/630CgYEAwsSK+lgC6gyfoAOQk6orlrdpx7wQf2h9
+5dwX7zfJxczUtRqEKWC1ShmOMHVuOFBf2gndd3dxh2jKL5A7wfkFTAzo8CNHACG5
+cpQc/ef18putaPIrhdlit3kDRGsvGzU2NCo2pCWgDUXoSzqGOvmUvfAQKkGrA7Dl
+Ipq9YY3fSt8CgYEA1iWWbvpcm1g5drL18GJNXZ/swas+HfjaGia0ZTPPWj0VLCHk
+HIkkjK0XfG6tXtF/Qz/fGarNEVq0QpVHpt2byWCqDEvCQPWTAGMX9d7vQxVBDdOS
+fItl24eZfAanOpWBvwfvn6QIiOsbbjfGUWSUhEjn154bS5ugBeIaiuLBfmECgYB2
+j1niZqzveFu69jCOEuqRxniX4z1PsXXh9IaFUjp7M+LPk6Kb5Yi14LSTfwhnM1YF
+zjeIP6dWPE3Hgk8+Fq5IyxsJAxB3XhAbVVoInakz09xNpA0mX1weP4XjojN8pnmm
+a4PzjAvPyJxNHwUS5VbMAFR2xJ6rkoUI+ZUKy2f/lQKBgA/v8e5S8gpIfgYniBTr
+SL1WLjjg8wvbvfZdTlomW/lctuoe5rfycy4pKo5SzSZwWTpVIJjzWDzkIn9TU68q
+J7E4grh3GLhd3tWxKU90l1DAx/yq2neo/V69qqhxE58rjjIbyXw6abf/ZjK6SHnn
+01uI2YeUZyPG4h/vGJBWcEyQ
+-----END PRIVATE KEY-----
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@ -2,14 +2,15 @@
 <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">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kusto-ingest</artifactId>
+
    <parent>
        <artifactId>kusto-client</artifactId>
        <groupId>com.microsoft.azure.kusto</groupId>
-        <version>1.0.0-BETA-03</version>
+        <!--suppress MavenPropertyInParent -->
+        <version>${revision}</version>
    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>kusto-ingest</artifactId>

    <build>
        <plugins>
@ -23,7 +24,9 @@
                </configuration>
            </plugin>
            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
                <configuration>
                    <archive>
                        <manifest>
@ -47,11 +50,11 @@
                </executions>
            </plugin>
            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <version>${maven-surefire-plugin.version}</version>
                <configuration>
                    <excludes>
-                        <!--<exclude>**/ResourceManagerTest*</exclude>-->
                    </excludes>
                </configuration>
                <!-- JUnit 5 Support -->
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@
    <groupId>com.microsoft.azure.kusto</groupId>
    <artifactId>kusto-client</artifactId>
    <packaging>pom</packaging>
-    <version>1.0.0-BETA-03</version>
+    <version>${revision}</version>

    <scm>
        <url>scm:git:https://github.com/Azure/azure-kusto-java</url>
@ -29,15 +29,17 @@
    </developers>

    <properties>
+        <revision>1.0.0-BETA-04</revision>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <java.version>1.8</java.version>
        <slf4j.version>1.8.0-beta2</slf4j.version>
        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
        <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-        <junit.version>5.2.0</junit.version>
-        <mockito.version>2.23.4</mockito.version>
+        <junit.version>5.4.0</junit.version>
+        <mockito.version>2.24.0</mockito.version>
    </properties>

    <modules>
@ -46,4 +48,34 @@
        <module>samples</module>
    </modules>

+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <configuration>
+                    <flattenMode>oss</flattenMode>
+                </configuration>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
--- a/samples/pom.xml
+++ b/samples/pom.xml
@ -2,14 +2,16 @@
 <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">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kusto-samples</artifactId>
+
    <parent>
        <artifactId>kusto-client</artifactId>
        <groupId>com.microsoft.azure.kusto</groupId>
-        <version>1.0.0-BETA-03</version>
+        <!--suppress MavenPropertyInParent -->
+        <version>${revision}</version>
    </parent>
-    <modelVersion>4.0.0</modelVersion>

-    <artifactId>kusto-samples</artifactId>

    <build>
        <plugins>