This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
commit a2112cc7375e1e9a87cf97d9848fb1127bfc1f84 Author: Mark Struberg <[email protected]> AuthorDate: Wed Oct 8 16:40:58 2025 +0200 MEECROWAVE-289 fix jakarta dependencies --- meecrowave-jpa/pom.xml | 6 +++++ meecrowave-jta/pom.xml | 12 +++++++++ meecrowave-junit/pom.xml | 7 ----- meecrowave-oauth2-minimal/pom.xml | 55 +++++++++++++++++++++++---------------- pom.xml | 3 ++- 5 files changed, 52 insertions(+), 31 deletions(-) diff --git a/meecrowave-jpa/pom.xml b/meecrowave-jpa/pom.xml index ba09824..86dee9e 100644 --- a/meecrowave-jpa/pom.xml +++ b/meecrowave-jpa/pom.xml @@ -48,6 +48,12 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> <version>${openjpa.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/meecrowave-jta/pom.xml b/meecrowave-jta/pom.xml index c36aa9e..c86f11f 100644 --- a/meecrowave-jta/pom.xml +++ b/meecrowave-jta/pom.xml @@ -37,11 +37,23 @@ <dependency> <groupId>jakarta.transaction</groupId> <artifactId>jakarta.transaction-api</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> <version>4.0.0</version> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/meecrowave-junit/pom.xml b/meecrowave-junit/pom.xml index b9caf30..df27e1c 100644 --- a/meecrowave-junit/pom.xml +++ b/meecrowave-junit/pom.xml @@ -43,13 +43,6 @@ </profiles> <dependencies> - <dependency> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-specs-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/meecrowave-oauth2-minimal/pom.xml b/meecrowave-oauth2-minimal/pom.xml index 12e7801..7f832c6 100644 --- a/meecrowave-oauth2-minimal/pom.xml +++ b/meecrowave-oauth2-minimal/pom.xml @@ -47,39 +47,43 @@ <dependencies> <dependency> - <groupId>jakarta.inject</groupId> - <artifactId>jakarta.inject-api</artifactId> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${project.version}</version> </dependency> - <dependency> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-api</artifactId> - </dependency> - <dependency> - <groupId>jakarta.json.bind</groupId> - <artifactId>jakarta.json.bind-api</artifactId> - </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> <version>${tomcat.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-jose</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -132,6 +136,12 @@ <artifactId>openjpa</artifactId> <version>${openjpa.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -143,6 +153,12 @@ <groupId>jakarta.persistence</groupId> <artifactId>jakarta.persistence-api</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -181,14 +197,7 @@ <version>${h2.version}</version> <scope>test</scope> </dependency> -<!--X TODO check - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.64</version> - <scope>test</scope> - </dependency> - --> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> diff --git a/pom.xml b/pom.xml index 1fec672..8ff58c5 100644 --- a/pom.xml +++ b/pom.xml @@ -254,9 +254,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.2.0</version> + <version>3.12.0</version> <configuration> <release>${source}</release> + <legacyMode>true</legacyMode> <doclint>none</doclint> </configuration> </plugin>
