Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions hbase-connectors-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,11 @@
<phase>test</phase>
<goals>
<goal>build-classpath</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputFile>${project.parent.basedir}/target/cached_classpath.txt</outputFile>
<outputDirectory>${project.build.directory}/dependency</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -119,6 +121,8 @@
</supplementalModelArtifacts>
<supplementalModels>
<supplementalModel>supplemental-models.xml</supplementalModel>
<!-- extra supplement data model overridden by hbase-connector -->
<supplementalModel>src/main/resources/supplemental-models.xml</supplementalModel>
</supplementalModels>
</configuration>
</execution>
Expand Down Expand Up @@ -151,6 +155,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>${buildnumber.maven.version}</version>
</plugin>
<!-- /end building aggregation of NOTICE files -->
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,22 @@
</moduleSets>
<files>
<file>
<source>../LICENSE.txt</source>
<outputDirectory>${file.separator}</outputDirectory>
<source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>.</outputDirectory>
<destName>LICENSE.txt</destName>
<lineEnding>unix</lineEnding>
</file>
<file>
<source>../NOTICE.txt</source>
<outputDirectory>${file.separator}</outputDirectory>
<source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>.</outputDirectory>
<destName>NOTICE.txt</destName>
<lineEnding>unix</lineEnding>
</file>
<file>
<source>${basedir}/src/main/resources/META-INF/LEGAL</source>
<outputDirectory>.</outputDirectory>
<destName>LEGAL</destName>
<lineEnding>unix</lineEnding>
</file>
<file>
<source>../README.md</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
<!-- this file is an extra supplement data model other than hbase-resource-bundle -->
<!-- All of the below missing / ambiguous / full text license info verified at dependency source -->
<!-- Dual licensed dependencies-->
<supplement>
<project>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://github.com/javaee/activation/blob/master/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
</supplementalDataModels>
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@
<buildDate>${maven.build.timestamp}</buildDate>
<compileSource>1.8</compileSource>
<java.min.version>${compileSource}</java.min.version>
<!-- override on command line to have generated LICENSE files include
diagnostic info for verifying notice requirements -->
<license.debug.print.included>false</license.debug.print.included>
<license.bundles.dependencies>false</license.bundles.dependencies>
<license.bundles.logo>false</license.bundles.logo>
<license.bundles.bootstrap>false</license.bundles.bootstrap>
<license.bundles.jquery>false</license.bundles.jquery>
<buildnumber.maven.version>1.4</buildnumber.maven.version>

<maven.min.version>3.5.0</maven.min.version>
<hbase.version>2.4.9</hbase.version>
<exec.maven.version>1.6.0</exec.maven.version>
Expand Down Expand Up @@ -391,7 +400,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>${buildnumber.maven.version}</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down