You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org> on 2015/11/25 03:03:32 UTC
Change in asterixdb[release-0.8.8]: WIP: ASTERIXDB-1105 - LICENSE per submodule
Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/518
Change subject: WIP: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
WIP: ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
The only TODO here is to find out a nice way to include the
dependencies for our various javascript files, which of course
are not really understood as dependencies by maven.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-examples/pom.xml
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
29 files changed, 1,463 insertions(+), 126 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/1
diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/asterix-algebra/pom.xml b/asterix-algebra/pom.xml
index c08c640..4bcc139 100644
--- a/asterix-algebra/pom.xml
+++ b/asterix-algebra/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index 85c9336..94d23b0 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml
index 0224a51..9a2b855 100644
--- a/asterix-aql/pom.xml
+++ b/asterix-aql/pom.xml
@@ -33,6 +33,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<artifactId>asterix-aql</artifactId>
<build>
<plugins>
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index 39cb529..37ba94e 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements. See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License. You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied. See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-common</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -162,6 +166,11 @@
<configuration>
<includes>
<include>**/*.class</include>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ <include>DEPENDENCIES*</include>
</includes>
</configuration>
<executions>
diff --git a/asterix-doc/pom.xml b/asterix-doc/pom.xml
index 8f8ef5b..47e5330 100644
--- a/asterix-doc/pom.xml
+++ b/asterix-doc/pom.xml
@@ -35,6 +35,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<artifactId>asterix-doc</artifactId>
<build>
<plugins>
diff --git a/asterix-events/pom.xml b/asterix-events/pom.xml
index 6e63957..c141786 100644
--- a/asterix-events/pom.xml
+++ b/asterix-events/pom.xml
@@ -37,9 +37,9 @@
</license>
</licenses>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
</properties>
<build>
diff --git a/asterix-events/src/main/assembly/binary-assembly.xml b/asterix-events/src/main/assembly/binary-assembly.xml
index 022d8c9..65143c3 100644
--- a/asterix-events/src/main/assembly/binary-assembly.xml
+++ b/asterix-events/src/main/assembly/binary-assembly.xml
@@ -39,6 +39,11 @@
<outputDirectory>target</outputDirectory>
<includes>
<include>*.jar</include>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ <include>DEPENDENCIES*</include>
</includes>
</fileSet>
</fileSets>
diff --git a/asterix-examples/pom.xml b/asterix-examples/pom.xml
index e23c739..f933969 100644
--- a/asterix-examples/pom.xml
+++ b/asterix-examples/pom.xml
@@ -34,40 +34,9 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <id>admaql101-demo-binary-assembly</id>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>admaql101-demo</finalName>
- <descriptor>src/main/assembly/admaql101-demo-binary-assembly.xml</descriptor>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- <execution>
- <id>tweetbook-demo-binary-assembly</id>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>tweetbook-demo</finalName>
- <descriptor>src/main/assembly/tweetbook-demo-binary-assembly.xml</descriptor>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<packaging>pom</packaging>
</project>
diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml
index e9c23ea..ab04328 100644
--- a/asterix-external-data/pom.xml
+++ b/asterix-external-data/pom.xml
@@ -35,6 +35,10 @@
<artifactId>asterix-external-data</artifactId>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -76,6 +80,10 @@
<includes>
<include>**/*.class</include>
<include>**/*.txt</include>
+ <include>**/DISCLAIMER</include>
+ <include>**/NOTICE</include>
+ <include>**/LICENSE</include>
+ <include>**/DEPENDENCIES</include>
</includes>
</configuration>
<executions>
diff --git a/asterix-fuzzyjoin/pom.xml b/asterix-fuzzyjoin/pom.xml
index 39afd1c..df71e78 100644
--- a/asterix-fuzzyjoin/pom.xml
+++ b/asterix-fuzzyjoin/pom.xml
@@ -36,6 +36,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -64,6 +68,15 @@
</executions>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/*.txt</include>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
</configuration>
</plugin>
</plugins>
diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml
index 0be54d9..50a45de 100644
--- a/asterix-installer/pom.xml
+++ b/asterix-installer/pom.xml
@@ -28,6 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
</properties>
<licenses>
diff --git a/asterix-installer/src/main/assembly/binary-assembly.xml b/asterix-installer/src/main/assembly/binary-assembly.xml
index d25281e..564a85e 100644
--- a/asterix-installer/src/main/assembly/binary-assembly.xml
+++ b/asterix-installer/src/main/assembly/binary-assembly.xml
@@ -70,6 +70,16 @@
</includes>
</fileSet>
<fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../asterix-events/src/main/resources/events</directory>
<outputDirectory>.installer/events</outputDirectory>
<fileMode>0755</fileMode>
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
index fafa1d2..f50c9e0 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
@@ -29,6 +29,10 @@
<packaging>maven-plugin</packaging>
<name>lexer-generator-maven-plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-maven-plugins/pom.xml b/asterix-maven-plugins/pom.xml
index f896cf3..a2a6589 100644
--- a/asterix-maven-plugins/pom.xml
+++ b/asterix-maven-plugins/pom.xml
@@ -31,6 +31,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<parent>
<artifactId>asterix</artifactId>
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
index 15074e0..875a6e9 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
@@ -29,6 +29,10 @@
<packaging>maven-plugin</packaging>
<name>record-manager-generator-maven-plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-metadata/pom.xml b/asterix-metadata/pom.xml
index 8149c5b..1877a16 100644
--- a/asterix-metadata/pom.xml
+++ b/asterix-metadata/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements. See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License. You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied. See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-metadata</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -92,11 +96,10 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-rtree</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-hdfs-core</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-core</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/asterix-om/pom.xml b/asterix-om/pom.xml
index 85a6928..bd8f55b 100644
--- a/asterix-om/pom.xml
+++ b/asterix-om/pom.xml
@@ -49,6 +49,10 @@
</plugins>
</build>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.asterix</groupId>
diff --git a/asterix-runtime/pom.xml b/asterix-runtime/pom.xml
index 4fb1b8b..1591b06 100644
--- a/asterix-runtime/pom.xml
+++ b/asterix-runtime/pom.xml
@@ -35,6 +35,10 @@
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-server/pom.xml b/asterix-server/pom.xml
index 45a1cc9..d5e1ff5 100644
--- a/asterix-server/pom.xml
+++ b/asterix-server/pom.xml
@@ -35,6 +35,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-server/src/main/assembly/binary-assembly.xml b/asterix-server/src/main/assembly/binary-assembly.xml
index d5f50a9..6aab0cf 100644
--- a/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterix-server/src/main/assembly/binary-assembly.xml
@@ -25,6 +25,17 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>target/appassembler/repo</directory>
<outputDirectory>repo</outputDirectory>
</fileSet>
@@ -37,8 +48,8 @@
<directory>target/generated-resources/appassembler/booter-windows/etc</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>asterixcc.xml</include>
- <include>asterixnc.xml</include>
+ <include>asterixcc.xml</include>
+ <include>asterixnc.xml</include>
</includes>
</fileSet>
diff --git a/asterix-test-framework/pom.xml b/asterix-test-framework/pom.xml
index 7bbbacb..94c3eeb 100644
--- a/asterix-test-framework/pom.xml
+++ b/asterix-test-framework/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-tools/pom.xml b/asterix-tools/pom.xml
index be3efce..f5101ff 100644
--- a/asterix-tools/pom.xml
+++ b/asterix-tools/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements. See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License. You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied. See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-tools</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -45,30 +49,6 @@
<target>1.7</target>
<fork>true</fork>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>aqlclient</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <classifier>aqlclient</classifier>
- <archive>
- <manifest>
- <MainClass>org.apache.asterix.tools.aqlclient.AqlClient</MainClass>
- </manifest>
- </archive>
- <includes>
- <include>**/uci/ics/asterix/tools/aqlclient/*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/asterix-transactions/pom.xml b/asterix-transactions/pom.xml
index 3afeac3..ea4179c 100644
--- a/asterix-transactions/pom.xml
+++ b/asterix-transactions/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-yarn/pom.xml b/asterix-yarn/pom.xml
index ad09e7f..bd433f6 100644
--- a/asterix-yarn/pom.xml
+++ b/asterix-yarn/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements. See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License. You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied. See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -24,6 +24,10 @@
<version>0.8.8-SNAPSHOT</version>
</parent>
<artifactId>asterix-yarn</artifactId>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -55,6 +59,11 @@
</archive>
<includes>
<include>**/uci/ics/asterix/tools/aoya/*</include>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
</includes>
</configuration>
</execution>
@@ -151,25 +160,25 @@
<version>0.8.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>0.8.8-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-common</artifactId>
+ <version>0.8.8-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -196,7 +205,6 @@
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
diff --git a/asterix-yarn/src/main/assembly/binary-assembly.xml b/asterix-yarn/src/main/assembly/binary-assembly.xml
index f7106f0..9905c7d 100644
--- a/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ b/asterix-yarn/src/main/assembly/binary-assembly.xml
@@ -17,13 +17,23 @@
! under the License.
!-->
<assembly>
- <id>binary-assembly</id>
- <formats>
+ <id>binary-assembly</id>
+ <formats>
<format>dir</format>
<format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>src/main/resources/scripts</directory>
<fileMode>0755</fileMode>
@@ -64,7 +74,7 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- </fileSets>
+ </fileSets>
<dependencySets>
<dependencySet>
<includes>
diff --git a/pom.xml b/pom.xml
index c9e26dd..5f70e8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jvm.extraargs />
<runSlowAQLTests>false</runSlowAQLTests>
+ <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
<!-- Definition of tests in various categories which may be excluded -->
<optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests>
@@ -168,6 +169,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <appendedResourcesDirectory>${appendedResourcesDirectory}</appendedResourcesDirectory>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/src/main/appended-resources/supplemental-models.xml b/src/main/appended-resources/supplemental-models.xml
new file mode 100644
index 0000000..d1ee598
--- /dev/null
+++ b/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1,1225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <name>Sun JAXB Reference Implementation Tools</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <name>Sun SAAJ Reference Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <name>Sun SAAJ API</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <name>Neethi</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <name>Java API for XML-Based Web Services (JAX-WS API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <name>Apache Xalan-Java</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <name>StAX Utilities</name>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <name>Apache WSS4J</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <name>JDOM</name>
+ <organization>
+ <name>jdom.org</name>
+ <url>http://www.jdom.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Modified Apache Software License</name>
+ <url>licenses/jdom.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <name>XML Security</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <name>XML APIs</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <name>Bouncy Castle Crypto APIs for Java</name>
+ <organization>
+ <name>The Legion of the Bouncy Castle</name>
+ <url>http://www.bouncycastle.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Bouncy Castle License</name>
+ <url>http://www.bouncycastle.org/licence.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <name>Apache Ant</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <name>Apache Ant (nodeps)</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <name>Jettison</name>
+ <organization>
+ <name>Envoi Solutions LLC</name>
+ <url>http://www.envoisolutions.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://jettison.codehaus.org/License</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <name>Apache Commons Codec</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <name>Apache Commons Collections</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <name>Apache Commons DBCP</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <name>Apache Commons JEXL</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <name>Apache Commons Logging</name>
+ <url>http://commons.apache.org/logging</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <name>Apache Commons Logging Api</name>
+ <url>http://commons.apache.org/logging</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <name>Apache Commons Pool</name>
+ <url>http://commons.apache.org/pool</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <name>Apache Commons VFS</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <name>Apache Commons Codec</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <name>Apache Aries Blueprint</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <name>ActiveMQ :: Core</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <name>Camel :: Core</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-classloader</artifactId>
+ <name>XBean :: Classloader</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <name>XBean :: Classpath Resource Finder</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ <name>XBean :: Naming</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <name>XBean :: Reflect</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <name>XBean :: Spring</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <name>SLF4J API Module</name>
+ <organization>
+ <name>QOS.ch</name>
+ <url>http://www.qos.ch</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>MIT style</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <name>SLF4J JDK14 Binding</name>
+ <organization>
+ <name>QOS.ch</name>
+ <url>http://www.qos.ch</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>MIT style</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <name>Log4j</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <name>Apache Geronimo TxManager :: Connector</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <name>Apache Geronimo TxManager :: Transaction</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <name>Spring OSGi Core</name>
+ <url>http://www.springframework.org/osgi/</url>
+ <organization>
+ <name>Spring Framework</name>
+ <url>http://www.springframework.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <name>Spring OSGi Extender</name>
+ <url>http://www.springframework.org/osgi/</url>
+ <organization>
+ <name>Spring Framework</name>
+ <url>http://www.springframework.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <name>Spring OSGi IO</name>
+ <url>http://www.springframework.org/osgi/</url>
+ <organization>
+ <name>Spring Framework</name>
+ <url>http://www.springframework.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <name>Spring OSGi Annotations</name>
+ <url>http://www.springframework.org/osgi/</url>
+ <organization>
+ <name>Spring Framework</name>
+ <url>http://www.springframework.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ <name>Howl Logger</name>
+ <url>http://howl.objectweb.org/</url>
+ <organization>
+ <name>ObjectWeb</name>
+ <url>http://www.objectweb.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The BSD License</name>
+ <url>http://howl.objectweb.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <name>Plexus Classworlds</name>
+ <url>http://plexus.codehaus.org/plexus-classworlds/</url>
+ <organization>
+ <name>Codehaus</name>
+ <url>http://www.codehaus.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <name>XStream Core</name>
+ <url>http://xstream.codehaus.org/</url>
+ <organization>
+ <name>Codehaus</name>
+ <url>http://www.codehaus.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The BSD License</name>
+ <url>http://xstream.codehaus.com/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <name>Apache ServiceMix Specs :: Activation 1.1</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <name>Apache Geronimo Specs :: J2EE Connector 1.5</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <name>Apache Geronimo Specs :: J2EE Management 1.1</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <name>Apache Geronimo Specs :: JavaMail 1.4</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <name>Apache Geronimo Specs :: JMS 1.1</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <name>Apache Geronimo Specs :: JTA 1.1</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <name>Apache Geronimo Specs :: SAAJ 1.3</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <name>Apache Geronimo Specs :: Servlet 2.5</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <name>Apache Geronimo Specs :: Stax API 1.0</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <name>JLine</name>
+ <url>http://jline.sourceforge.net</url>
+ <organization>
+ <name>JLine</name>
+ <url>http://jline.sourceforge.net</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The BSD License</name>
+ <url>http://jline.sourceforge.net/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <name>Jetty Server</name>
+ <url>http://jetty.mortbay.org/</url>
+ <organization>
+ <name>Mort Bay Consulting</name>
+ <url>http://www.mortbay.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <name>Jetty Utilities</name>
+ <url>http://jetty.mortbay.org/</url>
+ <organization>
+ <name>Mort Bay Consulting</name>
+ <url>http://www.mortbay.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-lang</artifactId>
+ <name>OPS4J Base - Lang</name>
+ <url>http://www.ops4j.org/projects/base/ops4j-base-lang</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-util-collections</artifactId>
+ <name>OPS4J Base - Util - Collections</name>
+ <url>http://www.ops4j.org/projects/base/ops4j-base-util-collections</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-util-xml</artifactId>
+ <name>OPS4J Base - Util - XML</name>
+ <url>http://www.ops4j.org/projects/base/ops4j-base-util-xml</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <name>OPS4J - Pax Logging API</name>
+ <url>http://www.ops4j.org/projects/pax/logging/pax-logging-api</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <name>OPS4J - Pax Logging Service</name>
+ <url>http://www.ops4j.org/projects/pax/logging/pax-logging-service</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <name>OPS4J Pax Url - mvn:</name>
+ <url>http://www.ops4j.org/projects/pax/url/pax-url-mvn</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-war</artifactId>
+ <name>OPS4J Pax Url - war:</name>
+ <url>http://www.ops4j.org/projects/pax/url/pax-url-war</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-bundle</artifactId>
+ <name>OPS4J Pax Web - Web Container</name>
+ <url>http://www.ops4j.org/projects/pax/web/pax-web-bundle</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jsp</artifactId>
+ <name>OPS4J Pax Web - JSP</name>
+ <url>http://www.ops4j.org/projects/pax/web/pax-web-jsp</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.web-extender</groupId>
+ <artifactId>pax-web-ex-war</artifactId>
+ <name>OPS4J Pax Web Extender - WAR</name>
+ <url>http://www.ops4j.org/projects/pax/web-extender/pax-web-ex-war</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.ops4j.pax.web-extender</groupId>
+ <artifactId>pax-web-ex-whiteboard</artifactId>
+ <name>OPS4J Pax Web Extender - Whiteboard</name>
+ <url>http://www.ops4j.org/projects/pax/web-extender/pax-web-ex-whiteboard</url>
+ <organization>
+ <name>OPS4J - Open Participation Software for Java</name>
+ <url>http://www.ops4j.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.impl.bundle.jmx</artifactId>
+ <name>JMX management for OSGi (RI snapshot)</name>
+ <organization>
+ <name>OSGi Alliance</name>
+ <url>http://www.osgi.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <name>jansi</name>
+ <organization>
+ <name>FUSE Source</name>
+ <url>http://www.fusesource.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <name>Equinox Framework</name>
+ <organization>
+ <name>Eclipse Foundation</name>
+ <url>http://www.eclipse.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Eclipse Public License, Version 1.0</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ <name>XML Pull Parsing API</name>
+ <organization>
+ <name>Eclipse Foundation</name>
+ <url>http://www.eclipse.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Public Domain</name>
+ <url>http://www.xmlpull.org/v1/download/unpacked/LICENSE.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <name>XML Pull Parsing API</name>
+ <organization>
+ <name>AOP Alliance</name>
+ <url>http://aopalliance.sourceforge.net/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Public Domain</name>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+</supplementalDataModels>
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
index 23bd1cb..f179a2e 100644
--- a/src/main/assembly/source.xml
+++ b/src/main/assembly/source.xml
@@ -63,5 +63,12 @@
<exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5: -Verified
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/511/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/518
to look at the new patch set (#4).
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Also fix AsterixEventServiceUtil to not die when
the asterix-server bundle has files in the root of
the archive.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterix-examples/pom.xml
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
36 files changed, 1,179 insertions(+), 126 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/4
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 6: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/520/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 3: Verified-1
Build Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/459/ : ABORTED
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: WIP: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: WIP: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 1: Verified-1
Build Unstable
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/457/ : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/510/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: WIP: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: WIP: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 1: -Verified
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/457/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 4:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/460/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 3:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/459/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5: -Code-Review
(6 comments)
Sorry, only looked at the change between the last 2 patch sets before.
However, checking the created artifact one more time I found that we're missing DISCLAIMER, LICENSE, and NOTICE in a number of jars.
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-common/pom.xml
File asterix-common/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
Can we remove those tabs again?
Line 173: <include>DEPENDENCIES*</include>
Somehow this doesn't seem to do the right thing. We're missing DISCLAIMER, LICENSE, and NOTICE in asterix-common-0.8.8-SNAPSHOT-tests.jar and asterix-common-0.8.8-SNAPSHOT.jar (and also in asterix-fuzzyjoin-0.8.8-SNAPSHOT-tests.jar, asterix-fuzzyjoin-0.8.8-SNAPSHOT.jar, asterix-tools-0.8.8-SNAPSHOT-binary-assembly.jar, asterix-yarn-0.8.8-SNAPSHOT-aoya.jar)
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-events/pom.xml
File asterix-events/pom.xml:
Line 41: <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
One space too many (in addition to the ugly tabs - but that's a separate problem).
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-metadata/pom.xml
File asterix-metadata/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
Tabs
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-tools/pom.xml
File asterix-tools/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
Tabs
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-yarn/pom.xml
File asterix-yarn/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
Tabs
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: Yes
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 2: Verified-1
Build Unstable
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/458/ : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/511/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 6:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/520/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: WIP: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: WIP: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/552/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/518
to look at the new patch set (#6).
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Also fix AsterixEventServiceUtil to not die when
the asterix-server bundle has files in the root of
the archive.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterix-examples/pom.xml
A asterix-examples/src/main/appended-resources/META-INF/LICENSE
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
37 files changed, 1,127 insertions(+), 168 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/6
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/518
to look at the new patch set (#2).
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-examples/pom.xml
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
35 files changed, 1,172 insertions(+), 126 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/458/
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 4: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/460/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5:
(6 comments)
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-common/pom.xml
File asterix-common/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
> Can we remove those tabs again?
Done
Line 173: <include>DEPENDENCIES*</include>
> Somehow this doesn't seem to do the right thing. We're missing DISCLAIMER,
Done
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-events/pom.xml
File asterix-events/pom.xml:
Line 41: <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> One space too many (in addition to the ugly tabs - but that's a separate pr
Done
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-metadata/pom.xml
File asterix-metadata/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
> Tabs
Done
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-tools/pom.xml
File asterix-tools/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
> Tabs
Done
https://asterix-gerrit.ics.uci.edu/#/c/518/5/asterix-yarn/pom.xml
File asterix-yarn/pom.xml:
Line 3: ! or more contributor license agreements. See the NOTICE file
> Tabs
Done
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: Yes
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has submitted this change and it was merged.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Also fix AsterixEventServiceUtil to not die when
the asterix-server bundle has files in the root of
the archive.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Reviewed-on: https://asterix-gerrit.ics.uci.edu/518
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterix-examples/pom.xml
A asterix-examples/src/main/appended-resources/META-INF/LICENSE
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
37 files changed, 1,127 insertions(+), 168 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified
diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/asterix-algebra/pom.xml b/asterix-algebra/pom.xml
index c08c640..4bcc139 100644
--- a/asterix-algebra/pom.xml
+++ b/asterix-algebra/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index 85c9336..46ee7b0 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterix-app/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..420a1a3
--- /dev/null
+++ b/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,31 @@
+-----------------------------------------------------------------------
+
+ASTERIXDB COMPONENTS:
+
+AsterixDB includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for these
+subcomponents is subject to the terms and condition of the following
+licenses.
+
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+ - jQuery
+ - Bootstrap
+ - Smoothie Charts
+ - Bottle
+ - geostats
+
+The text of The MIT License is below for convenience. Refer to the website of each project for exact details.
+
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/asterix-app/src/main/appended-resources/supplemental-models.xml b/asterix-app/src/main/appended-resources/supplemental-models.xml
new file mode 120000
index 0000000..a3e53f9
--- /dev/null
+++ b/asterix-app/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1 @@
+../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml
index 0224a51..9a2b855 100644
--- a/asterix-aql/pom.xml
+++ b/asterix-aql/pom.xml
@@ -33,6 +33,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<artifactId>asterix-aql</artifactId>
<build>
<plugins>
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index 39cb529..0b87211 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -1,18 +1,18 @@
-<!--
+<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements. See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License. You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied. See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-common</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -162,6 +166,11 @@
<configuration>
<includes>
<include>**/*.class</include>
+ <include>**/README*</include>
+ <include>**/DISCLAIMER*</include>
+ <include>**/NOTICE*</include>
+ <include>**/LICENSE*</include>
+ <include>**/DEPENDENCIES*</include>
</includes>
</configuration>
<executions>
diff --git a/asterix-doc/pom.xml b/asterix-doc/pom.xml
index 8f8ef5b..47e5330 100644
--- a/asterix-doc/pom.xml
+++ b/asterix-doc/pom.xml
@@ -35,6 +35,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<artifactId>asterix-doc</artifactId>
<build>
<plugins>
diff --git a/asterix-events/pom.xml b/asterix-events/pom.xml
index 6e63957..a1f2bb9 100644
--- a/asterix-events/pom.xml
+++ b/asterix-events/pom.xml
@@ -37,9 +37,9 @@
</license>
</licenses>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
</properties>
<build>
diff --git a/asterix-events/src/main/assembly/binary-assembly.xml b/asterix-events/src/main/assembly/binary-assembly.xml
index 022d8c9..65143c3 100644
--- a/asterix-events/src/main/assembly/binary-assembly.xml
+++ b/asterix-events/src/main/assembly/binary-assembly.xml
@@ -39,6 +39,11 @@
<outputDirectory>target</outputDirectory>
<includes>
<include>*.jar</include>
+ <include>README*</include>
+ <include>DISCLAIMER*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ <include>DEPENDENCIES*</include>
</includes>
</fileSet>
</fileSets>
diff --git a/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java b/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
index 06b0f9a..648ef94 100644
--- a/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
+++ b/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
@@ -362,6 +362,7 @@
ZipEntry entry = null;
int BUFFER_SIZE = 4096;
+ createDir(destDir);
while ((entry = zis.getNextEntry()) != null) {
String dst = destDir + File.separator + entry.getName();
if (entry.isDirectory()) {
@@ -471,6 +472,11 @@
newDirs.mkdirs();
}
+ private static void createDir(String destDirectory) {
+ File newDirs = new File(destDirectory + File.separator);
+ newDirs.mkdirs();
+ }
+
public static AsterixInstance validateAsterixInstanceExists(String name, State... permissibleStates)
throws Exception {
AsterixInstance instance = ServiceProvider.INSTANCE.getLookupService().getAsterixInstance(name);
diff --git a/asterix-examples/pom.xml b/asterix-examples/pom.xml
index e23c739..f933969 100644
--- a/asterix-examples/pom.xml
+++ b/asterix-examples/pom.xml
@@ -34,40 +34,9 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <id>admaql101-demo-binary-assembly</id>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>admaql101-demo</finalName>
- <descriptor>src/main/assembly/admaql101-demo-binary-assembly.xml</descriptor>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- <execution>
- <id>tweetbook-demo-binary-assembly</id>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>tweetbook-demo</finalName>
- <descriptor>src/main/assembly/tweetbook-demo-binary-assembly.xml</descriptor>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<packaging>pom</packaging>
</project>
diff --git a/asterix-examples/src/main/appended-resources/META-INF/LICENSE b/asterix-examples/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..420a1a3
--- /dev/null
+++ b/asterix-examples/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,31 @@
+-----------------------------------------------------------------------
+
+ASTERIXDB COMPONENTS:
+
+AsterixDB includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for these
+subcomponents is subject to the terms and condition of the following
+licenses.
+
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+ - jQuery
+ - Bootstrap
+ - Smoothie Charts
+ - Bottle
+ - geostats
+
+The text of The MIT License is below for convenience. Refer to the website of each project for exact details.
+
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml
index e9c23ea..ab04328 100644
--- a/asterix-external-data/pom.xml
+++ b/asterix-external-data/pom.xml
@@ -35,6 +35,10 @@
<artifactId>asterix-external-data</artifactId>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -76,6 +80,10 @@
<includes>
<include>**/*.class</include>
<include>**/*.txt</include>
+ <include>**/DISCLAIMER</include>
+ <include>**/NOTICE</include>
+ <include>**/LICENSE</include>
+ <include>**/DEPENDENCIES</include>
</includes>
</configuration>
<executions>
diff --git a/asterix-fuzzyjoin/pom.xml b/asterix-fuzzyjoin/pom.xml
index 39afd1c..1f7ded2 100644
--- a/asterix-fuzzyjoin/pom.xml
+++ b/asterix-fuzzyjoin/pom.xml
@@ -36,6 +36,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -64,6 +68,15 @@
</executions>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/*.txt</include>
+ <include>**/README*</include>
+ <include>**/DISCLAIMER*</include>
+ <include>**/NOTICE*</include>
+ <include>**/LICENSE*</include>
+ <include>**/DEPENDENCIES*</include>
+ </includes>
</configuration>
</plugin>
</plugins>
diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml
index 0be54d9..90aca08 100644
--- a/asterix-installer/pom.xml
+++ b/asterix-installer/pom.xml
@@ -28,6 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
+ <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
</properties>
<licenses>
diff --git a/asterix-installer/src/main/appended-resources/META-INF/LICENSE b/asterix-installer/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..420a1a3
--- /dev/null
+++ b/asterix-installer/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,31 @@
+-----------------------------------------------------------------------
+
+ASTERIXDB COMPONENTS:
+
+AsterixDB includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for these
+subcomponents is subject to the terms and condition of the following
+licenses.
+
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+ - jQuery
+ - Bootstrap
+ - Smoothie Charts
+ - Bottle
+ - geostats
+
+The text of The MIT License is below for convenience. Refer to the website of each project for exact details.
+
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/asterix-installer/src/main/appended-resources/supplemental-models.xml b/asterix-installer/src/main/appended-resources/supplemental-models.xml
new file mode 120000
index 0000000..a3e53f9
--- /dev/null
+++ b/asterix-installer/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1 @@
+../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
diff --git a/asterix-installer/src/main/assembly/binary-assembly.xml b/asterix-installer/src/main/assembly/binary-assembly.xml
index d25281e..564a85e 100644
--- a/asterix-installer/src/main/assembly/binary-assembly.xml
+++ b/asterix-installer/src/main/assembly/binary-assembly.xml
@@ -70,6 +70,16 @@
</includes>
</fileSet>
<fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../asterix-events/src/main/resources/events</directory>
<outputDirectory>.installer/events</outputDirectory>
<fileMode>0755</fileMode>
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
index fafa1d2..f50c9e0 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
@@ -29,6 +29,10 @@
<packaging>maven-plugin</packaging>
<name>lexer-generator-maven-plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-maven-plugins/pom.xml b/asterix-maven-plugins/pom.xml
index f896cf3..a2a6589 100644
--- a/asterix-maven-plugins/pom.xml
+++ b/asterix-maven-plugins/pom.xml
@@ -31,6 +31,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<parent>
<artifactId>asterix</artifactId>
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
index 15074e0..875a6e9 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
@@ -29,6 +29,10 @@
<packaging>maven-plugin</packaging>
<name>record-manager-generator-maven-plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-metadata/pom.xml b/asterix-metadata/pom.xml
index 8149c5b..438cb6e 100644
--- a/asterix-metadata/pom.xml
+++ b/asterix-metadata/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements.See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License.You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied.See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-metadata</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -92,11 +96,10 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-rtree</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-hdfs-core</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-core</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/asterix-om/pom.xml b/asterix-om/pom.xml
index 85a6928..bd8f55b 100644
--- a/asterix-om/pom.xml
+++ b/asterix-om/pom.xml
@@ -49,6 +49,10 @@
</plugins>
</build>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.asterix</groupId>
diff --git a/asterix-runtime/pom.xml b/asterix-runtime/pom.xml
index 4fb1b8b..1591b06 100644
--- a/asterix-runtime/pom.xml
+++ b/asterix-runtime/pom.xml
@@ -35,6 +35,10 @@
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-server/pom.xml b/asterix-server/pom.xml
index 45a1cc9..d5e1ff5 100644
--- a/asterix-server/pom.xml
+++ b/asterix-server/pom.xml
@@ -35,6 +35,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-server/src/main/assembly/binary-assembly.xml b/asterix-server/src/main/assembly/binary-assembly.xml
index d5f50a9..6aab0cf 100644
--- a/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterix-server/src/main/assembly/binary-assembly.xml
@@ -25,6 +25,17 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>target/appassembler/repo</directory>
<outputDirectory>repo</outputDirectory>
</fileSet>
@@ -37,8 +48,8 @@
<directory>target/generated-resources/appassembler/booter-windows/etc</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>asterixcc.xml</include>
- <include>asterixnc.xml</include>
+ <include>asterixcc.xml</include>
+ <include>asterixnc.xml</include>
</includes>
</fileSet>
diff --git a/asterix-test-framework/pom.xml b/asterix-test-framework/pom.xml
index 7bbbacb..94c3eeb 100644
--- a/asterix-test-framework/pom.xml
+++ b/asterix-test-framework/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-tools/pom.xml b/asterix-tools/pom.xml
index be3efce..cfe1aef 100644
--- a/asterix-tools/pom.xml
+++ b/asterix-tools/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements.See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License.You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ ! 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
+ ! KIND, either express or implied.See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -25,14 +25,18 @@
</parent>
<artifactId>asterix-tools</artifactId>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -47,72 +51,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
- <executions>
- <execution>
- <id>aqlclient</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <classifier>aqlclient</classifier>
- <archive>
- <manifest>
- <MainClass>org.apache.asterix.tools.aqlclient.AqlClient</MainClass>
- </manifest>
- </archive>
- <includes>
- <include>**/uci/ics/asterix/tools/aqlclient/*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
- <mainClass>org.apache.asterix.tools.TblToAdm</mainClass>
- <name>tbl2adm</name>
- </program>
- <program>
- <mainClass>org.apache.asterix.tools.datagen.AdgClientDriver</mainClass>
- <name>adg</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/README*</include>
+ <include>**/DISCLAIMER*</include>
+ <include>**/NOTICE*</include>
+ <include>**/LICENSE*</include>
+ <include>**/DEPENDENCIES*</include>
+ </includes>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/asterix-transactions/pom.xml b/asterix-transactions/pom.xml
index 3afeac3..ea4179c 100644
--- a/asterix-transactions/pom.xml
+++ b/asterix-transactions/pom.xml
@@ -34,6 +34,10 @@
</license>
</licenses>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/asterix-yarn/pom.xml b/asterix-yarn/pom.xml
index ad09e7f..ee6c203 100644
--- a/asterix-yarn/pom.xml
+++ b/asterix-yarn/pom.xml
@@ -1,18 +1,18 @@
<!--
! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
+ ! or more contributor license agreements.See the NOTICE file
! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
+ ! 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
+ ! with the License.You may obtain a copy of the License at
!
- ! http://www.apache.org/licenses/LICENSE-2.0
+ !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
+ ! KIND, either express or implied.See the License for the
! specific language governing permissions and limitations
! under the License.
!-->
@@ -24,6 +24,10 @@
<version>0.8.8-SNAPSHOT</version>
</parent>
<artifactId>asterix-yarn</artifactId>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
@@ -54,7 +58,12 @@
</manifest>
</archive>
<includes>
- <include>**/uci/ics/asterix/tools/aoya/*</include>
+ <include>**/org/apache/asterix/aoya/*</include>
+ <include>**/README*</include>
+ <include>**/DISCLAIMER*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/DEPENDENCIES*</include>
</includes>
</configuration>
</execution>
@@ -151,25 +160,25 @@
<version>0.8.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>0.8.8-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-common</artifactId>
+ <version>0.8.8-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -196,7 +205,6 @@
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
diff --git a/asterix-yarn/src/main/appended-resources/META-INF/LICENSE b/asterix-yarn/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..420a1a3
--- /dev/null
+++ b/asterix-yarn/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,31 @@
+-----------------------------------------------------------------------
+
+ASTERIXDB COMPONENTS:
+
+AsterixDB includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for these
+subcomponents is subject to the terms and condition of the following
+licenses.
+
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+ - jQuery
+ - Bootstrap
+ - Smoothie Charts
+ - Bottle
+ - geostats
+
+The text of The MIT License is below for convenience. Refer to the website of each project for exact details.
+
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/asterix-yarn/src/main/appended-resources/supplemental-models.xml b/asterix-yarn/src/main/appended-resources/supplemental-models.xml
new file mode 120000
index 0000000..a3e53f9
--- /dev/null
+++ b/asterix-yarn/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1 @@
+../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
diff --git a/asterix-yarn/src/main/assembly/binary-assembly.xml b/asterix-yarn/src/main/assembly/binary-assembly.xml
index f7106f0..9905c7d 100644
--- a/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ b/asterix-yarn/src/main/assembly/binary-assembly.xml
@@ -17,13 +17,23 @@
! under the License.
!-->
<assembly>
- <id>binary-assembly</id>
- <formats>
+ <id>binary-assembly</id>
+ <formats>
<format>dir</format>
<format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>src/main/resources/scripts</directory>
<fileMode>0755</fileMode>
@@ -64,7 +74,7 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- </fileSets>
+ </fileSets>
<dependencySets>
<dependencySet>
<includes>
diff --git a/pom.xml b/pom.xml
index c9e26dd..546ccf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jvm.extraargs />
<runSlowAQLTests>false</runSlowAQLTests>
+ <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
<!-- Definition of tests in various categories which may be excluded -->
<optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests>
@@ -168,6 +169,36 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <appendedResourcesDirectory>${appendedResourcesDirectory}</appendedResourcesDirectory>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/src/main/appended-resources/supplemental-models.xml b/src/main/appended-resources/supplemental-models.xml
new file mode 100644
index 0000000..1ebd3f2
--- /dev/null
+++ b/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1,742 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <name>Sun JAXB Reference Implementation Tools</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <name>Sun SAAJ Reference Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <name>Sun SAAJ API</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <name>Neethi</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <name>Java API for XML-Based Web Services (JAX-WS API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <name>Apache Xalan-Java</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <name>StAX Utilities</name>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <name>Apache WSS4J</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <name>JDOM</name>
+ <organization>
+ <name>jdom.org</name>
+ <url>http://www.jdom.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Modified Apache Software License</name>
+ <url>licenses/jdom.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <name>XML Security</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <name>XML APIs</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <name>Apache Ant</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <name>Apache Ant (nodeps)</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <name>Jettison</name>
+ <organization>
+ <name>Envoi Solutions LLC</name>
+ <url>http://www.envoisolutions.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://jettison.codehaus.org/License</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <name>Apache Commons Codec</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <name>Apache Commons Collections</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <name>Apache Commons BeanUtils</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <name>Apache Commons JEXL</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <name>Apache Commons Logging</name>
+ <url>http://commons.apache.org/logging</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <name>Apache Commons Logging Api</name>
+ <url>http://commons.apache.org/logging</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <name>Apache Commons Pool</name>
+ <url>http://commons.apache.org/pool</url>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <name>Apache Commons VFS</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <name>Apache Commons Codec</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <name>Apache Aries Blueprint</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <name>ActiveMQ :: Core</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <name>Camel :: Core</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-classloader</artifactId>
+ <name>XBean :: Classloader</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <name>SLF4J API Module</name>
+ <organization>
+ <name>QOS.ch</name>
+ <url>http://www.qos.ch</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>MIT style</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <name>SLF4J JDK14 Binding</name>
+ <organization>
+ <name>QOS.ch</name>
+ <url>http://www.qos.ch</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>MIT style</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <name>Log4j</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <name>Plexus Classworlds</name>
+ <url>http://plexus.codehaus.org/plexus-classworlds/</url>
+ <organization>
+ <name>Codehaus</name>
+ <url>http://www.codehaus.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <name>JLine</name>
+ <url>http://jline.sourceforge.net</url>
+ <organization>
+ <name>JLine</name>
+ <url>http://jline.sourceforge.net</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The BSD License</name>
+ <url>http://jline.sourceforge.net/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <name>Jetty Server</name>
+ <url>http://jetty.mortbay.org/</url>
+ <organization>
+ <name>Mort Bay Consulting</name>
+ <url>http://www.mortbay.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <name>Jetty Utilities</name>
+ <url>http://jetty.mortbay.org/</url>
+ <organization>
+ <name>Mort Bay Consulting</name>
+ <url>http://www.mortbay.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <name>XML Pull Parsing API</name>
+ <organization>
+ <name>AOP Alliance</name>
+ <url>http://aopalliance.sourceforge.net/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Public Domain</name>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <name>Java Servlet API</name>
+ <organization>
+ <name>Oracle Corporation</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <name>Java Servlet API</name>
+ <organization>
+ <name>Oracle Corporation</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <name>Java Transaction API</name>
+ <organization>
+ <name>Oracle Corporation</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <licenses>
+ <license>
+ <name>MIT style</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <name>ROME</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <name>Jakarta ORO</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+</supplementalDataModels>
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
index 23bd1cb..f179a2e 100644
--- a/src/main/assembly/source.xml
+++ b/src/main/assembly/source.xml
@@ -63,5 +63,12 @@
<exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 7
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/518
to look at the new patch set (#5).
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Also fix AsterixEventServiceUtil to not die when
the asterix-server bundle has files in the root of
the archive.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterix-examples/pom.xml
A asterix-examples/src/main/appended-resources/META-INF/LICENSE
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
37 files changed, 1,114 insertions(+), 126 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/5
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5:
Hmm, OK let me have a second look then.
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5: Verified-1
Build Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-topic/510/ : ABORTED
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/518
to look at the new patch set (#3).
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
ASTERIXDB-1105 - LICENSE per submodule
This is a good part of what we need to have a specific set of
dependencies per binary assembly. The main key here is using the
maven remote resources plugin, and supplemental resources to
fill in info from the POM of dependencies where it is lacking.
For things that aren't described in Maven dependencies,
like Javascript files, they are added as LICENSE fragements
that get included in binary assemblies.
Also fix AsterixEventServiceUtil to not die when
the asterix-server bundle has files in the root of
the archive.
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
---
R LICENSE
M asterix-algebra/pom.xml
M asterix-app/pom.xml
A asterix-app/src/main/appended-resources/META-INF/LICENSE
A asterix-app/src/main/appended-resources/supplemental-models.xml
M asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-doc/pom.xml
M asterix-events/pom.xml
M asterix-events/src/main/assembly/binary-assembly.xml
M asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterix-examples/pom.xml
M asterix-external-data/pom.xml
M asterix-fuzzyjoin/pom.xml
M asterix-installer/pom.xml
A asterix-installer/src/main/appended-resources/META-INF/LICENSE
A asterix-installer/src/main/appended-resources/supplemental-models.xml
M asterix-installer/src/main/assembly/binary-assembly.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M asterix-runtime/pom.xml
M asterix-server/pom.xml
M asterix-server/src/main/assembly/binary-assembly.xml
M asterix-test-framework/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M asterix-yarn/pom.xml
A asterix-yarn/src/main/appended-resources/META-INF/LICENSE
A asterix-yarn/src/main/appended-resources/supplemental-models.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
M pom.xml
A src/main/appended-resources/supplemental-models.xml
M src/main/assembly/source.xml
36 files changed, 1,178 insertions(+), 126 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/18/518/3
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 6: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: WIP: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: WIP: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 1: Verified-1
Build Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/552/ : FAILURE
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[release-0.8.8]: ASTERIXDB-1105 - LICENSE per submodule
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: ASTERIXDB-1105 - LICENSE per submodule
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd82
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No