Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated plugins #862

Merged
merged 65 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
c94412b
added renovate
garethahealy Mar 5, 2024
85abcad
downgraded mvn
garethahealy Mar 5, 2024
fd7f630
Update actions/cache digest to ab5e6d0
renovate[bot] Mar 5, 2024
54871b9
Update github/codeql-action action to v3.24.6
renovate[bot] Mar 5, 2024
e6bebd2
Merge pull request #2 from garethahealy/renovate/actions-cache-digest
garethahealy Mar 5, 2024
1b75afc
Merge pull request #3 from garethahealy/renovate/github-codeql-action…
garethahealy Mar 5, 2024
3c73402
bumped to 7
garethahealy Mar 5, 2024
3ee40b0
Update actions/setup-java digest to 9704b39
renovate[bot] Mar 5, 2024
c2cdfb7
Update dependency org.apache.maven.plugins:maven-assembly-plugin to v…
renovate[bot] Mar 5, 2024
54418f2
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v…
renovate[bot] Mar 5, 2024
658b42a
Update dependency org.apache.maven.plugins:maven-enforcer-plugin to v…
renovate[bot] Mar 5, 2024
092c1fc
Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.3.0
renovate[bot] Mar 5, 2024
c79395a
Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.0
renovate[bot] Mar 5, 2024
d4b20e9
Update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.5.0
renovate[bot] Mar 5, 2024
80a1328
Merge pull request #4 from garethahealy/renovate/actions-setup-java-d…
garethahealy Mar 5, 2024
2c87933
Update dependency org.projectlombok:lombok to v1.18.30
renovate[bot] Mar 5, 2024
d3ba394
Update dependency org.sonatype.plugins:nexus-staging-maven-plugin to …
renovate[bot] Mar 5, 2024
1a2a793
Update dependency com.mycila:license-maven-plugin to v4
renovate[bot] Mar 5, 2024
1f4bb7b
Update dependency org.apache.cxf:cxf-xjc-plugin to v4
renovate[bot] Mar 5, 2024
1f83d90
removed servicemix plugin not used anymore
garethahealy Mar 5, 2024
591cc0d
Update dependency com.github.sevntu-checkstyle:sevntu-checkstyle-mave…
renovate[bot] Mar 5, 2024
1030b35
Merge pull request #9 from garethahealy/renovate/maven-jar-plugin.ver…
garethahealy Mar 5, 2024
4655a98
Update dependency com.github.spotbugs:spotbugs-maven-plugin to v3.1.12.2
renovate[bot] Mar 5, 2024
0339513
Update dependency com.github.os72:protoc-jar-maven-plugin to v3.11.4
renovate[bot] Mar 5, 2024
af478e5
Merge pull request #8 from garethahealy/renovate/maven-enforcer-plugi…
garethahealy Mar 5, 2024
acb39a4
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3…
renovate[bot] Mar 5, 2024
c0f490b
Update dependency org.apache.maven.plugins:maven-resources-plugin to …
renovate[bot] Mar 5, 2024
9d292b2
Merge pull request #7 from garethahealy/renovate/maven-compiler-plugi…
garethahealy Mar 5, 2024
a4c3bec
Update dependency org.apache.maven.plugins:maven-clean-plugin to v3.3.2
renovate[bot] Mar 5, 2024
7490ce0
Update dependency org.apache.maven.plugins:maven-install-plugin to v3
renovate[bot] Mar 5, 2024
7a68c65
Merge pull request #14 from garethahealy/renovate/build-helper-maven-…
garethahealy Mar 5, 2024
b71c25d
Merge pull request #13 from garethahealy/renovate/maven-source-plugin…
garethahealy Mar 5, 2024
4be0dcf
Merge pull request #5 from garethahealy/renovate/maven-assembly-plugi…
garethahealy Mar 5, 2024
905144d
Update maven-surefire-plugin.version to v2.22.2
renovate[bot] Mar 5, 2024
0a0d336
Update dependency org.codehaus.mojo:exec-maven-plugin to v3
renovate[bot] Mar 5, 2024
1ed2d66
Update dependency org.apache.maven.plugins:maven-antrun-plugin to v3
renovate[bot] Mar 5, 2024
c8a6af2
Merge pull request #16 from garethahealy/renovate/nexus-staging-maven…
garethahealy Mar 5, 2024
3b1d6a9
Update dependency org.codehaus.mojo:versions-maven-plugin to v2.16.2
renovate[bot] Mar 5, 2024
9a612af
Merge pull request #20 from garethahealy/renovate/major-cxf-xjc-plugi…
garethahealy Mar 5, 2024
c6059b0
Merge pull request #15 from garethahealy/renovate/lombok.version
garethahealy Mar 5, 2024
49b7226
Merge pull request #22 from garethahealy/renovate/com.github.sevntu-c…
garethahealy Mar 5, 2024
8f19036
Merge pull request #10 from garethahealy/renovate/maven-javadoc-plugi…
garethahealy Mar 5, 2024
4275f10
Merge pull request #6 from garethahealy/renovate/maven-clean-plugin.v…
garethahealy Mar 5, 2024
b58b4bd
Merge pull request #11 from garethahealy/renovate/maven-resources-plu…
garethahealy Mar 5, 2024
530b5b1
Merge pull request #18 from garethahealy/renovate/major-license-maven…
garethahealy Mar 5, 2024
f5591f0
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.2
renovate[bot] Mar 5, 2024
7cbedd4
Merge pull request #27 from garethahealy/renovate/major-maven-install…
garethahealy Mar 5, 2024
afeecb5
Update dependency org.commonjava.maven.plugins:directory-maven-plugin…
renovate[bot] Mar 5, 2024
bfae535
Merge pull request #32 from garethahealy/renovate/protoc-jar-maven-pl…
garethahealy Mar 5, 2024
3c397d4
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3
renovate[bot] Mar 5, 2024
12fa290
Merge pull request #31 from garethahealy/renovate/spotbugs-maven-plug…
garethahealy Mar 5, 2024
840380c
Merge pull request #12 from garethahealy/renovate/maven-shade-plugin.…
garethahealy Mar 5, 2024
d5a7cad
Merge pull request #21 from garethahealy/renovate/major-maven-antrun-…
garethahealy Mar 5, 2024
0b4e92f
Merge pull request #23 from garethahealy/renovate/versions-maven-plug…
garethahealy Mar 5, 2024
ac0dc1c
Update dependency com.github.veithen.alta:alta-maven-plugin to v0.8.0
renovate[bot] Mar 5, 2024
3ce7f5c
Merge pull request #26 from garethahealy/renovate/major-maven-gpg-plu…
garethahealy Mar 5, 2024
ac5d72a
Merge pull request #28 from garethahealy/renovate/major-exec-maven-pl…
garethahealy Mar 5, 2024
c947a09
Merge pull request #29 from garethahealy/renovate/major-directory-mav…
garethahealy Mar 5, 2024
36b312f
Merge pull request #24 from garethahealy/renovate/maven-surefire-plug…
garethahealy Mar 5, 2024
ce45eda
dropped other osgi missed plugins
garethahealy Mar 5, 2024
b968ded
disabled proto
garethahealy Mar 5, 2024
05c4b5e
Update maven-surefire-plugin.version to v3
renovate[bot] Mar 5, 2024
9be1090
Merge pull request #30 from garethahealy/renovate/major-maven-surefir…
garethahealy Mar 5, 2024
664d8da
Merge pull request #33 from garethahealy/renovate/alta-maven-plugin.v…
garethahealy Mar 5, 2024
1317fce
dropped proto support
garethahealy Mar 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
46 changes: 2 additions & 44 deletions bom-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion building-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 4 additions & 17 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -87,6 +71,7 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!--JAXB-API-->
<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions docs/asciidoc/migration/v6-to-v7.adoc
Original file line number Diff line number Diff line change
@@ -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
6 changes: 0 additions & 6 deletions docs/asciidoc/migration/v66-to-v66.adoc

This file was deleted.

107 changes: 0 additions & 107 deletions dozer-integrations/dozer-proto3/pom.xml

This file was deleted.

Loading