#1 Add dependency for javax.annotation.
Merged 3 years ago by decathorpe. Opened 3 years ago by korkeala.
rpms/ korkeala/javaparser master  into  master

file modified
+8 -1
@@ -1,6 +1,6 @@ 

  Name:          javaparser

  Version:       3.3.5

- Release:       4%{?dist}

+ Release:       5%{?dist}

  Summary:       Java 1 to 9 Parser and Abstract Syntax Tree for Java

  License:       LGPLv3+ or ASL 2.0

  URL:           http://javaparser.org
@@ -11,6 +11,7 @@ 

  BuildRequires:  mvn(net.java.dev.javacc:javacc)

  BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)

  BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)

+ BuildRequires:  mvn(javax.annotation:javax.annotation-api)

  

  BuildArch:     noarch

  
@@ -50,6 +51,9 @@ 

  # Missing plugin

  %pom_remove_plugin :templating-maven-plugin javaparser-core

  

+ # JDK11 fix, add javax.annotation dependency

+ %pom_add_dep javax.annotation:javax.annotation-api javaparser-core

+ 

  # Missing dep on jbehave for testing

  %pom_disable_module javaparser-testing

  
@@ -72,6 +76,9 @@ 

  %license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL

  

  %changelog

+ * Wed Jul 22 2020 Markku Korkeala <markku.korkeala@iki.fi> - 3.3.5-5

+ - Add dependency for javax.annotation.

+ 

  * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.3.5-4

  - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11

  

Add dependency for javax.annotation to fix building with JDK11.

Oh, I didn't think fixing this one would be this easy.

Can you replace the JBoss annotations with the ones from Jakarta please?

The artifactID is javax.annotation:javax.annotation-api, it's provided by the jakarta-annotations package (which provides javax.annotation as well, and is what most of our packages now depend on after glassfish-annotations and geronimo-annotations were retired).

1 new commit added

  • Change to use javax.annotation:javax.annotation-api.
3 years ago

Oh, I didn't think fixing this one would be this easy.

I was a bit surprised as well :)

Can you replace the JBoss annotations with the ones from Jakarta please?

Yeah, of course, I've pushed the change now.

I meant squashing it into one commit :) No need to add a separate commit / changelog message for that, just override the original commit and force push to your fork.

rebased onto 66027db

3 years ago

Pull-Request has been merged by decathorpe

3 years ago