This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 3d700fbe73 [ZEPPELIN-5967] Remove support for deb packaging (#4670)
3d700fbe73 is described below
commit 3d700fbe7379354457900f5d9cf02d55218622d2
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Wed Oct 11 15:43:25 2023 +0800
[ZEPPELIN-5967] Remove support for deb packaging (#4670)
---
pom.xml | 7 -
zeppelin-distribution/pom.xml | 179 +------------------------
zeppelin-distribution/src/deb/control/control | 26 ----
zeppelin-distribution/src/deb/control/prerm | 27 ----
zeppelin-distribution/src/deb/init.d/zeppelind | 36 -----
5 files changed, 1 insertion(+), 274 deletions(-)
diff --git a/pom.xml b/pom.xml
index d64b831651..5991a316f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,6 @@
<plugin.gpg.version>1.6</plugin.gpg.version>
<plugin.jar.version>3.2.0</plugin.jar.version>
<plugin.javadoc.version>3.2.0</plugin.javadoc.version>
- <plugin.jdeb.version>1.8</plugin.jdeb.version>
<plugin.lifecycle.mapping.version>1.0.0</plugin.lifecycle.mapping.version>
<plugin.protobuf.version>3.11.4</plugin.protobuf.version>
<plugin.rat.version>0.13</plugin.rat.version>
@@ -1669,12 +1668,6 @@
<version>${plugin.buildnumber.version}</version>
</plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>${plugin.jdeb.version}</version>
- </plugin>
-
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 5e779e12be..f7f5d129c4 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -31,19 +31,8 @@
<packaging>pom</packaging>
<name>Zeppelin: Packaging distribution</name>
- <properties>
- <deb.pkg.name>zeppelin</deb.pkg.name>
- <deb.install.path>/usr/share/${deb.pkg.name}</deb.install.path>
- <deb.conf.path>/etc/${deb.pkg.name}</deb.conf.path>
- <deb.log.path>/var/log/${deb.pkg.name}</deb.log.path>
- <deb.pid.path>/var/run/${deb.pkg.name}</deb.pid.path>
- <deb.notebook.path>/var/lib/${deb.pkg.name}</deb.notebook.path>
- <!-- NOTE: We can modify this setting with assembly settings -->
-
<deb.assembly.base.dir>target/zeppelin-${project.version}/zeppelin-${project.version}</deb.assembly.base.dir>
- </properties>
-
<!-- NOTE: These dependency declarations are only required to sort this
project to the
- end of the line in the multimodule build.
+ end of the line in the multi-module build.
-->
<dependencyManagement>
<dependencies>
@@ -215,171 +204,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>deb</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <formats>
- <format>dir</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <shortRevisionLength>8</shortRevisionLength>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- <configuration>
-
<deb>${project.build.directory}/zeppelin-${project.version}-${buildNumber}_all.deb</deb>
- <attach>false</attach>
- <skipPOMs>false</skipPOMs>
- <dataSet>
- <data>
- <type>files</type>
- <paths>
- <path>${project.parent.basedir}/LICENSE</path>
- <path>${project.parent.basedir}/README.md</path>
- </paths>
- <dst>${deb.install.path}</dst>
- </data>
- <data>
- <type>directory</type>
- <src>${project.basedir}/src/deb/init.d</src>
- <mapper>
- <type>perm</type>
- <prefix>/etc/init.d</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <type>link</type>
- <linkName>/usr/bin/zeppelin-daemon.sh</linkName>
-
<linkTarget>${deb.install.path}/bin/zeppelin-daemon.sh</linkTarget>
- <symlink>true</symlink>
- </data>
- <data>
- <type>link</type>
- <linkName>${deb.install.path}/conf</linkName>
- <linkTarget>${deb.conf.path}</linkTarget>
- <symlink>true</symlink>
- </data>
- <data>
- <type>link</type>
- <linkName>${deb.install.path}/logs</linkName>
- <linkTarget>${deb.log.path}</linkTarget>
- <symlink>true</symlink>
- </data>
- <data>
- <type>link</type>
- <linkName>${deb.install.path}/notebook</linkName>
- <linkTarget>${deb.notebook.path}</linkTarget>
- <symlink>true</symlink>
- </data>
- <data>
- <type>link</type>
- <linkName>${deb.install.path}/run</linkName>
- <linkTarget>${deb.pid.path}</linkTarget>
- <symlink>true</symlink>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}/bin</src>
- <mapper>
- <type>perm</type>
- <prefix>${deb.install.path}/bin</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}/conf</src>
- <conffile>true</conffile>
- <mapper>
- <type>perm</type>
- <prefix>${deb.conf.path}</prefix>
- </mapper>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}/lib</src>
- <mapper>
- <type>perm</type>
- <prefix>${deb.install.path}/lib</prefix>
- </mapper>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}</src>
- <includes>*.jar,*.war</includes>
- <mapper>
- <type>perm</type>
- <prefix>${deb.install.path}</prefix>
- </mapper>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}/interpreter</src>
- <mapper>
- <type>perm</type>
- <prefix>${deb.install.path}/interpreter</prefix>
- </mapper>
- </data>
- <data>
- <type>directory</type>
- <src>${deb.assembly.base.dir}/notebook</src>
- <includes>2A94M5J1Z/note.json</includes>
- <mapper>
- <type>perm</type>
- <prefix>${deb.notebook.path}</prefix>
- </mapper>
- </data>
- <data>
- <type>template</type>
- <paths>
- <path>${deb.conf.path}</path>
- <path>${deb.log.path}</path>
- <path>${deb.pid.path}</path>
- <path>${deb.notebook.path}</path>
- </paths>
- </data>
- </dataSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/zeppelin-distribution/src/deb/control/control
b/zeppelin-distribution/src/deb/control/control
deleted file mode 100644
index 2bbb205efe..0000000000
--- a/zeppelin-distribution/src/deb/control/control
+++ /dev/null
@@ -1,26 +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.
-#
-Package: [[deb.pkg.name]]
-Version: [[version]]-[[buildNumber]]
-Section: misc
-Priority: optional
-Architecture: all
-Maintainer: Lee moon soo <leemoon...@gmail.com>
-Description: [[name]]
-Distribution: development
\ No newline at end of file
diff --git a/zeppelin-distribution/src/deb/control/prerm
b/zeppelin-distribution/src/deb/control/prerm
deleted file mode 100644
index 85977fcd41..0000000000
--- a/zeppelin-distribution/src/deb/control/prerm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-set -e
-
-SERVICE=$(which service 2> /dev/null)
-RM=$(which rm 2> /dev/null)
-
-exec $SERVICE zeppelind stop
-exec $RM -rf [[deb.log.path]]/* [[deb.pid.path]]/*
diff --git a/zeppelin-distribution/src/deb/init.d/zeppelind
b/zeppelin-distribution/src/deb/init.d/zeppelind
deleted file mode 100755
index d9752df64d..0000000000
--- a/zeppelin-distribution/src/deb/init.d/zeppelind
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-#
-### BEGIN INIT INFO
-# Provides: zeppelind
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# Should-Start: $network $time
-# Should-Stop: $network $time
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start and stop the zeppelin daemon
-# Description: Controls the zeppelin daemon
-### END INIT INFO
-#
-
-test -e /usr/bin/zeppelin-daemon.sh || exit 1
-
-exec /usr/bin/zeppelin-daemon.sh $@
