From c7c62f0aefa59d68cd214a005ac9bd313b91d0ef Mon Sep 17 00:00:00 2001 From: xwm1992 Date: Fri, 30 Apr 2021 15:05:57 +0800 Subject: [PATCH] [ISSUE #325]Update gradle configuration for publishing package to maven repository --- build.gradle | 58 +++++ eventmesh-common/build.gradle | 24 +- eventmesh-common/gradle.properties | 1 - eventmesh-connector-api/build.gradle | 24 +- .../gradle.properties | 1 - eventmesh-runtime/bin/start.sh | 2 +- eventmesh-runtime/bin/stop.sh | 6 +- eventmesh-runtime/build.gradle | 29 +-- eventmesh-runtime/conf/log4j2.xml | 6 +- .../configuration/CommonConfiguration.java | 212 ------------------ .../configuration/ConfigurationWraper.java | 78 ------- gradle.properties | 18 +- 12 files changed, 111 insertions(+), 348 deletions(-) delete mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/CommonConfiguration.java delete mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/ConfigurationWraper.java diff --git a/build.gradle b/build.gradle index 2b64b77bb3..d9f6b43bf3 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,8 @@ subprojects { apply plugin: "pmd" apply plugin: 'com.github.spotbugs' + apply plugin: 'signing' + [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' compileJava.options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" @@ -293,9 +295,14 @@ subprojects { archives packageSources } + signing { + sign packageJavadoc, packageSources, jar + } + repositories { maven { url "https://maven.aliyun.com/repository/public" } mavenCentral() + mavenLocal() } configurations.all { @@ -303,5 +310,56 @@ subprojects { resolutionStrategy.cacheDynamicVersionsFor 0, TimeUnit.SECONDS } + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { + MavenDeployment deployment -> signing.signPom(deployment) + } +// def releaseRepo = 'https://repository.apache.org/content/repositories/releases/' +// def snapshotsRepo = 'https://repository.apache.org/content/repositories/snapshots/' +// repository(url: releaseRepo) { +// authentication(userName: apacheUserName, password: apachePassWord) +// } +// +// snapshotRepository(url: snapshotsRepo) { +// authentication(userName: apacheUserName, password: apachePassWord) +// } + // 指定上传的路径 +// def localMavenRepo = 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath + def localMavenRepo = 'file://D:/repo' + repository(url: localMavenRepo) + pom.project { + name 'Apache EventMesh' + packaging 'jar' + // optionally artifactId can be defined here + description 'Apache EventMesh' + url 'https://github.com/apache/incubator-eventmesh' + + scm { + connection 'scm:git:git@github.com:apache/incubator-eventmesh.git' + developerConnection 'scm:git:git@github.com:apache/incubator-eventmesh.git' + url 'https://github.com/apache/incubator-eventmesh' + } + + licenses { + license { + name 'The Apache License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id 'Apache EventMesh(incubating)' + name 'Apache EventMesh(incubating) of ASF' + url 'https://eventmesh.apache.org/' + } + } + } + } + } + } + } diff --git a/eventmesh-common/build.gradle b/eventmesh-common/build.gradle index ca45222a6f..59a59e9bf5 100644 --- a/eventmesh-common/build.gradle +++ b/eventmesh-common/build.gradle @@ -73,18 +73,18 @@ dependencies { testCompile apache_commons, httpclient, guava, netty, fastjson, jackson } -uploadArchives { - repositories { - mavenDeployer { - snapshotRepository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - repository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - } - } -} +//uploadArchives { +// repositories { +// mavenDeployer { +// snapshotRepository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// repository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// } +// } +//} tasks.withType(JavaCompile) { options.encoding = "UTF-8" diff --git a/eventmesh-common/gradle.properties b/eventmesh-common/gradle.properties index cc510e2db3..b4202ce825 100644 --- a/eventmesh-common/gradle.properties +++ b/eventmesh-common/gradle.properties @@ -16,5 +16,4 @@ # group=org.apache.eventmesh version=1.2.0-SNAPSHOT -defibus_version=1.0.1 jdk=1.7 diff --git a/eventmesh-connector-api/build.gradle b/eventmesh-connector-api/build.gradle index bf71a34be7..01276408c6 100644 --- a/eventmesh-connector-api/build.gradle +++ b/eventmesh-connector-api/build.gradle @@ -51,18 +51,18 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12', open_message } -uploadArchives { - repositories { - mavenDeployer { - snapshotRepository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - repository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - } - } -} +//uploadArchives { +// repositories { +// mavenDeployer { +// snapshotRepository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// repository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// } +// } +//} tasks.withType(JavaCompile) { options.encoding = "UTF-8" diff --git a/eventmesh-connector-rocketmq/gradle.properties b/eventmesh-connector-rocketmq/gradle.properties index a406fc5630..9b89108e79 100644 --- a/eventmesh-connector-rocketmq/gradle.properties +++ b/eventmesh-connector-rocketmq/gradle.properties @@ -15,7 +15,6 @@ group=org.apache.eventmesh version=1.2.0 -defibus_version=1.0.1 rocketmq_version=4.7.1 mavenUserName= mavenPassword= \ No newline at end of file diff --git a/eventmesh-runtime/bin/start.sh b/eventmesh-runtime/bin/start.sh index 3eea09d0bb..9c0724bdd0 100644 --- a/eventmesh-runtime/bin/start.sh +++ b/eventmesh-runtime/bin/start.sh @@ -55,7 +55,7 @@ function is_java8 { #0(not running), 1(is running) #function is_proxyRunning { # local _pid="$1" -# local pid=`ps ax | grep -i 'com.webank.runtime.boot.EventMeshStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` +# local pid=`ps ax | grep -i 'org.apache.eventmesh.runtime.boot.EventMeshStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` # if [ -z "$pid" ] ; then # return 0 # else diff --git a/eventmesh-runtime/bin/stop.sh b/eventmesh-runtime/bin/stop.sh index 11174793cd..4897c77612 100644 --- a/eventmesh-runtime/bin/stop.sh +++ b/eventmesh-runtime/bin/stop.sh @@ -31,13 +31,13 @@ function get_pid { else if [[ $OS =~ Msys ]]; then # 在Msys上存在可能无法kill识别出的进程的BUG - ppid=`jps -v | grep -i "com.webank.runtime.boot.EventMeshStartup" | grep java | grep -v grep | awk -F ' ' {'print $1'}` + ppid=`jps -v | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep java | grep -v grep | awk -F ' ' {'print $1'}` elif [[ $OS =~ Darwin ]]; then # 已知问题：grep java 可能无法精确识别java进程 - ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) + ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) else #在Linux服务器上要求尽可能精确识别进程 - ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_HOME | grep -i "com.webank.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) + ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_HOME | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) fi fi echo "$ppid"; diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle index 24ae3a1246..845fa4a4d0 100644 --- a/eventmesh-runtime/build.gradle +++ b/eventmesh-runtime/build.gradle @@ -29,11 +29,6 @@ repositories { mavenCentral() } -//List defibus = [ -// "com.webank.defibus:defibus-client:$defibus_version", -// "com.webank.defibus:defibus-common:$defibus_version" -//] - List junit = [ "junit:junit:4.12" ] @@ -146,15 +141,15 @@ task tar(type: Tar, dependsOn: ['clean', 'jar']) { } } -uploadArchives { - repositories { - mavenDeployer { - snapshotRepository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - repository(url: 'Your target repo address') { - authentication(userName: 'Your user name', password: 'Your password') - } - } - } -} \ No newline at end of file +//uploadArchives { +// repositories { +// mavenDeployer { +// snapshotRepository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// repository(url: 'Your target repo address') { +// authentication(userName: 'Your user name', password: 'Your password') +// } +// } +// } +//} \ No newline at end of file diff --git a/eventmesh-runtime/conf/log4j2.xml b/eventmesh-runtime/conf/log4j2.xml index 8633ab07f3..8495181200 100644 --- a/eventmesh-runtime/conf/log4j2.xml +++ b/eventmesh-runtime/conf/log4j2.xml @@ -64,11 +64,7 @@ - - - - - + diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/CommonConfiguration.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/CommonConfiguration.java deleted file mode 100644 index 855d187e0f..0000000000 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/CommonConfiguration.java +++ /dev/null @@ -1,212 +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 com.webank.runtime.configuration; -// -//import com.google.common.base.Preconditions; -//import com.webank.runtime.util.EventMeshUtil; -//import org.apache.commons.lang3.StringUtils; -// -//public class CommonConfiguration { -// public String EventMeshEnv = "P"; -// public String EventMeshRegion = ""; -// public String EventMeshIDC = "FT"; -// public String EventMeshDCN = "1C0"; -// public String eventMeshCluster = "LS"; -// public String eventMeshName = ""; -// public String sysID = "5477"; -// -// -// public String namesrvAddr = ""; -// public String clientUserName = "username"; -// public String clientPass = "user@123"; -// public Integer consumeThreadMin = 2; -// public Integer consumeThreadMax = 2; -// public Integer consumeQueueSize = 10000; -// public Integer pullBatchSize = 32; -// public Integer ackWindow = 1000; -// public Integer pubWindow = 100; -// public long consumeTimeout = 0L; -// public Integer pollNameServerInteval = 10 * 1000; -// public Integer heartbeatBrokerInterval = 30 * 1000; -// public Integer rebalanceInterval = 20 * 1000; -// public Integer eventMeshRegisterIntervalInMills = 10 * 1000; -// public Integer eventMeshFetchRegistryAddrInterval = 10 * 1000; -// public String eventMeshServerIp = null; -// protected ConfigurationWraper configurationWraper; -// -// public CommonConfiguration(ConfigurationWraper configurationWraper) { -// this.configurationWraper = configurationWraper; -// } -// -// public void init() { -// String eventMeshEnvStr = configurationWraper.getProp(ConfKeys.KEYS_eventMesh_ENV); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshEnvStr), String.format("%s error", ConfKeys.KEYS_eventMesh_ENV)); -// eventMeshEnv = StringUtils.deleteWhitespace(eventMeshEnvStr); -// -// String eventMeshRegionStr = configurationWraper.getProp(ConfKeys.KEYS_eventMesh_REGION); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshRegionStr), String.format("%s error", ConfKeys.KEYS_eventMesh_REGION)); -// eventMeshRegion = StringUtils.deleteWhitespace(eventMeshRegionStr); -// -// String sysIdStr = configurationWraper.getProp(ConfKeys.KEYS_EventMesh_SYSID); -// Preconditions.checkState(StringUtils.isNotEmpty(sysIdStr) && StringUtils.isNumeric(sysIdStr), String.format("%s error", ConfKeys.KEYS_EventMesh_SYSID)); -// sysID = StringUtils.deleteWhitespace(sysIdStr); -// -// String eventMeshClusterStr = configurationWraper.getProp(ConfKeys.KEYS_EventMesh_SERVER_CLUSTER); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshClusterStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_SERVER_CLUSTER)); -// eventMeshCluster = StringUtils.deleteWhitespace(eventMeshClusterStr); -// -// String eventMeshNameStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_SERVER_NAME); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshNameStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_SERVER_NAME)); -// eventMeshName = StringUtils.deleteWhitespace(eventMeshNameStr); -// -// String eventMeshIDCStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_IDC); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshIDCStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_IDC)); -// eventMeshIDC = StringUtils.deleteWhitespace(eventMeshIDCStr); -// -// String eventMeshDCNStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DCN); -// Preconditions.checkState(StringUtils.isNotEmpty(eventMeshDCNStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DCN)); -// eventMeshDCN = StringUtils.deleteWhitespace(eventMeshDCNStr); -// -// String clientUserNameStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_USERNAME); -// if (StringUtils.isNotBlank(clientUserNameStr)) { -// clientUserName = StringUtils.trim(clientUserNameStr); -// } -// -// String clientPassStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_PASSWORD); -// if (StringUtils.isNotBlank(clientPassStr)) { -// clientPass = StringUtils.trim(clientPassStr); -// } -// -// String namesrvAddrStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_NAMESRV_ADDR); -// Preconditions.checkState(StringUtils.isNotEmpty(namesrvAddrStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_NAMESRV_ADDR)); -// namesrvAddr = StringUtils.trim(namesrvAddrStr); -// -// String consumeThreadPoolMinStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MIN); -// if(StringUtils.isNotEmpty(consumeThreadPoolMinStr)){ -// Preconditions.checkState(StringUtils.isNumeric(consumeThreadPoolMinStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MIN)); -// consumeThreadMin = Integer.valueOf(consumeThreadPoolMinStr); -// } -// -// String consumeThreadPoolMaxStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MAX); -// if(StringUtils.isNotEmpty(consumeThreadPoolMaxStr)){ -// Preconditions.checkState(StringUtils.isNumeric(consumeThreadPoolMaxStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MAX)); -// consumeThreadMax = Integer.valueOf(consumeThreadPoolMaxStr); -// } -// -// String consumerThreadPoolQueueSizeStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_QUEUESIZE); -// if(StringUtils.isNotEmpty(consumerThreadPoolQueueSizeStr)){ -// Preconditions.checkState(StringUtils.isNumeric(consumerThreadPoolQueueSizeStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_QUEUESIZE)); -// consumeQueueSize = Integer.valueOf(consumerThreadPoolQueueSizeStr); -// } -// -// String clientAckWindowStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_ACK_WINDOW); -// if(StringUtils.isNotEmpty(clientAckWindowStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientAckWindowStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_ACK_WINDOW)); -// ackWindow = Integer.valueOf(clientAckWindowStr); -// } -// -// String clientPubWindowStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_PUB_WINDOW); -// if(StringUtils.isNotEmpty(clientPubWindowStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientPubWindowStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_PUB_WINDOW)); -// pubWindow = Integer.valueOf(clientPubWindowStr); -// } -// -// String consumeTimeoutStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_CONSUME_TIMEOUT); -// if(StringUtils.isNotBlank(consumeTimeoutStr)) { -// Preconditions.checkState(StringUtils.isNumeric(consumeTimeoutStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_CONSUME_TIMEOUT)); -// consumeTimeout = Long.valueOf(consumeTimeoutStr); -// } -// -// String clientPullBatchSizeStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_PULL_BATCHSIZE); -// if(StringUtils.isNotEmpty(clientPullBatchSizeStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientPullBatchSizeStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_PULL_BATCHSIZE)); -// pullBatchSize = Integer.valueOf(clientPullBatchSizeStr); -// } -// -// String clientPollNamesrvIntervalStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_POLL_NAMESRV_INTERVAL); -// if(StringUtils.isNotEmpty(clientPollNamesrvIntervalStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientPollNamesrvIntervalStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_POLL_NAMESRV_INTERVAL)); -// pollNameServerInteval = Integer.valueOf(clientPollNamesrvIntervalStr); -// } -// -// String clientHeartbeatBrokerIntervalStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_HEARTBEAT_BROKER_INTERVEL); -// if(StringUtils.isNotEmpty(clientHeartbeatBrokerIntervalStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientHeartbeatBrokerIntervalStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_HEARTBEAT_BROKER_INTERVEL)); -// heartbeatBrokerInterval = Integer.valueOf(clientHeartbeatBrokerIntervalStr); -// } -// -// String clientRebalanceIntervalIntervalStr = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_REBALANCE_INTERVEL); -// if(StringUtils.isNotEmpty(clientRebalanceIntervalIntervalStr)){ -// Preconditions.checkState(StringUtils.isNumeric(clientRebalanceIntervalIntervalStr), String.format("%s error", ConfKeys.KEYS_EVENTMESH_DEFIBUS_CLIENT_REBALANCE_INTERVEL)); -// rebalanceInterval = Integer.valueOf(clientRebalanceIntervalIntervalStr); -// } -// -// eventMeshServerIp = configurationWraper.getProp(ConfKeys.KEYS_EVENTMESH_SERVER_HOST_IP); -// if(StringUtils.isBlank(eventMeshServerIp)) { -// eventMeshServerIp = EventMeshUtil.getLocalAddr(); -// } -// } -// -// static class ConfKeys { -// public static String KEYS_EVENTMESH_ENV = "eventMesh.server.env"; -// -// public static String KEYS_EVENTMESH_REGION = "eventMesh.server.region"; -// -// public static String KEYS_EVENTMESH_IDC = "eventMesh.server.idc"; -// -// public static String KEYS_EVENTMESH_DCN = "eventMesh.server.dcn"; -// -// public static String KEYS_EVENTMESH_SYSID = "eventMesh.sysid"; -// -// public static String KEYS_EVENTMESH_SERVER_CLUSTER = "eventMesh.server.cluster"; -// -// public static String KEYS_EVENTMESH_SERVER_NAME = "eventMesh.server.name"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_NAMESRV_ADDR = "eventMesh.server.defibus.namesrvAddr"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_USERNAME = "eventMesh.server.defibus.username"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_PASSWORD = "eventMesh.server.defibus.password"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MIN = "eventMesh.server.defibus.client.consumeThreadMin"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_MAX = "eventMesh.server.defibus.client.consumeThreadMax"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CONSUME_THREADPOOL_QUEUESIZE = "eventMesh.server.defibus.client.consumeThreadPoolQueueSize"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_ACK_WINDOW = "eventMesh.server.defibus.client.ackwindow"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_PUB_WINDOW = "eventMesh.server.defibus.client.pubwindow"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_CONSUME_TIMEOUT = "eventMesh.server.defibus.client.comsumeTimeoutInMin"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_PULL_BATCHSIZE = "eventMesh.server.defibus.client.pullBatchSize"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_POLL_NAMESRV_INTERVAL = "eventMesh.server.defibus.client.pollNameServerInterval"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_HEARTBEAT_BROKER_INTERVEL = "eventMesh.server.defibus.client.heartbeatBrokerInterval"; -// -// public static String KEYS_EVENTMESH_DEFIBUS_CLIENT_REBALANCE_INTERVEL = "eventMesh.server.defibus.client.rebalanceInterval"; -// -// public static String KEYS_EVENTMESH_SERVER_HOST_IP = "eventMesh.server.hostIp"; -// -// public static String KEYS_EVENTMESH_SERVER_REGISTER_INTERVAL = "eventMesh.server.registry.registerIntervalInMills"; -// -// public static String KEYS_EVENTMESH_SERVER_FETCH_REGISTRY_ADDR_INTERVAL = "eventMesh.server.registry.fetchRegistryAddrIntervalInMills"; -// } -//} \ No newline at end of file diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/ConfigurationWraper.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/ConfigurationWraper.java deleted file mode 100644 index af67038e1a..0000000000 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/ConfigurationWraper.java +++ /dev/null @@ -1,78 +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 com.webank.runtime.configuration; -// -//import org.apache.eventmesh.common.ThreadPoolFactory; -//import org.apache.commons.lang3.StringUtils; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -// -//import java.io.BufferedReader; -//import java.io.File; -//import java.io.FileReader; -//import java.io.IOException; -//import java.util.Properties; -//import java.util.concurrent.ScheduledExecutorService; -//import java.util.concurrent.TimeUnit; -// -//public class ConfigurationWraper { -// -// public Logger logger = LoggerFactory.getLogger(this.getClass()); -// -// private String file; -// -// private Properties properties = new Properties(); -// -// private boolean reload = true; -// -// private ScheduledExecutorService configLoader = ThreadPoolFactory.createSingleScheduledExecutor("EventMesh-configloader-"); -// -// public ConfigurationWraper(String file, boolean reload) { -// this.file = file; -// this.reload = reload; -// init(); -// } -// -// private void init() { -// load(); -// if (this.reload) { -// configLoader.scheduleAtFixedRate(new Runnable() { -// @Override -// public void run() { -// load(); -// } -// }, 30 * 1000, 30 * 1000, TimeUnit.MILLISECONDS); -// } -// } -// -// private void load() { -// try { -// logger.info("loading config: {}", file); -// properties.load(new BufferedReader(new FileReader( -// new File(file)))); -// } catch (IOException e) { -// logger.error("loading properties [{}] error", file, e); -// } -// } -// -// public String getProp(String key) { -// return StringUtils.isEmpty(key) ? null : properties.getProperty(key, null); -// } -// -// -//} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6fa13a2a37..9a37ed902a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,11 +14,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # -group=org.apache.eventmesh -version=1.2.0-SNAPSHOT -rocketmqVersion=4.4.0 jdk=1.8 snapshot=false -mavenUserName= -mavenPassword= -#org.gradle.java.home=C:\\Program Files\\Java\\jdk1.7.0_67 +group=org.apache.eventmesh +version=1.2.0-SNAPSHOT +#40位公钥的最后8位 +signing.keyId= +#生成密钥时填的passphrase +signing.password= +#导出的私钥文件路径 +signing.secretKeyRingFile= +#apache 账号 +apacheUserName= +#apache 密码 +apachePassWord=