Merge branch 'develop'

# Conflicts: # cobigen-cli/cli/pom.xml
devonfw · Apr 28, 2021 · affa9cf · affa9cf
2 parents 9cb5a1e + 686b733
commit affa9cf
Show file tree

Hide file tree

Showing 737 changed files with 2,049 additions and 2,841 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -48,14 +48,14 @@
 *.zip		binary
 
 # special line ending handling for test files
-cobigen/cobigen-textmerger/src/test/resources/TestBaseLineDelimiter.txt eol=lf
-cobigen/cobigen-textmerger/src/test/resources/PatchBaseLineDelimiter.txt eol=crlf
-cobigen/cobigen-textmerger/src/test/resources/MergeBaseLineDelimiter.txt eol=lf
+cobigen-plugins/cobigen-textmerger/src/test/resources/TestBaseLineDelimiter.txt eol=lf
+cobigen-plugins/cobigen-textmerger/src/test/resources/PatchBaseLineDelimiter.txt eol=crlf
+cobigen-plugins/cobigen-textmerger/src/test/resources/MergeBaseLineDelimiter.txt eol=lf
 
-cobigen/cobigen-core-parent/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestWindowsLineEndings.txt eol=crlf
-cobigen/cobigen-core-parent/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestLinuxLineEndings.txt eol=lf
-cobigen/cobigen-core-parent/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestOsxLineEndings.txt eol=cr
+cobigen/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestWindowsLineEndings.txt eol=crlf
+cobigen/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestLinuxLineEndings.txt eol=lf
+cobigen/cobigen-core-api/src/test/resources/testdata/unittest/SystemUtilTest/TestOsxLineEndings.txt eol=cr
 
-cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java eol=lf
-cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java eol=crlf
-cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java eol=lf
+cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_Eol.java eol=lf
+cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_Eol.java eol=crlf
+cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/MergedFile_Eol.java eol=lf
diff --git a/.github/workflows/maven-build-test-sequentially.yml b/.github/workflows/maven-build-test-sequentially.yml
@@ -0,0 +1,34 @@
+# This workflow builds and tests Cobigen run in parallel and stops if one build doesn't work
+
+name: build & test sequentially # on Ubuntu and Windows with OpenJDK8 and OpenJDK11
+
+on: 
+  workflow_dispatch:
+
+
+jobs:
+  build-and-test:
+
+    strategy:
+      matrix:
+        # test against Java version 8 and 11:
+        javaVersion: [ 8, 11 ]
+        os: [windows-latest,ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Support longpaths for Windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: git config --system core.longpaths true
+    - name: Support longpaths for Linux
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: sudo git config --system core.longpaths true
+    - uses: actions/checkout@v2
+    - name: Set up OpenJDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.javaVersion }}
+        server-id: github
+        settings-path: ${{ github.workspace }}
+    - name: Build with Maven
+      run: 
+        mvn clean install -e -U -P "p2-build-photon,p2-build-stable"
diff --git a/.github/workflows/maven-build-test.yml b/.github/workflows/maven-build-test.yml
@@ -0,0 +1,24 @@
+# This workflow builds and tests Cobigen run in parallel and stops if one build doesn't work
+
+name: build & test # on Ubuntu with OpenJDK8 and OpenJDK11
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+
+    strategy:
+      matrix:
+        # test against Java version 8 and 11:
+        javaVersion: [ 8, 11 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up OpenJDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.javaVersion }}
+        settings-path: ${{ github.workspace }}
+
+    - name: Build with Maven
+      run: ./build.sh
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -17,4 +17,4 @@
       <password>${env.BINTRAY_PASSWORD}</password>
     </server>
   </servers>
-</settings>
+</settings>
diff --git a/.travis.yml b/.travis.yml
diff --git a/build.sh b/build.sh
@@ -0,0 +1,16 @@
+set -e
+
+# build core without system test
+mvn clean install -f cobigen --projects !cobigen-core-systemtest -DtrimStackTrace=false
+
+# build & test plugins ones
+mvn clean install -f cobigen-plugins -DtrimStackTrace=false
+
+# build plugin p2 repositories
+mvn clean install p2:site -f cobigen-plugins bundle:bundle -Pp2-bundle --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines -DtrimStackTrace=false
+
+# execute core system tests
+mvn clean verify -f cobigen --projects cobigen-core-systemtest -DtrimStackTrace=false
+
+# package everything. core and plugins will be skipped since they were build already
+mvn package -Pp2-build-photon,p2-build-stable,p2-build-experimental -DtrimStackTrace=false
diff --git a/cobigen-cli/class-loader-agent/pom.xml b/cobigen-cli/class-loader-agent/pom.xml
@@ -1,35 +1,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">
+<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>class-loader-agent</artifactId>
-  <version>7.1.0</version>
-  <name>Class loader agent</name>
-  <description>Class loader agent for CobiGen CLI</description>
+  <name>CobiGen - CLI Classloader Agent</name>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>cli-parent</artifactId>
-    <version>dev-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <properties>
     <skip.deployment>false</skip.deployment>
   </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Launcher-Agent-Class>classloader.Agent</Launcher-Agent-Class>
-              <Agent-Class>classloader.Agent</Agent-Class>
-              <Premain-Class>classloader.Agent</Premain-Class>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/cobigen-cli/cli/pom.xml b/cobigen-cli/cli/pom.xml
@@ -1,41 +1,49 @@
 <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>cobigen-cli</artifactId>
-  <version>7.1.0</version>
-  <name>cobigen-cli</name>
+  <artifactId>cli</artifactId>
+  <name>CobiGen - CLI</name>
   <description>Command Line Interface for CobiGen</description>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>cli-parent</artifactId>
-    <version>dev-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <properties>
-    <junit.version>4.11</junit.version>
-    <logback.version>1.1.2</logback.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j-api.version>1.7.7</slf4j-api.version>
     <maven.test.path>src\test\resources\testdata\localmavenproject\maven.project</maven.test.path>
     <skip.deployment>false</skip.deployment>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>class-loader-agent</artifactId>
+      <version>${revision}</version>
+    </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core</artifactId>
-      <version>7.1.0</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-api</artifactId>
-      <version>7.1.0</version>
+      <version>${revision}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-api</artifactId>
+      <version>${revision}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-test</artifactId>
-      <version>7.1.0</version>
+      <version>${revision}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>info.picocli</groupId>
@@ -52,13 +60,6 @@
       <artifactId>mmm-code-java-impl</artifactId>
       <version>1.0.0-beta5</version>
     </dependency>
-    <!-- SLF4J - API -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.7</version>
-    </dependency>
-    <!-- logback -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -69,11 +70,6 @@
       <artifactId>commons-text</artifactId>
       <version>1.6</version>
     </dependency>
-    <dependency>
-      <groupId>com.devonfw.cobigen</groupId>
-      <artifactId>class-loader-agent</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!-- We need an agent loader for the JUnit tests in Eclipse -->
     <dependency>
       <groupId>com.ea.agentloader</groupId>
@@ -109,7 +105,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
         <executions>
           <execution>
             <id>add-resources</id>
@@ -204,7 +199,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.1</version>
         <executions>
           <execution>
             <id>assemble-jar</id>
@@ -241,22 +235,36 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- Add sources jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.0</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <versionRange>[1.6.0,)</versionRange>
+                    <goals>
+                      <goal>exec</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>
diff --git a/cobigen-cli/cli/src/main/resources/pom.xml b/cobigen-cli/cli/src/main/resources/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.devonfw.cobigen</groupId>
   <artifactId>cli</artifactId>
-  <version>7.1.0</version>
+  <version>7.1.1-SNAPSHOT</version>
   <name>cobigen-cli</name>
 
   <properties>