updated plugins (#862)

* added renovate * downgraded mvn * Update actions/cache digest to ab5e6d0 * Update github/codeql-action action to v3.24.6 * bumped to 7 * Update actions/setup-java digest to 9704b39 * Update dependency org.apache.maven.plugins:maven-assembly-plugin to v3.6.0 * Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.12.1 * Update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.4.1 * Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.3.0 * Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.0 * Update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.5.0 * Update dependency org.projectlombok:lombok to v1.18.30 * Update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.13 * Update dependency com.mycila:license-maven-plugin to v4 * Update dependency org.apache.cxf:cxf-xjc-plugin to v4 * removed servicemix plugin not used anymore * Update dependency com.github.sevntu-checkstyle:sevntu-checkstyle-maven-plugin to v1.35.0 * Update dependency com.github.spotbugs:spotbugs-maven-plugin to v3.1.12.2 * Update dependency com.github.os72:protoc-jar-maven-plugin to v3.11.4 * Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.3 * Update dependency org.apache.maven.plugins:maven-resources-plugin to v3.3.1 * Update dependency org.apache.maven.plugins:maven-clean-plugin to v3.3.2 * Update dependency org.apache.maven.plugins:maven-install-plugin to v3 * Update maven-surefire-plugin.version to v2.22.2 * Update dependency org.codehaus.mojo:exec-maven-plugin to v3 * Update dependency org.apache.maven.plugins:maven-antrun-plugin to v3 * Update dependency org.codehaus.mojo:versions-maven-plugin to v2.16.2 * Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.2 * Update dependency org.commonjava.maven.plugins:directory-maven-plugin to v1 * Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3 * Update dependency com.github.veithen.alta:alta-maven-plugin to v0.8.0 * dropped other osgi missed plugins * disabled proto * Update maven-surefire-plugin.version to v3 * dropped proto support --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
DozerMapper · Mar 5, 2024 · e23bbbe · e23bbbe
1 parent e6492cf
commit e23bbbe
Show file tree

Hide file tree

Showing 56 changed files with 72 additions and 3,004 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,12 +14,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4
         with:
           distribution: "temurin"
           java-version: 11
 
-      - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
+      - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
@@ -38,20 +38,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4
         with:
           distribution: "temurin"
           java-version: 11
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           languages: java
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           category: "/language:java"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4
         with:
           distribution: "temurin"
           java-version: 11

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif
diff --git a/bom-dependencies/pom.xml b/bom-dependencies/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.github.dozermapper</groupId>
         <artifactId>dozer-parent</artifactId>
-        <version>6.5.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -50,9 +50,7 @@
         <jmh.version>1.19</jmh.version>
         <junit5-vintage.version>5.1.0</junit5-vintage.version>
         <mockito-core.version>4.6.1</mockito-core.version>
-        <aries.spifly.verison>1.2</aries.spifly.verison>
-        <pax-exam.version>4.13.1</pax-exam.version>
-        <lombok.version>1.18.24</lombok.version>
+        <lombok.version>1.18.30</lombok.version>
         <protobuf-java.version>3.3.0</protobuf-java.version>
         <objenesis.version>3.2</objenesis.version>
         <osgi.version>6.0.0</osgi.version>
@@ -179,51 +177,11 @@
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito-core.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.aries.spifly</groupId>
-                <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-                <version>${aries.spifly.verison}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
-                <version>${spring.version}_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
-                <version>${spring.version}_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
-                <version>${spring.version}_1</version>
-            </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>${osgi.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-karaf</artifactId>
-                <version>${pax-exam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit4</artifactId>
-                <version>${pax-exam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-link-assembly</artifactId>
-                <version>${pax-exam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-link-mvn</artifactId>
-                <version>${pax-exam.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>

diff --git a/building-tools/pom.xml b/building-tools/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.github.dozermapper</groupId>
         <artifactId>dozer-parent</artifactId>
-        <version>6.5.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>dozer-building-tools</artifactId>
     <packaging>jar</packaging>

diff --git a/core/pom.xml b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.github.dozermapper</groupId>
         <artifactId>dozer-plugins-parent</artifactId>
-        <version>6.5.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../plugins-parent</relativePath>
     </parent>
 
@@ -33,22 +33,6 @@
     <name>Dozer :: Core</name>
 
     <properties>
-        <osgi.Bundle-Activator>com.github.dozermapper.core.osgi.Activator</osgi.Bundle-Activator>
-        <!--
-        <osgi.additional.Import-Package>
-            org.hibernate.proxy;version="[4.2,6)";resolution:=optional,
-            javassist.util.proxy;version="[3.13,4)";resolution:=optional
-        </osgi.additional.Import-Package>
-        -->
-        <osgi.Export-Package>com.github.dozermapper.core.*</osgi.Export-Package>
-        <!-- ServiceLoader Capability -->
-        <osgi.Require-Capability>
-            osgi.serviceloader;
-            filter:="(osgi.serviceloader=com.github.dozermapper.core.DozerModule)";cardinality:=multiple;resolution:=optional,
-            osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional
-        </osgi.Require-Capability>
-        <osgi.SPI-Consumer>*</osgi.SPI-Consumer>
-
         <!-- NOTE: Needs to be removed in future -->
         <spotbugs.skip>true</spotbugs.skip>
 
@@ -87,6 +71,7 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <!--JAXB-API-->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -101,13 +86,15 @@
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
+
         <!-- EL -->
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.el</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+
         <!-- YAML -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/core/src/main/java/com/github/dozermapper/core/util/DozerConstants.java b/core/src/main/java/com/github/dozermapper/core/util/DozerConstants.java
@@ -28,7 +28,7 @@ public final class DozerConstants {
     private DozerConstants() {
     }
 
-    public static final String CURRENT_VERSION = "6.5.2";
+    public static final String CURRENT_VERSION = "7.0.0";
 
     public static final boolean DEFAULT_WILDCARD_POLICY = true;
     public static final boolean DEFAULT_WILDCARD_CASE_INSENSITIVE_POLICY = false;

diff --git a/docs/asciidoc/migration/v6-to-v7.adoc b/docs/asciidoc/migration/v6-to-v7.adoc
@@ -0,0 +1,7 @@
+== Migration from v6.5.0 to v7
+
+See link:https://github.com/DozerMapper/dozer/releases/tag/7.0.0[for release notes].
+
+=== 1. OSGI support dropped
+=== 2. Java 8 support dropped
+=== 2. Proto support dropped
diff --git a/docs/asciidoc/migration/v66-to-v66.adoc b/docs/asciidoc/migration/v66-to-v66.adoc
diff --git a/dozer-integrations/dozer-proto3/pom.xml b/dozer-integrations/dozer-proto3/pom.xml