Skip to content

Commit 65673a6

Browse files
jacekbilskijacekbilski
authored
Cleanups before Java 17 (#735)
* Maven Wrapper upgrade. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Maven plugins upgrades. Defining common plugin versions in parent pom. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Cleaning up pom.xmls. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Cleaning up testing dependencies. Migrating to JUnit5 and AssertJ. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Giving modules proper names. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Random documentation updates. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Quarkus to version 1.13.7.Final (newest 1.x), used "Quarkus 1.13 migration from Quarkus 1.11" OpenRewrite recipe. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Deleting `spring-function` example, Spring is providing its own here: https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-cloudevent. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Spring Boot to the newest 2.x version, used "Migrate to Spring Boot 2.7" OpenRewrite recipe. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Eclipse Jersey to the newest 2.x version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Jackson to the newest 2.x version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Jetty to the newest 9.4.x version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading RocketMQ to the newest version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Apache Kafka to the newest 3.x version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading RESTEasy to the newest 4.5.x (Jakarta EE 8) or 6.0.x (Jakarta EE 9+) version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> * Upgrading Vert.x to the newest 3.x (Jakarta EE 8) or 4.x (Jakarta EE 9+) version. Signed-off-by: Jacek Bilski <jacek@bilski.tech> --------- Signed-off-by: Jacek Bilski <jacek@bilski.tech>
1 parent ecde1d4 commit 65673a6

57 files changed

Lines changed: 620 additions & 1076 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
wrapperVersion=3.3.4
2+
distributionType=only-script
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

‎amqp/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
<name>CloudEvents - Proton AMQP Binding</name>
1414
<packaging>jar</packaging>
1515

16-
<properties>
17-
<protonj.version>0.34.1</protonj.version>
18-
<jsr305.version>3.0.2</jsr305.version>
19-
<module-name>io.cloudevents.amqp.proton</module-name>
20-
</properties>
16+
<properties>
17+
<protonj.version>0.34.1</protonj.version>
18+
<module-name>io.cloudevents.amqp.proton</module-name>
19+
</properties>
2120

22-
<dependencies>
21+
<dependencies>
2322
<dependency>
2423
<groupId>org.apache.qpid</groupId>
2524
<artifactId>proton-j</artifactId>
@@ -43,6 +42,7 @@
4342
<groupId>org.junit.jupiter</groupId>
4443
<artifactId>junit-jupiter</artifactId>
4544
<version>${junit-jupiter.version}</version>
45+
<scope>test</scope>
4646
</dependency>
4747
<dependency>
4848
<groupId>io.cloudevents</groupId>

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.code.findbugs</groupId>
4141
<artifactId>jsr305</artifactId>
42-
<version>3.0.2</version>
42+
<version>${jsr305.version}</version>
4343
<scope>provided</scope>
4444
<optional>true</optional>
4545
</dependency>

‎benchmarks/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<plugin>
8484
<groupId>org.apache.maven.plugins</groupId>
8585
<artifactId>maven-compiler-plugin</artifactId>
86-
<version>3.8.0</version>
86+
<version>3.15.0</version>
8787
<configuration>
8888
<compilerVersion>${javac.target}</compilerVersion>
8989
<source>${javac.target}</source>
@@ -93,7 +93,7 @@
9393
<plugin>
9494
<groupId>org.apache.maven.plugins</groupId>
9595
<artifactId>maven-shade-plugin</artifactId>
96-
<version>3.2.1</version>
96+
<version>3.6.2</version>
9797
<executions>
9898
<execution>
9999
<phase>package</phase>
@@ -133,35 +133,35 @@
133133
<plugins>
134134
<plugin>
135135
<artifactId>maven-clean-plugin</artifactId>
136-
<version>2.5</version>
136+
<version>3.5.0</version>
137137
</plugin>
138138
<plugin>
139139
<artifactId>maven-deploy-plugin</artifactId>
140-
<version>2.8.1</version>
140+
<version>3.1.4</version>
141141
</plugin>
142142
<plugin>
143143
<artifactId>maven-install-plugin</artifactId>
144-
<version>3.1.3</version>
144+
<version>3.1.4</version>
145145
</plugin>
146146
<plugin>
147147
<artifactId>maven-jar-plugin</artifactId>
148148
<version>3.5.0</version>
149149
</plugin>
150150
<plugin>
151151
<artifactId>maven-javadoc-plugin</artifactId>
152-
<version>2.9.1</version>
152+
<version>3.12.0</version>
153153
</plugin>
154154
<plugin>
155155
<artifactId>maven-resources-plugin</artifactId>
156156
<version>3.5.0</version>
157157
</plugin>
158158
<plugin>
159159
<artifactId>maven-site-plugin</artifactId>
160-
<version>3.3</version>
160+
<version>3.21.0</version>
161161
</plugin>
162162
<plugin>
163163
<artifactId>maven-source-plugin</artifactId>
164-
<version>3.3.0</version>
164+
<version>3.4.0</version>
165165
</plugin>
166166
<plugin>
167167
<artifactId>maven-surefire-plugin</artifactId>

‎core/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.google.code.findbugs</groupId>
4545
<artifactId>jsr305</artifactId>
46-
<version>3.0.2</version>
46+
<version>${jsr305.version}</version>
4747
<scope>provided</scope>
4848
<optional>true</optional>
4949
</dependency>
@@ -69,7 +69,6 @@
6969
<plugin>
7070
<groupId>org.apache.maven.plugins</groupId>
7171
<artifactId>maven-jar-plugin</artifactId>
72-
<version>3.5.0</version>
7372
<executions>
7473
<execution>
7574
<goals>

‎docs/amqp-proton.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ nav_order: 5
99

1010
This module implements `MessageReader` and `MessageWriter` using the Qpid Proton
1111
library. It can be used with Qpid Proton or any integrations based on Qpid
12-
Proton (e.g vertx-proton).
12+
Proton (e.g. vertx-proton).
1313

14-
For Maven based projects, use the following to configure the `proton` AMQP
14+
For Maven-based projects, use the following to configure the `proton` AMQP
1515
binding for CloudEvents:
1616

1717
```xml

‎docs/api.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ nav_order: 2
1010
This module contains the interfaces to represent `CloudEvent` in memory and to
1111
read and write an object using as CloudEvent.
1212

13-
For Maven based projects, use the following dependency:
13+
For Maven-based projects, use the following dependency:
1414

1515
```xml
1616

@@ -47,8 +47,8 @@ binary mode containing a valid CloudEvent can be translated to a
4747
CloudEvent, hence an eventual response builder could implement
4848
`CloudEventWriter`.
4949

50-
`CloudEventReader` and `CloudEventWriter` implementations doesn't have any
51-
particular knowledge about specification version, difference between attributes
50+
`CloudEventReader` and `CloudEventWriter` implementations do not have any
51+
particular knowledge about a specification version, difference between attributes
5252
and extensions, and so on. Their only concern is how to read and write context
5353
attributes and data back and forth to the "CloudEvents type system", as defined
5454
in the package `io.cloudevents`.

‎docs/avro.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ nav_order: 4
1010
This module provides the Avro Compact `EventFormat` implementation.
1111

1212
# Setup
13-
For Maven based projects, use the following dependency:
13+
For Maven-based projects, use the following dependency:
1414

1515
```xml
1616
<dependency>

‎docs/core.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ nav_order: 3
1010
This package includes implementations and utilities to create and process
1111
`CloudEvent` and interfaces to deal with Protocol Bindings and Event Formats.
1212

13-
For Maven based projects, use the following dependency:
13+
For Maven-based projects, use the following dependency:
1414

1515
```xml
1616
<dependency>

0 commit comments

Comments
 (0)