"In general, I would expect your main branch to have a superset of the changes in your release branch."
I checked, and the only differences between the release/1.0.0 branches and the main branches are things like the NOTICE/DISCLAIMER files and adding in missing ASF headers. In short I don't see any "functional" (ie code) changes between the two. As to your question, I'm checking with the SDAP community to see what the consensus is. Thanks, Riley On 2023/01/03 17:35:09 larry mccay wrote: > "I would like to point out in regards to the missing ASF headers that the > links you provide are on a different branch than the one we built the > release from." > > Apologies, I was jumping around between github repos and got confused. > > That said, it seems to me that your release branch having the headers and > dev and/or master branches not having them may point to a dev/release flow > that may result in regressions. Perhaps you have a different Trunk or > whatever your main branch is though. In general, I would expect your main > branch to have a superset of the changes in your release branch. > > Just to be sure, you don't intend to only license the release > branch's source as ASL, right? > > On Mon, Jan 2, 2023 at 9:28 PM Riley Kuttruff <r...@apache.org> wrote: > > > Thank you for the notes. > > > > I would like to point out in regards to the missing ASF headers that the > > links you provide are on a different branch than the one we built the > > release from. The release artifacts were built from the 'release/1.0.0' > > branch in their respective repositories. That said, the 'requirements.txt' > > file you linked present in the release does not contain such a header. > > > > Furthermore, with the new year, the copyright statements in the NOTICE > > files are now out of date as you observed. I'm assuming this will require a > > new release candidate? > > > > Thanks, > > Riley > > > > On 2022/12/30 23:39:13 larry mccay wrote: > > > I wanted to lend a hand with the sdap 1.0.0 release review and wanted to > > > let you know that it seems a bit cumbersome to review. > > > Perhaps my experience with other projects is limited to similar > > > conventions, though. > > > > > > The fact that the src artifacts aren't under a project specific root > > ended > > > up polluting my releases directory (where I review releases). This was my > > > fault for not noticing the missing root but clearly outside my > > > expectations. > > > > > > I also notice that each of what I would expect to just be separate > > modules > > > have their own tar balls and even github mirrors which is also awkward > > for > > > how I expect to review things - though not technically related to typical > > > review requirements. > > > > > > These may be seen as less relevant to the specific release at hand and > > more > > > for the overall project structure and conventions but they would > > certainly > > > help in reviewing. > > > > > > I note that there are numerous files [1][2][3] and many more that may > > > require Apache License headers. > > > > > > You can use something like the following in python files: > > > # > > > # Licensed to the Apache Software Foundation (ASF) under one or more > > > # contributor license agreements. See the NOTICE file distributed with > > > # this work for additional information regarding copyright ownership. > > > # The ASF licenses this file to You under the Apache License, Version 2.0 > > > # (the "License"); you may not use this file except in compliance with > > > # the License. You may obtain a copy of the License at > > > # > > > # http://www.apache.org/licenses/LICENSE-2.0 > > > # > > > # Unless required by applicable law or agreed to in writing, software > > > # distributed under the License is distributed on an "AS IS" BASIS, > > > # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > > implied. > > > # See the License for the specific language governing permissions and > > > # limitations under the License. > > > # > > > > > > The NOTICE file has a copyright of 2017-2022 still and unless this goes > > out > > > in the next couple days that will be out of date. > > > Duplicate and separate files like NOTICE, LICENSE, DISCLAIMER access > > > ingester, nexus and nexusproto as well as CONTRIBUTING.md which is in 2 > > but > > > not the other point to some organization issues. There should be some > > > effort put in to possibly make these modules under a common project > > rather > > > than what seem like separate projects. > > > > > > Some of the above make it pretty cumbersome to review even if not > > > technically blockers. > > > Addressing these sorts of things early will help contributors feel more > > > easily able to help out and can help build your community. > > > It will also help you get releases out easier. > > > > > > Hope the above is useful for you. > > > Happy to see a release coming together for the SDAP community and > > > congratulate you on tackling this milestone! > > > > > > It isn't clear to me that these should block your initial release - my > > vote > > > would be as follows: > > > -0 for my vote at this time. > > > > > > 1. > > > > > https://github.com/apache/incubator-sdap-ingester/blob/dev/collection_manager/requirements.txt > > > 2. > > > > > https://github.com/apache/incubator-sdap-ingester/blob/dev/collection_manager/setup.py > > > 3. > > > > > https://github.com/apache/incubator-sdap-ingester/blob/dev/collection_manager/collection_manager/main.py > > > > > > > > > On Fri, Dec 30, 2022 at 4:30 PM Julian Hyde <jh...@apache.org> wrote: > > > > > > > Good catch. But could you (and others) continue the process of > > > > reviewing and voting on the release. > > > > > > > > It is established that an official ASF release must not contain > > > > gradle-wrapper.jar [1], but in my opinion this is a problem that could > > > > be solved in the next incubating release. If a few IPMC members > > > > surface several issues this time around, the second release should be > > > > much cleaner. > > > > > > > > Julian > > > > > > > > [1] https://issues.apache.org/jira/browse/LEGAL-570 > > > > > > > > On Thu, Dec 29, 2022 at 5:44 PM Calvin Kirs <k...@apache.org> wrote: > > > > > > > > > > Hi, > > > > > > > > > > There has a compiled code (gradle-wrapper jar) in the source release. > > > > > > > > > > [1] > > > > > > https://dist.apache.org/repos/dist/dev/incubator/sdap/apache-sdap-1.0.0-rc2/apache-sdap-nexusproto-1.0.0-src.tar.gz > > > > > > > > > > On Sat, Dec 24, 2022 at 5:46 AM Riley Kuttruff <r...@apache.org> > > wrote: > > > > > > > > > > > > Hello, > > > > > > > > > > > > In consideration of the upcoming holiday weekend, let's extend this > > > > vote to last to a week from now. > > > > > > > > > > > > Thank you, > > > > > > Riley > > > > > > > > > > > > On 2022/12/23 03:19:10 Riley Kuttruff wrote: > > > > > > > Hello everyone, > > > > > > > > > > > > > > This is a call for a vote to release Apache SDAP (incubating) > > > > version 1.0.0-rc2. > > > > > > > > > > > > > > The Apache SDAP community has voted to approve release of Apache > > > > SDAP (incubating) version 1.0.0-rc2. > > > > > > > > > > > > > > We now request the Incubator PMC review and vote on this release. > > > > > > > > > > > > > > SDAP community vote thread: > > > > > > > https://lists.apache.org/thread/6nmknw8n1flwsqp4n3cromnrck21xmh9 > > > > > > > > > > > > > > Instructions for building docker images from source can be found > > > > here: > > > > > > > https://incubator-sdap-nexus.readthedocs.io/en/latest/build.html > > > > > > > Instructions for deploying locally to test can be found here: > > > > > > > > > > > https://incubator-sdap-nexus.readthedocs.io/en/latest/quickstart.html > > > > > > > > > > > > > > The tags to be voted on are 1.0.0-rc2: > > > > > > > > > > > > > > - nexusproto: > > > > > > > - URL: > > > > https://github.com/apache/incubator-sdap-nexusproto/tree/1.0.0-rc2 > > > > > > > - Commit: f3c726e69997436dd9ee6f9a993d4c95ee490b6f > > > > > > > - ingester: > > > > > > > - URL: > > > > https://github.com/apache/incubator-sdap-ingester/tree/1.0.0-rc2 > > > > > > > - Commit: 2c8a9d35320f11a5db2534802f43366ddaff2fea > > > > > > > - nexus: > > > > > > > - URL: > > > > https://github.com/apache/incubator-sdap-nexus/tree/1.0.0-rc2 > > > > > > > - Commit: f60e98331ac29b57ca40322f8f96e98a5c69e553 > > > > > > > > > > > > > > The release files, including signatures, digests, etc. can be > > found > > > > at: > > > > > > > > > > > > > https://dist.apache.org/repos/dist/dev/incubator/sdap/apache-sdap-1.0.0-rc2/ > > > > > > > > > > > > > > For verification, the hashes of the .tar.gz artifacts we are > > voting > > > > on are as follows: > > > > > > > > > > > > > > apache-sdap-ingester-1.0.0-src.tar.gz: > > > > > > > > > > > > > db380c3002351e65ec3581a3ff0cacbb7092f46292b0a656a78a919e1409738442e845731050a2160a556a7818f22b2ab4bb6da437200bc0a62419332de49ad7 > > > > > > > > > > > > > > apache-sdap-nexus-1.0.0-src.tar.gz: > > > > > > > > > > > > > da34e9830cf5126bac498180d7cdd95bc2cfc13535c7b4355ba51de64e3589a385a969e0cf1a89fa77e436b30c99a48abffab4b4ef03b23982aa33c2e83e8dbd > > > > > > > > > > > > > > apache-sdap-nexusproto-1.0.0-src.tar.gz: > > > > > > > > > > > > > 05dc8e96d9c49207750c1da13f630493e8d08f5e68733742c157ac6c85ede29aca25f3c94cd706acbbe21cee41ebc052a880b4d6ce859bf510bcc2d66d8f88b2 > > > > > > > > > > > > > > Release artifacts are signed with the following key: > > > > > > > > > > > > > https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4e98c4a32026656e14e0b570fc20035a010e3b7b > > > > > > > > > > > > > > Please vote on releasing this package as Apache SDAP (incubating) > > > > 1.0.0. > > > > > > > > > > > > > > The vote is open for 72 hours or until at least 3 “+1” PMC votes > > are > > > > cast and passes if at least 3 +1 PMC votes are > > > > > > > cast. > > > > > > > > > > > > > > [ ] +1 Release this package as Apache SDAP (incubating) 1.0.0 > > > > > > > [ ] +0 No opinion > > > > > > > [ ] -1 Do not release this package because ... > > > > > > > > > > > > > > Thank you, > > > > > > > Riley > > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > > > > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > > > > > > For additional commands, e-mail: > > general-h...@incubator.apache.org > > > > > > > > > > > > > > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > > > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > > > > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > > > > > > > > > > > > > > > > > > -- > > > > > Best wishes！ > > > > > CalvinKirs > > > > > > > > > > --------------------------------------------------------------------- > > > > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > > > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > > > > > > > > > > --------------------------------------------------------------------- > > > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > > --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
