You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/27 03:52:57 UTC
[shardingsphere-elasticjob] branch master updated: remove assembly
from cloud-scheduler module
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new c22845b remove assembly from cloud-scheduler module
new 531e90b Merge pull request #1280 from tuohai666/master
c22845b is described below
commit c22845b19ce1cf22c91db235fa4d03792d5c118d
Author: tuohai666 <zh...@apache.org>
AuthorDate: Mon Jul 27 11:48:33 2020 +0800
remove assembly from cloud-scheduler module
---
.../elasticjob-cloud-scheduler/pom.xml | 40 ----------------
.../src/main/resources/assembly/assembly.xml | 54 ----------------------
.../src/main/resources/bin/dcos.sh | 27 -----------
.../src/main/resources/bin/start.sh | 35 --------------
4 files changed, 156 deletions(-)
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
index f8e22a7..afbcf79 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
@@ -170,44 +170,4 @@
<artifactId>mockito-inline</artifactId>
</dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>bin/*</exclude>
- <exclude>assembly/*</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>conf/*.properties</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/resources/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/assembly/assembly.xml b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/assembly/assembly.xml
deleted file mode 100755
index 76a4208..0000000
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/assembly/assembly.xml
+++ /dev/null
@@ -1,54 +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>scheduler-bin</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/resources</directory>
- <includes>
- <include>application.properties</include>
- <include>logback.xml</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/dcos.sh b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/dcos.sh
deleted file mode 100755
index 1758ef8..0000000
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/dcos.sh
+++ /dev/null
@@ -1,27 +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.
-#
-
-cd `dirname $0`
-cd ..
-DEPLOY_DIR=`pwd`
-LIB_DIR=${DEPLOY_DIR}/lib/*
-CONTAINER_MAIN=org.apache.shardingsphere.elasticjob.cloud.scheduler.Bootstrap
-JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Djava.library.path=/usr/local/lib:/usr/lib:/usr/lib64"
-
-java ${JAVA_OPTS} -classpath ${LIB_DIR}:. ${CONTAINER_MAIN}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/start.sh b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/start.sh
deleted file mode 100755
index bc2ffea..0000000
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/bin/start.sh
+++ /dev/null
@@ -1,35 +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.
-#
-
-cd `dirname $0`
-cd ..
-DEPLOY_DIR=`pwd`
-CONF_DIR=${DEPLOY_DIR}/conf
-LIB_DIR=${DEPLOY_DIR}/lib/*
-CONTAINER_MAIN=org.apache.shardingsphere.elasticjob.cloud.scheduler.Bootstrap
-JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Djava.library.path=/usr/local/lib:/usr/lib:/usr/lib64"
-
-source ${CONF_DIR}/elasticjob-cloud-scheduler.properties
-if [ ${hostname} = "" ] || [ ${hostname} = "127.0.0.1" ] || [ ${hostname} = "localhost" ]; then
- echo "Please config hostname in conf/elasticjob-cloud-scheduler.properties with a routable IP address."
- exit;
-fi
-export LIBPROCESS_IP=${hostname}
-
-java ${JAVA_OPTS} -classpath ${CONF_DIR}:${LIB_DIR}:. ${CONTAINER_MAIN}