Hi, I agree renaming is the best option. I tried it and it seems to work.
* Renamed LICENSE.txt to LICENSE and NOTICE.txt to NOTICE. * I also changed the NOTICE file to include the correct year 2022. * For the api artifacts the two files LICENSE and NOTICE are generated by the maven-remote-resources-plugin. You find them in the META-INF subdirectory. * The plugin uses some values from the pom.xml files, so I added some comments to api/pom.xml and parent-pom/pom.xml. Here is the JIRA to cover this: "Avoid duplicated license and notice files in distribution artifact" https://issues.apache.org/jira/browse/JDO-813 You find the changes in the branch JDO-813. Please feed free to merge the change in the 3.2.1 branch. Then I will resolve the JIRA. Regards Michael Yes. If there is a LICENSE and NOTICE in the root, and the plugin does not overwrite them, I think we are good renaming our xxx.txt to xxx and be done with it. Craig On May 20, 2022, at 5:03 AM, TIlmann <tilmann_...@gmx.de><mailto:tilmann_...@gmx.de> wrote: I looked at some other repositories, they appear to have LICENSE and NOTICE in their repository root. https://github.com/apache/spark https://github.com/apache/derby https://github.com/apache/kafka Didn't you mention something like that the plugin may not overwrite files that already exist? In that case we could solve the problem by just renaming the current files by removing the .txt ending...? Til. On 5/20/22 13:15, Bouschen, Michael wrote: Hi Tilmann, no, the files LICENCE and NOTICE are generated by 'mvn install'. So if we need a LICENSE file in the source repository, we haven an issue here. Regards Michael So I propose to remove the files LICENSE.txt and NOTICE.txt and use the files as generated by the maven-remote-resources-plugin Just for my understanding, we would still have LICENSE/NOTICE files in the repository, right? I think at least the LICENSE(.txt) file is pretty much mandatory in the repository. Otherwise that change sounds good, please go ahead and I will merge it into the RC. Til On 5/19/22 23:22, Craig Russell wrote: Hi Michael, I'd agree that removing LICENSE.txt and NOTICE.txt from the root and changing the <name> in the root pom makes sense. But let's also make it easier on ourselves by documenting the behavior. Maybe adding a paragraph to the README.md that describes that the files are automatically created when the top level project is built? And adding a comment to the pom that the <name> is used to generate the README and LICENSE files? Then the question you raise whether we should create a JIRA and add it to 3.2.1. I'm ok either way. It's not a critical fix but still would be useful to include in 3.2.1. Craig On May 19, 2022, at 2:10 PM, Michael Bouschen <m...@apache.org><mailto:m...@apache.org><mailto:m...@apache.org><mailto:m...@apache.org> wrote: Hi, Looked at the unzipped directory for source-release that becomes jdo-3.2.1-RC1. The NOTICE seems a bit off. It refers to the JDO pom with a copyright. But the NOTICE.txt is fine, except for the Copyright date which should be 2005-2022. Craig pushed a change to main. I don't think we need LICENSE since we have LICENSE.txt which is fine. AI Michael: try to figure out where the LICENSE and NOTICE are coming from. Perhaps the mvn-notice-plugin? We added some feature for the Apache Felix bundle plug-in... I figured out the files LICENSE and NOTICE are generated by the maven-remote-resources-plugin which is defined in the Apache parent pom. The plugin definition contains the following comment for the maven-remote-resources-plugin: <!-- We want to package up license resources in the JARs produced --> It refers to org.apache:apache-jar-resource-bundle:1.4 as resource bundle. If you are interested you find it in your local maven repository. Go to ~/.m2/repository/org/apache/apache-jar-resource-bundle/1.4 and take a look at apache-jar-resource-bundle-1.4.jar. The maven-remote-resources-plugin uses these files as templates when the plugin is executed. According to "Assembling LICENSE and NOTICE files" see https://infra.apache.org/licensing-howto.html the files should be called LICENSE and NOTICE, so without the .txt suffix. So I propose to remove the files LICENSE.txt and NOTICE.txt and use the files as generated by the maven-remote-resources-plugin. In order to get a better name into the generated NOTICE file I propose to rename the JDO root pom from "JDO Root POM" to "Apache Java Data Objects (JDO)". That means setting the <name> element in the JDO root pom: <name>Apache Java Data Objects (JDO)</name> What do you think? If you agree I would check in the change into the 3.2.1 branch. Regards Michael Craig L Russell c...@apache.org<mailto:c...@apache.org><mailto:c...@apache.org><mailto:c...@apache.org> -- Michael Bouschen akquinet tech@spree GmbH Bülowstraße 66 • D-10783 Berlin Tel: +49 30 235520-33 Fax: +49 30 217520-12 E-Mail: michael.bousc...@akquinet.de<mailto:michael.bousc...@akquinet.de><mailto:michael.bousc...@akquinet.de><mailto:michael.bousc...@akquinet.de> Web: www.akquinet.de<http://www.akquinet.de><http://www.akquinet.de/><http://www.akquinet.de/> Geschäftsführung: Martin Weber, Dr. Torsten Fink, Heinz Wilming Amtsgericht Berlin HRB 86780 • USt.-Id. Nr.: DE 225 964 680 [Facebook]<http://www.facebook.com/akquinet><http://www.facebook.com/akquinet> [XING]<https://www.xing.com/companies/akquinetag><https://www.xing.com/companies/akquinetag> [LinkedIn]<https://www.linkedin.com/company/akquinet-ag><https://www.linkedin.com/company/akquinet-ag> [Twitter]<https://twitter.com/akquinet><https://twitter.com/akquinet> Craig L Russell c...@apache.org<mailto:c...@apache.org> -- Michael Bouschen akquinet tech@spree GmbH Bülowstraße 66 • D-10783 Berlin Tel: +49 30 235520-33 Fax: +49 30 217520-12 E-Mail: michael.bousc...@akquinet.de<mailto:michael.bousc...@akquinet.de> Web: www.akquinet.de<http://www.akquinet.de/> Geschäftsführung: Martin Weber, Dr. Torsten Fink, Heinz Wilming Amtsgericht Berlin HRB 86780 • USt.-Id. Nr.: DE 225 964 680 [Facebook]<http://www.facebook.com/akquinet> [XING]<https://www.xing.com/companies/akquinetag> [LinkedIn]<https://www.linkedin.com/company/akquinet-ag> [Twitter]<https://twitter.com/akquinet>
