git status
On branch integration/COMMON-2019AUG
Your branch is up to date with 'origin/integration/COMMON-2019AUG'.

> git log --no-merges --oneline master..integration/COMMON-2019AUG -- ACS
9c402e9b54 (origin/temp/InclusiveMakefile, origin/feature/ICT-12452, feature/ICT-12452) ICT-12452: Improvements in dependency checking, specially avoiding unneeded overriding of java dir creation in object dir
6ddb619a53 ICT-12452: No longer presume that prgam prefix is 'alma' Obtain it from IDL file and use it for instance in the directories to compile for Java
d43a2521c9 ICT-12452: Small fix in XSDBIND to look for commontypes.xml in most appropriate place
1e770b8b1e ICT-12452: Classic Makefile installs files for InclusiveMakefile
5552309b87 (origin/feature/ICT-14885, feature/ICT-14885) ICT-14885: Ignore color output from 'ls'
ed7feb8c46 ICT-12452: ICT-14570 -- There was a typo in loggingtsGenPython which made it use the wrong template
f740ca2ef5 ICT-12452 and ICT-14570: Improvements in ACSERRDEF, ACSLOGTS and XSDBIND code generation for C++, Java and Python
937e5e7d74 ICT-12452: Improved Java LoggingTS support and makeJarFiles waiting on dependencies
f2cecd81cf ICT-12452: Updated loggingtsGen scripts to work with absolute paths
d0d0ac9028 ICT-12452: Improvements to LoggingTS in C++ and initial Java implementation
bfc0eabfe7 ICT-12452: Removing unwanted warning log
a6c1581c3c ICT-12452: Swapped groups and modules generation to reflect old behavior (groups first!)
de7ff1eb3d ICT-12452: Lock omniidl tasks on each module to prevent race conditions Small bug-fixes for JacORB and Jars compilation
4951a1b73f ICT-12452: Seevral improvements on InclusiveMakefile.mk
cf21558875 ICT-12452: Several improvements in dependency calculation, specially in Java
9c9087180c (origin/ICT-14677-monitoringsynctool-fails-with-ora-00936) adding dummy baci
5e8b522c4f Empty baci
d598a7f4c7 (temp/InclusiveMakefile) ICT-14568: Generated headers are now properly cleand up. List of modules is retrieved from MIDL or IDL. Or inherited from upper methods (ACSERRDEF, LOGGINGTS, etc.)
8f0b507bd1 ICT-14568: C++ IDL-generated header files now are considered headers and not custom installed files This helps finding dependencies in automated ways using findDep macro
0f3a0cc63a ICT-14568: Added prerequisites to omniidl call
64b1e309ef Fix kernel module compilation. (ICT-14846)
d76ad5ef87 ICT-14568: Added support for Python IDL code generation Some tweaks to makePyModules and makePyPackages were required
10664df752 ICT-14568: IDL Java Code Generation support
b5dbefc689 Fix typo in CSTD in acsMakefileProfile.Fedora26.mk. (ICT-12452)
863c04ed98 ICT-15015: Added support to custom targets in modules through MODULE_TARGETS variable This will ensure variables like MODRULE, MODPATH, MODDEP are available in custom targets even if they're not being called as chained dependencies from default targets (all, clean, install, clean_dist)
f6ef2c9571 ICT-14885: Removing debugging echoes
33aa9ad4d8 ICT-14885: Made compatible with bash -xe used by Jenkins
abb5d3a338 (origin/ICT-14674-expose-method-to-trigger-reconnections) forgot to commit idl
6d54544164 exposed method to reconnect to amqp
1a5d133c95 (origin/feature/ICT-12955) ICT-12955: Added missing include files
8b3f46ef13 ICT-12955: Added ThreadId to BinLog type
946e0f3445 ICT-12955: Added new entry threadId because stackId purpose was different Reverted changes related with stackId and re-did them with threadId Added several other places where threadId was needed
879b466a2e ICT-12955: Added handling of StackID using ACE_OS::thr_self() method
aec7857b8b ICT-14885: Changed the mechanism for deciding on the GCC library version of RTI DDS This allows to use any compatible version of GCC with the installed library versions
d9e33580ab Fix a typo and minor bug in InclusiveMakefile.
2d3db9f6ef Add setting of $module_USER_CXXFLAGS.

> git log --oneline master..integration/COMMON-2019AUG -- ARCHIVE
d2409b33de (origin/ICT-15110-mvn-poms-2019aug) ICT-15110 updated poms -> 2019.08-SNAPSHOT

> git log --no-merges --oneline master..integration/COMMON-2019AUG -- ICD
1f6aaf7000 Add idl_mods definition to ICD/HLA/Enumerations. (ICT-15052, ICT-15053)
f0362945a5 (origin/feature/ICT-14449) ICT-14449: MODULES_TEST now includes both modules
8eb0541c40 ICT-14449: ICD/Makefile builds Implementation as a GROUP
8fcf8b4043 ICT-14449: both modules relocated under ICD/Implemantation/CORR
e632e90787 (origin/feature/ICT-15262-allow-TPS-interface-change) Add support for the total-power spectrometer that will be connected the 12m Melco (PM) antennas. * This change adds another value for the CorrelatorType enumeration (for the total-power spectrometer). * It changes the control system so that if this an array with this value is used it will use a component called TPS/OBSERVATION_CONTROL. This component must implement the ObservationControl interface. * Arrays that use the total-power spectrometer will have the "TPS" suffix.
d2409b33de (origin/ICT-15110-mvn-poms-2019aug) ICT-15110 updated poms -> 2019.08-SNAPSHOT
4f26772afa Enable casac compilation in ICD. (ICT-15052)
f62441a109 Fix compilation issues in ICD. (ICT-15052)
53a8889bfd Fix compilation issues in ICD/HLA. (ICT-15052, ICT-15053)
76037744e0 Fix parallel build dependency issues with a few modules in ICD. (ICT-15052)
94408fc4d7 Add ICD/CORR makefiles. (ICT-15052)
b0b065e99b Hack to allow compilation of the module part of ICD/CONTROL. (ICT-15052)
afd294d2d3 Add makefiles for ICD/SharedCode. (ICT-15052)
006efad1af Add ICD/SCHEDULING makefiles. (ICT-15052)
12809a6d90 Add ICD/EXEC makefiles. (ICT-15052)
074e172559 Add compilation for ACACORR, ASA, OFFLINE, PIPELINE, and TELCAL. (ICT-15052)
9a8d3a1896 Add missing .INTERMEDIATE for ASDM ant code generation. (ICT-15052, ICT-15053)
11279c8fa0 Change LIBRARIES to LIBRARIES_L for swig compilation. (ICT-15052, ICT-15053)
4bfd112109 Add missing intermediate rule to jfree. (ICT-15052)
8d4d4eee9c Cleanup copy-pasted rule errors. (ICT-15052)
dd7a2eef71 Add ICD/ExtProd/LGPL/jfree compilation. (ICT-15052)
525b452ec9 Add partial compilation for ICD/ExtProd and ICD/CONTROL. (ICT-15052)
0ee435ab63 Fix ICD/HLA compilation to work from the group level. (ICT-15052, ICT-15053)
fea990e1ff ICT-14723, adding array name to the IDL structure
314cb40711 Add group makefiles for ICD/HLA. (ICT-15052, ICT-15053)
8ebed795f6 Fix ant and templategen to work from upper level directories in Enumerations. (ICT-15052, ICT-15053)
28bde37d53 Fix ant build to work from upper level directories in ASDM. (ICT-15052, ICT-15053)
5a44d72899 Fix typo in ASDMBinaries. (ICT-15052, ICT-15053)
0517dca9eb ICT-14723, necessary modifications at ICD level.
b214903bd2 Add makefiles for ASDMBinaries. (ICT-15052, ICT-15053)
472859cd05 Tweak setting Python include path in ASDM. (ICT-15052, ICT-15053)
3957a874ab Fix path in ASDM makefile and add latex target. (ICT-15052, ICT-15053)
21045c6089 Add first cut at ICD/HLA/ASDM makefiles. (ICT-15052, ICT-15053)
749d97c0a0 Change order-only to regular dependencies for swig shared libraries in ICD/HLA/Enumerations. (ICT-15052, ICT-15053)
6be64ebea8 Add Makefile.mk and module.mk for ICD/HLA/Enumerations.
95596dcd0c (origin/bugfix/ICT-14631-icd-hla-warnings) Add const qualifier to accessor to silence warnings. (ICT-14631)
0d19c51684 Remove unintentional change from previous commit. (ICT-14631)
0058841d47 Fix ASDM warnings under GCC 8. (ICT-14631)
30a319c475 Fix ASDM code generation warnings under gcc 8. (ICT-14631)

git status
On branch integration/java11
Your branch is up to date with 'origin/integration/java11'.

> git log --no-merges --oneline integration/COMMON-2019AUG..integration/java11 -- ACS
3a78d6438e ICT-14271: ICT-14981: Improvements to pass along paths for different jars
a84d37f8d0 ICT-14271: As part of ICT-14981 activation.jar is now considered in classpath
5583c7af91 ICT-14981: ICT-14271 Added dependency to jaxb-impl that was missing
5bdfde3618 ICT-14271: ICT-14981 Updated xjc wrapper because it was only printing the command and not execuing it
9c7e983819 ICT-14981: Changed arguments to not collide with underlying xjc implementation parameters Committed in feature/ICT-14271.
421b80bbe6 ICT-14981: Implemented 'xjc' wrapper script and installed jaxb-xjc jar This was put in feature/ICT-14271 because it is related to other changes made there
3251ac577a (origin/feature/ICT-14607-2, feature/ICT-14607-2) ICT-14607: Fixed bug that stored the description as name of BACI Properties
98007be0cd (origin/bugfix/ICT-15901, origin/bugfix/ICT-15091) Replaces all el fields by e
27505a4f42 (origin/bugfix/ICT-15090) Added missing jars to classpath for objexp
0ca0883858 (origin/bugfix/ICT-14860) Replaced el variable by e given it used by reflection to check fields within tmcdb classes
94ce675c08 ICT-14271: Updated acsStartJava to be compatible with classloader and noclassloader options Updated maciManagerJ to add 2 Java11 jars to the classpath
32966359bb ICT-14379: Ensure xercesImpl.jar gets installed to endorsed and non-endorsed paths
86b2f3c0a7 ICT-14379: Updated AcsTopJars in jacsutil because it gets used by Eclipse RCP Plugins
e825613cd1 Removed dependency on Acs ClassLoader because Java11 doesn't support it
8addebd569 (origin/bugfix/ICT-14859) Updated templates and mappings for solve ICT-14859
a94666395e (origin/feature/ICT-14787) ICT-14787: Updated activation.jar to 1.1.1 version
59f12e7d47 ICT-14607: Last changes for log:e and cdb:e compatibility. Updated all XSDs and XMLs to be in this format.
f5627d064e ICT-14607: Several changes were '_' was used as anonymous element in XMLs and parsing
1e5f096ef9 ICT-14607: Updated LoggingCache anonymous elements in XML files
b7ac01d5ce ICT-14607: LoggingConfig.xsd attribute changed from '_' to 'e' for consistency
5b1ddfa86a (origin/bugfix/ICT-14645) ICT-14645: Reverted JAVA_HOME path to /usr/java/default
b7f97fb92f (origin/bugfix/ICT-14608) ICT-14608: Add @Deprecated annotation to items documented as @deprecated
7423e2367f ICT-14379: Ensure xercesImpl is both at lib and lib/endorsed during transition
3dbcb369f8 ICT-14379: Further changes for Eclipse 4.11 and Java 11 compatibility
0d54b5520c ICT-14379: Updated eventGUI to be compatible with Eclipse 4.11 and Java 11
5aa6eb0302 ICT-14379: Updated alarmsDefGUI to be compatible with Eclipse 4.11 and Java11
067a61247d ICT-14379: Eclipse RCP Depends on java properties that were removed, I re-added them
565b72f621 ICT-14633: Changed Eclipse4 version for 4.11
cfb7baae08 (origin/bugfix/ICT-14627) ICT-14627: Updated jacorb-omgapi version to 3.9
d060dd8801 (origin/bugfix/ICT-14509) Added latest version of xerces
4d3458b48f Changed version from 2019FEB to 2019APR-JAVA11
4d1672f430 Replaced cdb:_ by cdb:e to read cdb Array in C++
45ab6596d6 Changed settings for memory logging and GC memory for Java 11
f405ff4748 Fixed several CDB documents changing 'cdb:_' element by 'cdb:_'
6f08cc3796 Fixed cdb_rdb tests
94f7109b78 Fixed cdb_rdb tests
fa49ceb4d3 Fixed CDBs for cdb modules tests
7a5c06ea5c Added relaxng to install path
14433a5314 Fixed problem starting the manager based on JNDI naming context.
dba91e4334 Added more jar dependencies to the build system
078f419e82 Added missing lib directory to the classpath
1145babe6e ACSAlarm is now compatible with Java 11
4c29019b39 Replaced '_' variable name by 'e' to make source code java 11 compatible
3956916741 Replaced '_' variable name by 'e' to make source code java 11 compatible
bd6597550e Fixed some other problems related to Java 11 migration
b717eae701 Fixed jlog to be compatible with Java 11
82cb05bce6 Updated list of base classpath with more CORBA base jars
16fb5fa4c4 Removed code branch to support Sun's CORBA JVM impl
44727ae460 Replaced _ by el for some variable names
1cb9639228 Replaced _ by el for some variable names
ec9effd0e6 Replaced _ by el for some variable names
fdb0316b06 Replaced _ by el for some variable names
2ba2ecf8b4 Replaced _ by el as variable name
b54e098b04 Made basic Java tools compatible with Java 11
9fff06a1d3 Updated version of sl4j library
da09f868cb Modified script to build JacORB
06ff059e6a Removed old jacorb sources
dfe864aec6 Trying to make the build java 11 compatible
1070de2476 (origin/feature/ICT-14298) Modified version of ACS for 2019APR release
a951a6a1ff Added Ant and Maven versions compatible with Java 11

> git log --no-merges --oneline integration/COMMON-2019AUG..integration/java11 -- ARCHIVE
ed74d24f59 Changing pom versions to 2019-08-SNAPSHOT
98007be0cd (origin/bugfix/ICT-15901, origin/bugfix/ICT-15091) Replaces all el fields by e
052ebe5e5c (origin/feature/ICT-14774-archive-openjdk11) ICT-14774 added clearer logging to help when we need ot debug why the tests of other subsystems are not working
841c4fc801 ICT-14774 manually executed tat tests, but made sure they are disabled in jenkins builds as they are extremely unstable
941b866a77 ICT-14774 removed tests which have been moved from tat to junit
c9f1e39ea1 ICT-14774 simplified Database exception handling. Extended changed into Archive and BulkStore
f1f77f9125 ICT-14774 added more test coverage for the microarchive replacement and deprecated some scripts
2fa454a36c ICT-14892 updated poms -> 2019.06-java11-SNAPSHOT
8ba60d8ccc ICT-14774 corrected changes file markdiown
df1b0b4646 ICT-14774 updated changes file
aa40d1da43 ICT-14774 reduced the defect count of sonarqube analysis
2c390fa11d ICT-14774 groundwork - removing unused code, making unit tests work, removing the most egregious errors
ae17638899 ICT-14774 removed Tomcat5. It won't work with openjdk11
8addebd569 (origin/bugfix/ICT-14859) Updated templates and mappings for solve ICT-14859
8b905e13d8 (origin/bugfix/ICT-14629) ICT-14629: Changed jacorb-omgapi to 3.9 version. Changed anonymous elements from '_' to 'el'
a44f1cdf3b (origin/bugfix/ICT-14628) ICT-14628: Added jacorb acs parent to expose jacorb-omgapi-3.9

> git log --no-merges --oneline integration/COMMON-2019AUG..integration/java11 -- ICD
4037432b0f Fixed install target
046adf1d21 Fix for HLA/ASDM
ed74d24f59 Changing pom versions to 2019-08-SNAPSHOT
92b9d46aca (origin/bugfix/ICT-14892-java11-intbranch-pom-differentiation) ICT-14892 Updated the ICD/OBOPS poms to use 2019.06-java11-SNAPSHOT
9b348e083c ICT-14892 Updated the ICD/ADAPT poms to use 2019.06-java11-SNAPSHOT
2fa454a36c ICT-14892 updated poms -> 2019.06-java11-SNAPSHOT
48f463dcdc Move the ADAPT module into the groups
1880b153ea ICT-14667: replaced '_' by 'e' in cdb elements
279d38913a (origin/feature/ICT-14632) ICT-14632: Updated module to be compatible with Java 11 and Eclipse 4.11
3ab8623ef9 (origin/bugfix/ICT-14630) ICT-14630: Updated build target and source versions to 11, to be compatible with Java 11
a6d277103a First attempt at porting ICD/CORR
939c1611e4 ICT-14509 removed endorsed/xercesImpl from ASDM & APDM builds
1710d9c37f Changed the ant build file to allow code generation to work with OpenJDK-11 and ACS-2018OCT. This involved adding the fork="true" attribute for the oaw_workflow taskdef. This prevents the error message "java.lang.NoClassDefFoundError: jdk/internal/reflect/ConstructorAccessorImpl" from appearing. I've no idea why.
e16ebac9e6 Changed to ant build file to allow code generation to work with OpenJDK-11 and ACS-2018OCT. This involved adding the fork="true" attribute for the oaw_workflow taskdef. This prevents the error message "java.lang.NoClassDefFoundError: jdk/internal/reflect/ConstructorAccessorImpl" from appearing. I've no idea why.
c724e2138b Did the minimum necessary to make the ICD/HLA/Enumerations module build using OpenJDK-11 and ACS-2018OCT. There were two changes. 1. Add the fork="true" attribute for the oaw_workflow taskdef. This prevents the error message "java.lang.NoClassDefFoundError: jdk/internal/reflect/ConstructorAccessorImpl" from appearing. I've no idea why. Alexis suggested this change so perhaps he can explain it. 2. Remove the use of the xercesImpl.jar as it was in a lib/endorsed directory. In https://docs.oracle.com/javase/10/migrate its stated that the endorsed directory is no longer supported. I'm guessing the xerces package is not used as I did not need to move this jar file to another place.