Merge pull request #38 from xdev-software/develop

Release 6.0.0

Author: AB-xdev

.github/dependabot.yml

@@ -4,6 +4,8 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: "*"
@@ -15,4 +17,6 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10

.github/workflows/checkBuild.yml

@@ -15,22 +15,22 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+        java-package: [jdk]
+        distribution: [temurin]
+
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8
+    - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: '8'
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        distribution: ${{ matrix.distribution }}
+        java-version: ${{ matrix.java }}
+        java-package: ${{ matrix.java-package }}
+        cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B clean verify
@@ -52,3 +52,8 @@ jobs:
           echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean verify"
           exit 1
         fi
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: jars-java-${{ matrix.java }}
+        path: target/*.jar

.github/workflows/release.yml

@@ -13,16 +13,9 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B clean verify
@@ -108,18 +101,18 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 8 Apache Maven Central
+    - name: Set up JDK 8 OSSRH
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
-    - name: Publish to Apache Maven Central
+    - name: Publish to OSSRH
       run: mvn -B deploy -Possrh
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
@@ -139,20 +132,12 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
 
-    - name: Setup - Java
+    - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
 
-    - name: Restore - Maven Cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-:  
-
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies
 
@@ -187,6 +172,32 @@ jobs:
         publish_dir: ./docs
         enable_jekyll: true
 
+  build_xdev_ide:
+    runs-on: ubuntu-latest
+    needs: [prepare_release]
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Init Git and pull
+      run: |
+        git config --global user.email "actions@github.com"
+        git config --global user.name "GitHub Actions"
+        git pull
+      
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: '8'
+      
+    - name: Build with Maven
+      run: mvn -B clean verify -Pxdev-ide
+      
+    - uses: actions/upload-artifact@v2
+      with:
+        name: jars-xdev-ide
+        path: target/*.jar
+
   after_release:
     runs-on: ubuntu-latest
     needs: [publish_central]

.github/workflows/test-deploy.yml

@@ -9,18 +9,18 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8 Apache Maven Central
+    - name: Set up JDK 8 OSSRH
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
-    - name: Publish to Apache Maven Central
+    - name: Publish to OSSRH
       run: mvn -B deploy -Possrh
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}

.gitignore

@@ -3,3 +3,4 @@ bin/
 .settings
 .classpath
 .project
+dependency-reduced-pom.xml

CHANGELOG.md

@@ -0,0 +1,15 @@
+## 6.0.0
+* Ensured build compatibility with Java 8, 11 and 17
+* Minor code improvements, mostly for tests
+* Updated some maven plugins
+
+*NOTE: ``biapi-commercial`` is now a part of the [``csapi``](https://github.com/xdev-software/csapi) and open-source*
+
+### Complete overview about the new XDEV (IDE) Framework in version 6
+![XDEV-IDE-Framework-6 overview](https://user-images.githubusercontent.com/45384811/134640194-0b42a238-3c7e-402a-8b05-51419108dbbd.png)
+
+## 5.0.3+
+Before version 5.0.3, BIAPI was distributed as commercial software. 
+
+To provide this framework as open-source, we split it into two parts: the open-source part you see here and the commercial part, which requires a license. 
+If you want to use the commercial BIAPI with third-party dependencies, please contact us at info@xdev-software.de

README.md

@@ -8,9 +8,6 @@ Java Swing provides a significant set of controls for developing graphical user
 
 The XDEV **B**usiness **I**nteligence Suite provides you ultimate power features, which extremely upgrades your application and makes it multiple times more capable and comfortable. Extend your solutions with features your users only dream about yet. Best of all - the integrations is amazingly easy!
 
-Before version 5.0.3, BIAPI was distributed as commercial software. To provide this framework as open-source, we split it into two parts: the open-source part you see here and the commercial part, which requires a license. If you want to use the commercial BIAPI with third-party dependencies, please contact us at info@xdev-software.de
-
-
 ## XDEV-IDE
 XDEV(-IDE) is a visual Java development environment for fast and easy application development (RAD - Rapid Application Development). XDEV differs from other Java IDEs such as Eclipse or NetBeans, focusing on programming through a far-reaching RAD concept. The IDE's main components are a Swing GUI builder, the XDEV Application Framework, and numerous drag-and-drop tools and wizards with which the functions of the framework can be integrated.