cxbrooks
commented
4 years ago I'm closing this as there are no important changes to the ptII tree that need to be folded in.
See https://github.com/icyphy/ptII/branches to determine the last branch submitted for review. In this case it was origin/osgi-2-0-cq-2.
https://github.com/icyphy/ptII/commits/origin/osgi-2-0-cq-2 says the last commit was on August 13, 2019, when code was merged from origin/osgi-2-0.
https://github.com/icyphy/ptII/commits/origin/osgi-2-0 indicates that the last commit was August 9, 2019. So, we want to find any changes since August 10, 2019.
To check this, I cloned the tree with git clone https://github.com/icyphy/ptII; cd ptII and then determined the number of changes since 2019-08-10.
cxh@swarmnuc2008:~/src/ptII$ git log --since=2019-08-10 | egrep "^commit" | wc -l
95
cxh@swarmnuc2008:~/src/ptII$ git diff --name-only HEAD~95 HEAD~1 | egrep '.java$'
config/OpenCVTest.java
org/hlacerti/lib/CertiRtig.java
org/hlacerti/lib/HlaAttributeReflector.java
org/hlacerti/lib/HlaAttributeUpdater.java
org/hlacerti/lib/HlaManager.java
org/hlacerti/lib/HlaManager1516e.java
org/hlacerti/lib/HlaManager1_3.java
org/hlacerti/lib/HlaManagerDelegate.java
org/hlacerti/lib/HlaPublisher.java
org/hlacerti/lib/HlaReflectable.java
org/hlacerti/lib/HlaReporter.java
org/hlacerti/lib/HlaSubscriber.java
org/hlacerti/lib/HlaUpdatable.java
org/hlacerti/lib/MessageProcessing.java
org/hlacerti/lib/MessageProcessing1516e.java
org/hlacerti/newModels1516e/VariableArrayPTIIJavaFed/src_test/certi1516e/VariableArray/UavReceive.java
org/hlacerti/newModels1516e/VariableArrayPTIIJavaFed/src_test/certi1516e/VariableArray/UavSend.java
org/ptolemy/opencv/OpenCVLoader.java
ptolemy/actor/lib/database/DatabaseManager.java
ptolemy/actor/lib/jjs/JavaScript.java
ptolemy/domains/ci/kernel/ActiveActorManager.java
ptolemy/util/test/junit/Auto32Tests.java
ptolemy/util/test/junit/AutoKnownFailedTests.java
ptolemy/util/test/junit/AutoTests.java
ptolemy/vergil/basic/export/html/ExportHTMLAction.java
cxh@swarmnuc2008:~/src/ptII$ None of the above files are included in the osgi-2-0 branch.
This issue can be closed.
We should review the Ptolemy II tree for any changes not present in the ptII osgi bundles and if necessary transfer the changes.
If we update the bundles, then we need to push the changes through the Eclipse IP process, which I believe has changed.
See: