Merge branch 'develop'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,68 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '15 0 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+
+    - name: Set up Java
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+
+    - name: Build
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+      run: mvn -B clean package
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/maven.yml

@@ -38,17 +38,27 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
+        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: OSSRH_USERNAME  # env variable for username in deploy
+        server-password: OSSRH_PASSWORD  # env variable for token in deploy
 
     - name: Build and analyze
+      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-
-    - run: mkdir staging && cp target/*.jar staging
+        BUILD_NUMBER: ${{ github.run_id }}-${{ github.run_number }}
 
     - name: Upload Maven build artifact
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: artifact
-        path: staging
+        path: target/*.jar
+
+    # Upload if develop branch
+    - name: Upload snapshot to OSSRH if development release
+      if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
+      run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true -DskipChecks -DskipTest
+      env:
+        OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
+        OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}

.gitignore

@@ -1,3 +1,21 @@
-/target/
-local-upload.bat
+.antlr*
+.classpath
+.idea
+.project
+.DS_Store
+*.iml
+npm-debug.log
+.build.log
+
+.metadata/
 bin/
+target/
+src-gen/
+xtend-gen/
+.history/
+
+*/plugin.xml_gen
+**/.settings/org.eclipse.*
+
+.vscode
+.factorypath

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.3] - 2020-12-25
+### Changed
+- Changed many line of code to fix sonarlint/cloud issues
+- Add more ``final`` to parameters
+- Changed to Java 8 syntax like Lambda expressions or Multi-Exceptions
+- Fixed one or two wrong handled Interrupts
+
 ## [1.1.2] - 2020-12-17
 ### Added
 - Added ``sonarcloud`` to build pipeline

pom.xml

@@ -7,7 +7,7 @@
 	<description>eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe.</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-core</artifactId>
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 
@@ -18,7 +18,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
 		<license.year>2020</license.year>
-		<!-- <bundle.version>1.1.0.${maven.build.timestamp}</bundle.version> -->
+		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -102,7 +102,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>3.0.1</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
@@ -300,7 +300,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>