You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/04/15 12:05:42 UTC

[plc4x] branch develop updated: fix: Commented out the call to "install" which I incorrectly commented out fix: Cleaned up in the pom structures

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 868ef40  fix: Commented out the call to "install" which I incorrectly commented out fix: Cleaned up in the pom structures
868ef40 is described below

commit 868ef403e0747bfd974e523de61f75537d9f9925
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 15 14:05:35 2021 +0200

    fix: Commented out the call to "install" which I incorrectly commented out
    fix: Cleaned up in the pom structures
---
 build-utils/language-c/pom.xml    |  28 +++++-----
 build-utils/language-go/pom.xml   | 111 +++++++++++++++++++-------------------
 build-utils/language-java/pom.xml |  68 ++++++++++++-----------
 3 files changed, 108 insertions(+), 99 deletions(-)

diff --git a/build-utils/language-c/pom.xml b/build-utils/language-c/pom.xml
index 623761d..70e4070 100644
--- a/build-utils/language-c/pom.xml
+++ b/build-utils/language-c/pom.xml
@@ -38,26 +38,30 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
         <version>3.2.2</version>
-        <configuration>
-          <debug>true</debug>
-          <projectsDirectory>src/test/resources</projectsDirectory>
-          <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
-          <settingsFile>src/test/resources/settings.xml</settingsFile>
-          <pomIncludes>
-            <pomInclude>*/pom.xml</pomInclude>
-          </pomIncludes>
-          <goals>
-            <goal>test</goal>
-          </goals>
-        </configuration>
         <executions>
           <execution>
             <id>integration-test</id>
             <goals>
+              <!-- Install the current project artifacts into the maven local repo, so they can be used in the test -->
               <goal>install</goal>
+              <!-- Execute the maven builds defines in src/test/resources -->
               <goal>integration-test</goal>
+              <!-- Checks the results of the maven builds -->
               <goal>verify</goal>
             </goals>
+            <configuration>
+              <debug>true</debug>
+              <projectsDirectory>src/test/resources</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
+              <settingsFile>src/test/resources/settings.xml</settingsFile>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <!-- The goals we will be executing in the test-projects -->
+              <goals>
+                <goal>test</goal>
+              </goals>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/build-utils/language-go/pom.xml b/build-utils/language-go/pom.xml
index 7bd2f1b..9c8db19 100644
--- a/build-utils/language-go/pom.xml
+++ b/build-utils/language-go/pom.xml
@@ -31,74 +31,36 @@
   <name>PLC4X: Build Utils: Language: Go</name>
   <description>Code generation template for generating Go(lang) code</description>
 
-  <dependencies>
-    <!-- We are using the Freemarker module to generate Java code -->
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-types-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-  </dependencies>
-
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
         <version>3.2.2</version>
-        <configuration>
-          <debug>true</debug>
-          <projectsDirectory>src/test/resources</projectsDirectory>
-          <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
-          <settingsFile>src/test/resources/settings.xml</settingsFile>
-          <pomIncludes>
-            <pomInclude>*/pom.xml</pomInclude>
-          </pomIncludes>
-          <goals>
-            <goal>test</goal>
-          </goals>
-        </configuration>
         <executions>
           <execution>
             <id>integration-test</id>
             <goals>
+              <!-- Install the current project artifacts into the maven local repo, so they can be used in the test -->
               <goal>install</goal>
+              <!-- Execute the maven builds defines in src/test/resources -->
               <goal>integration-test</goal>
+              <!-- Checks the results of the maven builds -->
               <goal>verify</goal>
             </goals>
+            <configuration>
+              <debug>true</debug>
+              <projectsDirectory>src/test/resources</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
+              <settingsFile>src/test/resources/settings.xml</settingsFile>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <!-- The goals we will be executing in the test-projects -->
+              <goals>
+                <goal>test</goal>
+              </goals>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -140,8 +102,47 @@
           <sources>${project.basedir}</sources>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 
+  <dependencies>
+    <!-- We are using the Freemarker module to generate Java code -->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-language-base-freemarker</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-types-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.plc4x.plugins</groupId>
+      <artifactId>plc4x-code-generation-language-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/build-utils/language-java/pom.xml b/build-utils/language-java/pom.xml
index 85438f6..24e4246 100644
--- a/build-utils/language-java/pom.xml
+++ b/build-utils/language-java/pom.xml
@@ -32,6 +32,42 @@
   <name>PLC4X: Build Utils: Language: Java</name>
   <description>Code generation template for generating Java code</description>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <version>3.2.2</version>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <!-- Install the current project artifacts into the maven local repo, so they can be used in the test -->
+              <goal>install</goal>
+              <!-- Execute the maven builds defines in src/test/resources -->
+              <goal>integration-test</goal>
+              <!-- Checks the results of the maven builds -->
+              <goal>verify</goal>
+            </goals>
+            <configuration>
+              <debug>true</debug>
+              <projectsDirectory>src/test/resources</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
+              <settingsFile>src/test/resources/settings.xml</settingsFile>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <!-- The goals we will be executing in the test-projects -->
+              <goals>
+                <goal>test</goal>
+              </goals>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <!-- We are using the Freemarker module to generate Java code -->
     <dependency>
@@ -101,36 +137,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <debug>true</debug>
-          <projectsDirectory>src/test/resources</projectsDirectory>
-          <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
-          <settingsFile>src/test/resources/settings.xml</settingsFile>
-          <pomIncludes>
-            <pomInclude>*/pom.xml</pomInclude>
-          </pomIncludes>
-          <goals>
-            <goal>test</goal>
-          </goals>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <!--goal>install</goal-->
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>