This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-samples.git
The following commit(s) were added to refs/heads/master by this push:
new d588997 fix log4j2 configuration problems and delete some useless
dependency (#40)
d588997 is described below
commit d5889972820dec5d42e55b87ea9884803311d065
Author: bao liu <[email protected]>
AuthorDate: Tue Feb 4 15:44:50 2020 +0800
fix log4j2 configuration problems and delete some useless dependency (#40)
---
porter_lightweight/file-service/pom.xml | 4 --
.../file-service/src/main/resources/log4j2.xml | 16 +++---
porter_lightweight/gateway-service/pom.xml | 4 --
.../gateway-service/src/main/resources/log4j2.xml | 16 +++---
porter_lightweight/pom.xml | 67 +---------------------
porter_lightweight/user-service/pom.xml | 4 --
.../user-service/src/main/resources/log4j2.xml | 16 +++---
7 files changed, 28 insertions(+), 99 deletions(-)
diff --git a/porter_lightweight/file-service/pom.xml
b/porter_lightweight/file-service/pom.xml
index ae9743d..9a600fd 100644
--- a/porter_lightweight/file-service/pom.xml
+++ b/porter_lightweight/file-service/pom.xml
@@ -30,10 +30,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>inspector</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>file-service-api-endpoint</artifactId>
<version>${project.parent.version}</version>
diff --git a/porter_lightweight/file-service/src/main/resources/log4j2.xml
b/porter_lightweight/file-service/src/main/resources/log4j2.xml
index e3afdb6..313d1fc 100644
--- a/porter_lightweight/file-service/src/main/resources/log4j2.xml
+++ b/porter_lightweight/file-service/src/main/resources/log4j2.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<!--this is sample configuration, please modify as your wish-->
+<!--this is sample configuration, please modify as your wish -->
<configuration>
<Properties>
@@ -25,19 +25,21 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
</Console>
<RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- <TimeBasedTriggeringPolicy interval="1"/>
- <SizeBasedTriggeringPolicy size="10 MB"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
+ <Policies>
+ <TimeBasedTriggeringPolicy interval="1" />
+ <SizeBasedTriggeringPolicy size="10 MB" />
+ </Policies>
</RollingFile>
</Appenders>
<Loggers>
<Root level="info">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="DailyRollingFile"/>
+ <AppenderRef ref="Console" />
+ <AppenderRef ref="DailyRollingFile" />
</Root>
</Loggers>
</configuration>
\ No newline at end of file
diff --git a/porter_lightweight/gateway-service/pom.xml
b/porter_lightweight/gateway-service/pom.xml
index f594aa0..b09ed6b 100644
--- a/porter_lightweight/gateway-service/pom.xml
+++ b/porter_lightweight/gateway-service/pom.xml
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>inspector</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api-service</artifactId>
<version>${project.parent.version}</version>
diff --git a/porter_lightweight/gateway-service/src/main/resources/log4j2.xml
b/porter_lightweight/gateway-service/src/main/resources/log4j2.xml
index b51f28e..e9bb265 100644
--- a/porter_lightweight/gateway-service/src/main/resources/log4j2.xml
+++ b/porter_lightweight/gateway-service/src/main/resources/log4j2.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<!--this is sample configuration, please modify as your wish-->
+<!--this is sample configuration, please modify as your wish -->
<configuration>
<Properties>
@@ -25,19 +25,21 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
</Console>
<RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- <TimeBasedTriggeringPolicy interval="1"/>
- <SizeBasedTriggeringPolicy size="10 MB"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
+ <Policies>
+ <TimeBasedTriggeringPolicy interval="1" />
+ <SizeBasedTriggeringPolicy size="10 MB" />
+ </Policies>
</RollingFile>
</Appenders>
<Loggers>
<Root level="info">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="DailyRollingFile"/>
+ <AppenderRef ref="Console" />
+ <AppenderRef ref="DailyRollingFile" />
</Root>
</Loggers>
</configuration>
\ No newline at end of file
diff --git a/porter_lightweight/pom.xml b/porter_lightweight/pom.xml
index 087b530..86dc1aa 100644
--- a/porter_lightweight/pom.xml
+++ b/porter_lightweight/pom.xml
@@ -62,10 +62,6 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>solution-basic</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>inspector</artifactId>
- </dependency>
</dependencies>
<modules>
@@ -89,70 +85,9 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <archive>
- <manifestEntries>
- <Class-Path>.</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>./lib/</classpathPrefix>
- </manifest>
- <manifestEntries>
- <Class-Path>.</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.2.RELEASE</version>
+ <version>2.1.6.RELEASE</version>
<executions>
<execution>
<goals>
diff --git a/porter_lightweight/user-service/pom.xml
b/porter_lightweight/user-service/pom.xml
index 255fec0..00158d9 100644
--- a/porter_lightweight/user-service/pom.xml
+++ b/porter_lightweight/user-service/pom.xml
@@ -35,10 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>inspector</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api-endpoint</artifactId>
<version>${project.parent.version}</version>
diff --git a/porter_lightweight/user-service/src/main/resources/log4j2.xml
b/porter_lightweight/user-service/src/main/resources/log4j2.xml
index 3c70391..56fc9a0 100644
--- a/porter_lightweight/user-service/src/main/resources/log4j2.xml
+++ b/porter_lightweight/user-service/src/main/resources/log4j2.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<!--this is sample configuration, please modify as your wish-->
+<!--this is sample configuration, please modify as your wish -->
<configuration>
<Properties>
@@ -25,19 +25,21 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
</Console>
<RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- <TimeBasedTriggeringPolicy interval="1"/>
- <SizeBasedTriggeringPolicy size="10 MB"/>
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
+ <Policies>
+ <TimeBasedTriggeringPolicy interval="1" />
+ <SizeBasedTriggeringPolicy size="10MB" />
+ </Policies>
</RollingFile>
</Appenders>
<Loggers>
<Root level="info">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="DailyRollingFile"/>
+ <AppenderRef ref="Console" />
+ <AppenderRef ref="DailyRollingFile" />
</Root>
</Loggers>
</configuration>
\ No newline at end of file
