asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ian Maxon (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in asterixdb[release-0.8.8]: Remove deprecated binary assemblies and fix others
Date Wed, 06 Jan 2016 01:19:18 GMT
Ian Maxon has submitted this change and it was merged.

Change subject: Remove deprecated binary assemblies and fix others
......................................................................


Remove deprecated binary assemblies and fix others

Change-Id: I402cef4206fa0610eaff899cf005875323fb18d5
Reviewed-on: https://asterix-gerrit.ics.uci.edu/570
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ceej@lambda.nu>
---
M asterix-app/pom.xml
D asterix-app/src/main/assembly/binary-assembly.xml
M asterix-events/pom.xml
D asterix-events/src/main/assembly/binary-assembly.xml
M asterix-external-data/src/main/assembly/binary-assembly-libjar.xml
M asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
6 files changed, 20 insertions(+), 150 deletions(-)

Approvals:
  Chris Hillery: Looks good to me, approved
  Jenkins: Verified



diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index 46ee7b0..9e4e3df 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -51,54 +51,6 @@
                 </configuration>
             </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.drivers.AsterixWebServer</mainClass>
-                                    <name>asterix-web</name>
-                                </program>
-                                <program>
-                                    <mainClass>org.apache.asterix.drivers.AsterixClientDriver</mainClass>
-                                    <name>asterix-cmd</name>
-                                </program>
-                                <program>
-                                    <mainClass>org.apache.asterix.drivers.AsterixCLI</mainClass>
-                                    <name>asterix-cli</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>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
diff --git a/asterix-app/src/main/assembly/binary-assembly.xml b/asterix-app/src/main/assembly/binary-assembly.xml
deleted file mode 100644
index 013769f..0000000
--- a/asterix-app/src/main/assembly/binary-assembly.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.  See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership.  The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License.  You may obtain a copy of the License at
- !
- !   http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied.  See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<assembly>
-	<id>binary-assembly</id>
-	<formats>
-		<format>zip</format>
-		<format>dir</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>target/appassembler/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target/appassembler/lib</directory>
-			<outputDirectory>lib</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/asterix-events/pom.xml b/asterix-events/pom.xml
index a1f2bb9..7c755dc 100644
--- a/asterix-events/pom.xml
+++ b/asterix-events/pom.xml
@@ -150,21 +150,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-2</version>
-				<executions>
-					<execution>
-						<configuration>
-							<descriptor>src/main/assembly/binary-assembly.xml</descriptor>
-						</configuration>
-						<phase>package</phase>
-						<goals>
-							<goal>attached</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/asterix-events/src/main/assembly/binary-assembly.xml b/asterix-events/src/main/assembly/binary-assembly.xml
deleted file mode 100644
index 65143c3..0000000
--- a/asterix-events/src/main/assembly/binary-assembly.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.  See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership.  The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License.  You may obtain a copy of the License at
- !
- !   http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied.  See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/resources/events</directory>
-      <outputDirectory>events</outputDirectory>
-      <includes></includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/scripts</directory>
-      <outputDirectory>scripts</outputDirectory>
-      <includes></includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <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>
-</assembly>
diff --git a/asterix-external-data/src/main/assembly/binary-assembly-libjar.xml b/asterix-external-data/src/main/assembly/binary-assembly-libjar.xml
index 5ad0aeb..d7fa547 100644
--- a/asterix-external-data/src/main/assembly/binary-assembly-libjar.xml
+++ b/asterix-external-data/src/main/assembly/binary-assembly-libjar.xml
@@ -33,5 +33,15 @@
         <exclude>**.xml</exclude>
       </excludes>
     </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>
   </fileSets>
 </assembly>
diff --git a/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml b/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
index edc030f..b1a0070 100644
--- a/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
+++ b/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
@@ -37,5 +37,15 @@
         <include>*.xml</include>
       </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>
   </fileSets>
 </assembly>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/570
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I402cef4206fa0610eaff899cf005875323fb18d5
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.8.8
Gerrit-Owner: Ian Maxon <imaxon@apache.org>
Gerrit-Reviewer: Chris Hillery <ceej@lambda.nu>
Gerrit-Reviewer: Ian Maxon <imaxon@apache.org>
Gerrit-Reviewer: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <tillw@apache.org>

Mime
View raw message