Fix Issues in 0.9.0 RC1 Release Assemblies
- Unable to build *DB from source assembly due to:
o Git plugin requiring build from within Git clone
o License automation templates referenced hyracks sources (expected
co-location)
- Missing APLv2 license text from head of binary assembly LICENSE files
- Added license text to head of NCService conf files
- Exclude useless DEPENDENCIES from asterixdb source assembly
Change-Id: I1821416abb0387ee05b9add9f9c15798deed25e1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1452
Reviewed-by: Till Westmann <tillw@apache.org>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/hyracks-fullstack/hyracks-fullstack-license/pom.xml b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
index 7105a5f..03aa434 100644
--- a/hyracks-fullstack/hyracks-fullstack-license/pom.xml
+++ b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
@@ -50,16 +50,17 @@
</execution>
</executions>
<configuration>
- <templateRootDir>${basedir}</templateRootDir>
+ <templateRootDir>${basedir}/src/main/licenses/templates</templateRootDir>
<outputDir>${basedir}/..</outputDir>
<location>ignored</location>
<generatedFiles>
<generatedFile>
- <template>src/main/licenses/templates/hyracks-source-license.ftl</template>
+ <template>hyracks-source-license.ftl</template>
<outputFile>LICENSE</outputFile>
</generatedFile>
<generatedFile>
- <template>src/main/licenses/templates/asterix-notice.ftl</template>
+ <!-- TODO(mblow): share the template with asterixdb as a maven artifact -->
+ <template>asterix-notice.ftl</template>
<outputFile>NOTICE</outputFile>
</generatedFile>
</generatedFiles>
diff --git a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/asterix-notice.ftl b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/asterix-notice.ftl
index 61f732e..6b0570c 100644
--- a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/asterix-notice.ftl
+++ b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/asterix-notice.ftl
@@ -16,6 +16,7 @@
! specific language governing permissions and limitations
! under the License.
-->
+<#-- TODO(mblow): share notice file template with asterixdb via maven artifact -->
<#if packageName?has_content>
Apache AsterixDB ${packageName!}
<#else>
diff --git a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl
index 24a47c6..d142630 100644
--- a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl
+++ b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl
@@ -16,6 +16,10 @@
! specific language governing permissions and limitations
! under the License.
-->
+<#-- TODO(mblow): consume hyracks license via maven artifact
+ WARNING: THIS FILE MUST BE KEPT IN SYNC WITH COPY IN ASTERIXDB
+ (asterixdb/src/main/licenses/templates/hyracks-fullstack_source_licenses.ftl)
+-->
<#macro license files component="Hyracks admin console" location="${hyracksControlCcLocation!}"
filePrefix="${hyracksControlCcResourcesPrefix!}"
licenseName="the following license">