incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/3] git commit: Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Date Tue, 06 May 2014 02:07:40 GMT
Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into
apache-blur-0.2

Conflicts:
	distribution/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/0f7c8484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/0f7c8484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/0f7c8484

Branch: refs/heads/apache-blur-0.2
Commit: 0f7c8484151ee60aeef473bb729b1df243b8e034
Parents: 9f77203 8d1434e
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon May 5 22:07:30 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon May 5 22:07:30 2014 -0400

----------------------------------------------------------------------
 distribution/pom.xml                            |   4 +-
 distribution/src/assemble/bin-hadoop1.xml       | 140 ++++
 distribution/src/assemble/bin-hadoop2.xml       | 140 ++++
 distribution/src/assemble/bin.xml               | 140 ----
 .../src/main/resources-hadoop1/LICENSE-bin.txt  | 790 +++++++++++++++++++
 .../main/resources-hadoop1/NOTICE-bin.base.txt  |   8 +
 .../src/main/resources-hadoop1/NOTICE-bin.txt   | 132 ++++
 .../main/resources-hadoop1/license-notes.txt    |  17 +
 .../notices/commons-el-1.0.jar.NOTICE           |   0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |   0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |   7 +
 .../notices/generate-notice.sh                  |  27 +
 .../notices/guava-14.0.jar.NOTICE               |   0
 .../jackson-annotations-2.1.1.jar.NOTICE        |   0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |   0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |   0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |   0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |  18 +
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |  18 +
 .../notices/jets3t-0.6.1.jar.NOTICE             |  18 +
 .../notices/jetty-6.1.26.jar.NOTICE             |  36 +
 .../notices/jetty-util-6.1.26.jar.NOTICE        |  36 +
 .../notices/metrics-core-2.2.0.jar.NOTICE       |  11 +
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |  11 +
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |  11 +
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |  11 +
 .../notices/oro-2.0.8.jar.NOTICE                |   0
 .../notices/spatial4j-0.3.jar.NOTICE            |   0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |   5 +
 .../src/main/resources-hadoop2/LICENSE-bin.txt  | 646 +++++++++++++++
 .../main/resources-hadoop2/NOTICE-bin.base.txt  |   8 +
 .../src/main/resources-hadoop2/NOTICE-bin.txt   | 224 ++++++
 .../main/resources-hadoop2/license-notes.txt    |  17 +
 .../notices/commons-el-1.0.jar.NOTICE           |   0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |   0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |   7 +
 .../notices/generate-notice.sh                  |  27 +
 .../notices/guava-14.0.jar.NOTICE               |   0
 .../jackson-annotations-2.1.1.jar.NOTICE        |   0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |   0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |   0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |   0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |  18 +
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |  18 +
 .../notices/jets3t-0.6.1.jar.NOTICE             |  18 +
 .../notices/jetty-6.1.26.jar.NOTICE             |  36 +
 .../notices/jetty-util-6.1.26.jar.NOTICE        |  36 +
 .../notices/metrics-core-2.2.0.jar.NOTICE       |  11 +
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |  11 +
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |  11 +
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |  11 +
 .../notices/oro-2.0.8.jar.NOTICE                |   0
 .../notices/snappy-java-1.0.4.1.jar.NOTICE      |  16 +
 .../notices/spatial4j-0.3.jar.NOTICE            |   0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |   5 +
 distribution/src/main/resources/LICENSE-bin.txt | 790 -------------------
 .../src/main/resources/NOTICE-bin.base.txt      |   8 -
 distribution/src/main/resources/NOTICE-bin.txt  | 132 ----
 .../src/main/resources/license-notes.txt        |  17 -
 .../resources/notices/commons-el-1.0.jar.NOTICE |   0
 .../notices/commons-httpclient-3.0.1.jar.NOTICE |   0
 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE |   7 -
 .../main/resources/notices/generate-notice.sh   |  27 -
 .../resources/notices/guava-14.0.jar.NOTICE     |   0
 .../jackson-annotations-2.1.1.jar.NOTICE        |   0
 .../notices/jackson-core-2.1.1.jar.NOTICE       |   0
 .../notices/jackson-databind-2.1.1.jar.NOTICE   |   0
 .../notices/jakarta-regexp-1.4.jar.NOTICE       |   0
 .../notices/jasper-compiler-5.5.12.jar.NOTICE   |  18 -
 .../notices/jasper-runtime-5.5.12.jar.NOTICE    |  18 -
 .../resources/notices/jets3t-0.6.1.jar.NOTICE   |  18 -
 .../resources/notices/jetty-6.1.26.jar.NOTICE   |  36 -
 .../notices/jetty-util-6.1.26.jar.NOTICE        |  36 -
 .../notices/metrics-core-2.2.0.jar.NOTICE       |  11 -
 .../notices/metrics-ganglia-2.2.0.jar.NOTICE    |  11 -
 .../notices/metrics-graphite-2.2.0.jar.NOTICE   |  11 -
 .../notices/metrics-servlet-2.2.0.jar.NOTICE    |  11 -
 .../main/resources/notices/oro-2.0.8.jar.NOTICE |   0
 .../resources/notices/spatial4j-0.3.jar.NOTICE  |   0
 .../notices/zookeeper-3.4.5.jar.NOTICE          |   5 -
 pom.xml                                         |   7 +-
 81 files changed, 2563 insertions(+), 1300 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0f7c8484/distribution/pom.xml
----------------------------------------------------------------------
diff --cc distribution/pom.xml
index d631670,8a438c8..a720cda
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@@ -59,18 -59,6 +59,18 @@@ under the License
  							</descriptors>
  						</configuration>
  					</execution>
 +					<execution>
 +						<id>distro-assembly-bin</id>
 +						<phase>package</phase>
 +						<goals>
 +							<goal>single</goal>
 +						</goals>
 +						<configuration>
 +							<descriptors>
- 								<descriptor>src/assemble/bin.xml</descriptor>
++								<descriptor>${bin.assembly.file}</descriptor>
 +							</descriptors>
 +						</configuration>
 +					</execution>
  				</executions>
  			</plugin>
  		</plugins>
@@@ -93,6 -81,7 +93,7 @@@
  			</dependencies>
  			<properties>
  				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
 -                                <bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file>
++                <bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file>
  			</properties>
  		</profile>
  		<profile>
@@@ -111,6 -100,7 +112,7 @@@
  			</dependencies>
  			<properties>
  				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
 -                                <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
++                <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
  			</properties>
  		</profile>
  	</profiles>


Mime
View raw message