Skip to content

Commit a0c7757

Browse files
authored
remove module (rabbitmq#122)
1 parent f69639f commit a0c7757

File tree

164 files changed

+93
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+93
-176
lines changed

core/pom.xml

Lines changed: 0 additions & 97 deletions
This file was deleted.

pom.xml

Lines changed: 93 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.alipay.sofa.common</groupId>
6-
<artifactId>sofa-common-tools-parent</artifactId>
6+
<artifactId>sofa-common-tools</artifactId>
77
<version>1.3.0-SNAPSHOT</version>
8-
<modules>
9-
<module>core</module>
10-
</modules>
11-
<packaging>pom</packaging>
8+
<packaging>jar</packaging>
129

1310
<name>${project.groupId}:${project.artifactId}</name>
1411
<description>A library that provide some utility functions to other SOFA libraries</description>
@@ -23,7 +20,6 @@
2320

2421
<properties>
2522
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<common.tools.version>1.3.0-SNAPSHOT</common.tools.version>
2723
<java.version>1.8</java.version>
2824
<logback.version>1.1.7</logback.version>
2925
<slf4j.version>1.7.21</slf4j.version>
@@ -43,82 +39,91 @@
4339
<type>pom</type>
4440
<scope>import</scope>
4541
</dependency>
46-
47-
<dependency>
48-
<groupId>com.alipay.sofa.common</groupId>
49-
<artifactId>sofa-common-tools</artifactId>
50-
<version>${common.tools.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>com.alipay.sofa.common</groupId>
54-
<artifactId>log-sofa-boot-starter</artifactId>
55-
<version>${common.tools.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.slf4j</groupId>
59-
<artifactId>slf4j-api</artifactId>
60-
<version>${slf4j.version}</version>
61-
</dependency>
62-
<!--log4j + slf4j-->
63-
<dependency>
64-
<groupId>org.slf4j</groupId>
65-
<artifactId>slf4j-log4j12</artifactId>
66-
<version>${slf4j.version}</version>
67-
</dependency>
68-
<!-- Log4j2 + Slf4j -->
69-
<dependency>
70-
<groupId>org.apache.logging.log4j</groupId>
71-
<artifactId>log4j-slf4j-impl</artifactId>
72-
<version>${log4j2.version}</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.logging.log4j</groupId>
76-
<artifactId>log4j-api</artifactId>
77-
<version>${log4j2.version}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.apache.logging.log4j</groupId>
81-
<artifactId>log4j-core</artifactId>
82-
<version>${log4j2.version}</version>
83-
</dependency>
84-
<!-- logback + slf4j -->
85-
<dependency>
86-
<groupId>ch.qos.logback</groupId>
87-
<artifactId>logback-classic</artifactId>
88-
<version>${logback.version}</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>ch.qos.logback</groupId>
92-
<artifactId>logback-core</artifactId>
93-
<version>${logback.version}</version>
94-
</dependency>
95-
<!-- commons-logging slf4j-jcl log4j-->
96-
<dependency>
97-
<groupId>commons-logging</groupId>
98-
<artifactId>commons-logging</artifactId>
99-
<version>${commons.logging.version}</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.slf4j</groupId>
103-
<artifactId>slf4j-jcl</artifactId>
104-
<version>${slf4j.version}</version>
105-
</dependency>
106-
<!-- test -->
107-
<dependency>
108-
<groupId>junit</groupId>
109-
<artifactId>junit</artifactId>
110-
<version>${junit.version}</version>
111-
<scope>test</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>commons-io</groupId>
115-
<artifactId>commons-io</artifactId>
116-
<version>${commons.io.version}</version>
117-
<scope>test</scope>
118-
</dependency>
11942
</dependencies>
12043
</dependencyManagement>
12144

45+
<dependencies>
46+
<dependency>
47+
<groupId>org.slf4j</groupId>
48+
<artifactId>slf4j-api</artifactId>
49+
<version>${slf4j.version}</version>
50+
</dependency>
51+
<!--log4j + slf4j-->
52+
<dependency>
53+
<groupId>org.slf4j</groupId>
54+
<artifactId>slf4j-log4j12</artifactId>
55+
<version>${slf4j.version}</version>
56+
<optional>true</optional>
57+
</dependency>
58+
<!-- Log4j2 + Slf4j -->
59+
<dependency>
60+
<groupId>org.apache.logging.log4j</groupId>
61+
<artifactId>log4j-slf4j-impl</artifactId>
62+
<version>${log4j2.version}</version>
63+
<optional>true</optional>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.apache.logging.log4j</groupId>
67+
<artifactId>log4j-api</artifactId>
68+
<version>${log4j2.version}</version>
69+
<optional>true</optional>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.apache.logging.log4j</groupId>
73+
<artifactId>log4j-core</artifactId>
74+
<version>${log4j2.version}</version>
75+
<optional>true</optional>
76+
</dependency>
77+
<!-- logback + slf4j -->
78+
<dependency>
79+
<groupId>ch.qos.logback</groupId>
80+
<artifactId>logback-classic</artifactId>
81+
<version>${logback.version}</version>
82+
<optional>true</optional>
83+
</dependency>
84+
<dependency>
85+
<groupId>ch.qos.logback</groupId>
86+
<artifactId>logback-core</artifactId>
87+
<version>${logback.version}</version>
88+
<optional>true</optional>
89+
</dependency>
90+
<!-- commons-logging slf4j-jcl log4j-->
91+
<dependency>
92+
<groupId>commons-logging</groupId>
93+
<artifactId>commons-logging</artifactId>
94+
<version>${commons.logging.version}</version>
95+
<optional>true</optional>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.slf4j</groupId>
99+
<artifactId>slf4j-jcl</artifactId>
100+
<version>${slf4j.version}</version>
101+
<optional>true</optional>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.springframework</groupId>
105+
<artifactId>spring-context</artifactId>
106+
<optional>true</optional>
107+
</dependency>
108+
<dependency>
109+
<groupId>junit</groupId>
110+
<artifactId>junit</artifactId>
111+
<version>${junit.version}</version>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>commons-io</groupId>
116+
<artifactId>commons-io</artifactId>
117+
<version>${commons.io.version}</version>
118+
<scope>test</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.springframework</groupId>
122+
<artifactId>spring-test</artifactId>
123+
<scope>test</scope>
124+
</dependency>
125+
</dependencies>
126+
122127
<developers>
123128
<developer>
124129
<id>kevin.luy</id>
@@ -128,6 +133,14 @@
128133
<id>guanchao.ygc</id>
129134
<email>guanchao.ygc@alipay.com</email>
130135
</developer>
136+
<developer>
137+
<id>alaneuler</id>
138+
<email>guaner.zzx@alipay.com</email>
139+
</developer>
140+
<developer>
141+
<id>zijie.hu</id>
142+
<email>hzj266771@antfin.com</email>
143+
</developer>
131144
</developers>
132145

133146
<scm>
@@ -145,6 +158,7 @@
145158
<configuration>
146159
<source>${java.version}</source>
147160
<target>${java.version}</target>
161+
<encoding>UTF-8</encoding>
148162
</configuration>
149163
</plugin>
150164
<plugin>

0 commit comments

Comments
 (0)