update from master (#395)

* Update dependency org.apache.maven.plugins:maven-site-plugin to v3.20.0 (#382) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.7.0 * Update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.5.0 * Update dependency org.apache.maven.plugins:maven-surefire-report-plugin to v3.5.0 (#390) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.10.0 (#389) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.5.0 (#387) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update auf Java 17 & Jakarta Namespace (#391) * DAO & Criteria Klassen als deprecated markiert - ORM Mapper statt dessen verwenden * javax -> jakarta * mit Java 17 bauen * findbugs -> spotbugs * clean up * Deployment mit Java 17 * Remove .travis.yml file * clean up * Update pom.xml * Update build process to use JDK 17 and Maven * automatic deployment to github (#393) * DAO & Criteria Klassen als deprecated markiert - ORM Mapper statt dessen verwenden * javax -> jakarta * mit Java 17 bauen * findbugs -> spotbugs * clean up * Deployment mit Java 17 * Remove .travis.yml file * clean up * Update pom.xml * Update build process to use JDK 17 and Maven * Update Maven publish workflow to deploy to GitHub * Deploy to GitHub * Refactor GitHub deployment workflow * Add spotbugs-maven-plugin to renovate.json * Update dependency com.github.spotbugs:spotbugs-maven-plugin to v4.8.6.4 (#392) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/checkout action to v4 (#394) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
bitctrl · Sep 21, 2024 · baef5be · baef5be
1 parent f3cbbdc
commit baef5be
Show file tree

Hide file tree

Showing 136 changed files with 1,701 additions and 2,269 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -57,8 +57,17 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+    # - name: Autobuild
+    #  uses: github/codeql-action/autobuild@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
+
+    - name: Build with Maven
+      run: mvn clean install
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

diff --git a/.github/workflows/deploy-to-github.yml b/.github/workflows/deploy-to-github.yml
@@ -0,0 +1,38 @@
+name: Deploy to GitHub Packages
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
+
+    - name: Configure Maven settings
+      run: |
+        mkdir -p ~/.m2
+        echo "<settings>
+                <servers>
+                  <server>
+                    <id>github</id>
+                    <username>${{ github.actor }}</username>
+                    <password>${{ secrets.GITHUB_TOKEN }}</password>
+                  </server>
+                </servers>
+              </settings>" > ~/.m2/settings.xml
+
+    - name: Build and deploy
+      run: mvn deploy
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '17', '21' ]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/maven-publish-on-push.yml b/.github/workflows/maven-publish-on-push.yml
@@ -19,10 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 1.8 for Github deployment
+    - name: Set up JDK 17 for Github deployment
       uses: actions/setup-java@v4
       with:
-        java-version: 8.0.302+8
+        java-version: 17
         distribution: 'temurin'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -58,10 +58,10 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
 
 
-    - name: Set up JDK 1.8 for NERZ-Snapshot-Deployment
+    - name: Set up JDK 17 for NERZ-Snapshot-Deployment
       uses: actions/setup-java@v4
       with:
-        java-version: 8.0.302+8
+        java-version: 17
         distribution: 'temurin'
         server-id: nerz-snapshots 
         server-username: MAVEN_USERNAME
@@ -76,10 +76,10 @@ jobs:
          MAVEN_USERNAME: ${{ secrets.NERZ_USERNAME }}
          MAVEN_PASSWORD: ${{ secrets.NERZ_TOKEN }}
 
-    - name: Set up JDK 1.8 for NERZ-Release-Deployment
+    - name: Set up JDK 17 for NERZ-Release-Deployment
       uses: actions/setup-java@v4
       with:
-        java-version: 8.0.302+8
+        java-version: 17
         distribution: 'temurin'
         server-id: nerz-releases 
         server-username: MAVEN_USERNAME
@@ -95,8 +95,6 @@ jobs:
          MAVEN_PASSWORD: ${{ secrets.NERZ_TOKEN }}
 
 
-
-
 
 
 

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -5,6 +5,11 @@
 # com.bitctrl
 Allgemeine Bibliothek für BitCtrl-Projekte
 
+## Version 3.0.0
+ - Update auf Java 17
+ - javax Namespace durch jakarta ersetzt
+ - DAO & Criteria Klassen deprecated
+
 ## Version 2.1.0
 
 - Publikation auf dem NERZ-Maven-Repository

diff --git a/pom.xml b/pom.xml
@@ -6,16 +6,16 @@
 
 	<groupId>com.bitctrl</groupId>
 	<artifactId>com.bitctrl</artifactId>
-	<version>2.1.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>Allgemeine BitCtrl-Bibliothek</name>
 	<url>http://bitctrl.github.io/${project.artifactId}/</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<licenses>
@@ -36,7 +36,8 @@
 
 	<scm>
 		<connection>scm:git:https://github.com/bitctrl/${project.artifactId}.git</connection>
-		<developerConnection>scm:git:https://github.com/bitctrl/${project.artifactId}.git</developerConnection>
+		<developerConnection>
+			scm:git:https://github.com/bitctrl/${project.artifactId}.git</developerConnection>
 		<url>https://github.com/bitctrl/${project.artifactId}</url>
 	</scm>
 
@@ -63,12 +64,14 @@
 				<repository>
 					<id>bitctrl.nexus</id>
 					<name>BitCtrl Nexus Releases Repository</name>
-					<url>http://bitctrlbuildserver:8081/nexus/content/repositories/releases/</url>
+					<url>
+						http://nexus.ad.bitctrl.de/nexus/content/repositories/releases/</url>
 				</repository>
 				<snapshotRepository>
 					<id>bitctrl.nexus.snapshots</id>
 					<name>BitCtrl Nexus Snapshots Repository</name>
-					<url>http://bitctrlbuildserver:8081/nexus/content/repositories/snapshots/</url>
+					<url>
+						http://nexus.ad.bitctrl.de/nexus/content/repositories/snapshots/</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -111,7 +114,8 @@
 				<snapshotRepository>
 					<id>nerz-snapshots</id>
 					<name>NERZ Snapshots</name>
-					<url>https://repo.nerz-ev.de/repository/nerz-maven-snapshots/</url>
+					<url>
+						https://repo.nerz-ev.de/repository/nerz-maven-snapshots/</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -130,24 +134,19 @@
 			<version>1.16.1</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.5</version>
-		</dependency>
-
+
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<goals>
@@ -170,7 +169,8 @@
 						</goals>
 						<configuration>
 							<archive>
-								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+								<manifestFile>
+									${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>
 						</configuration>
 					</execution>
@@ -192,7 +192,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.10.0</version>
 				<executions>
 					<execution>
 						<id>javadoc</id>
@@ -206,15 +206,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.12.1</version>
+				<version>3.20.0</version>
 				<configuration>
 					<locales>de</locales>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 				<configuration>
 					<configLocation>src/main/config/checkstyle.xml</configLocation>
 					<headerLocation>src/main/config/java.header</headerLocation>
@@ -229,20 +229,13 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.5</version>
+				<groupId>com.github.spotbugs</groupId>
+				<artifactId>spotbugs-maven-plugin</artifactId>
+				<version>4.8.6.4</version>
 				<configuration>
-					<threshold>High</threshold>
 					<includeTests>true</includeTests>
+					<failOnError>false</failOnError>
 				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
@@ -264,12 +257,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>3.6.2</version>
+				<version>3.7.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -286,12 +279,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.10.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 				<configuration>
 					<configLocation>src/main/config/checkstyle.xml</configLocation>
 					<includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -304,57 +297,6 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.5</version>
-				<configuration>
-					<includeTests>true</includeTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-				<version>2.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<tagListOptions>
-						<tagClasses>
-							<tagClass>
-								<displayName>Ungelöste Probleme</displayName>
-								<tags>
-									<tag>
-										<matchString>FIXME</matchString>
-										<matchType>ignoreCase</matchType>
-									</tag>
-								</tags>
-							</tagClass>
-							<tagClass>
-								<displayName>Offene Punkte</displayName>
-								<tags>
-									<tag>
-										<matchString>TODO</matchString>
-										<matchType>ignoreCase</matchType>
-									</tag>
-								</tags>
-							</tagClass>
-							<tagClass>
-								<displayName>Markierungen</displayName>
-								<tags>
-									<tag>
-										<matchString>XXX</matchString>
-										<matchType>ignoreCase</matchType>
-									</tag>
-								</tags>
-							</tagClass>
-						</tagClasses>
-					</tagListOptions>
-				</configuration>
-			</plugin>
 		</plugins>
 	</reporting>
 

diff --git a/renovate.json b/renovate.json
@@ -11,6 +11,7 @@
         "org.apache.maven.plugins:maven-surefire-report-plugin",
         "jfrog/setup-jfrog-cli",
         "org.codehaus.mojo:taglist-maven-plugin",
+        "com.github.spotbugs:spotbugs-maven-plugin",
         "github-action"
       ],
       "matchUpdateTypes": [

diff --git a/src/main/java/com/bitctrl/Constants.java b/src/main/java/com/bitctrl/Constants.java
@@ -63,8 +63,8 @@ public final class Constants {
 	/**
 	 * Ein leerer String.
 	 * <p>
-	 * <em>Hinweis</em>: Der Test mit {@code equals()} auf den Leerstring ist
-	 * sehr ineffektiv, deswegen sollte bis Java 6 besser geprüft werden ob
+	 * <em>Hinweis</em>: Der Test mit {@code equals()} auf den Leerstring ist sehr
+	 * ineffektiv, deswegen sollte bis Java 6 besser geprüft werden ob
 	 * {@link String#length()} gleich 0 ist. Ab Java 6 kann für den Test auf den
 	 * Leerstring {@link String#isEmpty()} verwendet werden.
 	 */