Skip to content

Commit 126d991

Browse files
author
KenChoi1992
committed
move log4j.properties
1 parent 6b4b35c commit 126d991

File tree

5 files changed

+206
-5
lines changed

5 files changed

+206
-5
lines changed

‎.classpath‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717
<attribute name="maven.pomderived" value="true"/>
1818
</attributes>
1919
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
21-
<attributes>
22-
<attribute name="maven.pomderived" value="true"/>
23-
</attributes>
24-
</classpathentry>
2520
<classpathentry kind="lib" path="libs/gson-2.2.4.jar"/>
2621
<classpathentry kind="lib" path="libs/log4j-1.2.17.jar"/>
2722
<classpathentry kind="lib" path="libs/slf4j-api-1.7.7.jar"/>
2823
<classpathentry kind="lib" path="libs/slf4j-log4j12-1.7.7.jar"/>
24+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2925
<classpathentry kind="output" path="target/classes"/>
3026
</classpath>

‎pom.xml.releaseBackup‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
4+
<groupId>cn.jpush.api</groupId>
5+
<artifactId>jiguang-common</artifactId>
6+
<version>0.1.2-SNAPSHOT</version>
7+
<packaging>jar</packaging>
8+
<url>https://github.com/jpush/jiguang-java-client-common</url>
9+
<name>Jiguang Client Common Dependencies</name>
10+
<description>Jiguang common dependecies for jiguang java client.</description>
11+
12+
<licenses>
13+
<license>
14+
<name>The Apache Software License, Version 2.0</name>
15+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
16+
<distribution>repo</distribution>
17+
</license>
18+
</licenses>
19+
20+
<properties>
21+
<github.global.server>github</github.global.server>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
<jdkVersion>1.7</jdkVersion>
24+
<jdkVersion.test>1.8</jdkVersion.test>
25+
</properties>
26+
27+
<parent>
28+
<groupId>org.sonatype.oss</groupId>
29+
<artifactId>oss-parent</artifactId>
30+
<version>9</version>
31+
</parent>
32+
33+
<scm>
34+
<url>https://github.com/jpush/jiguang-java-client-common</url>
35+
<connection>scm:git:[email protected]:jpush/jiguang-java-client-common.git</connection>
36+
<developerConnection>scm:git:[email protected]:jpush/jiguang-java-client-common.git</developerConnection>
37+
<tag>v0.0.1</tag>
38+
</scm>
39+
40+
<dependencies>
41+
<dependency>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-release-plugin</artifactId>
44+
<version>2.5.3</version>
45+
<type>maven-plugin</type>
46+
</dependency>
47+
48+
<dependency>
49+
<groupId>com.google.code.gson</groupId>
50+
<artifactId>gson</artifactId>
51+
<version>2.3</version>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>org.slf4j</groupId>
56+
<artifactId>slf4j-api</artifactId>
57+
<version>1.7.7</version>
58+
</dependency>
59+
60+
<!-- Test Dependencies -->
61+
62+
<dependency>
63+
<groupId>org.slf4j</groupId>
64+
<artifactId>slf4j-log4j12</artifactId>
65+
<version>1.7.7</version>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>log4j</groupId>
70+
<artifactId>log4j</artifactId>
71+
<version>1.2.17</version>
72+
<scope>test</scope>
73+
</dependency>
74+
75+
<dependency>
76+
<groupId>junit</groupId>
77+
<artifactId>junit</artifactId>
78+
<version>4.11</version>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.squareup.okhttp</groupId>
83+
<artifactId>mockwebserver</artifactId>
84+
<version>2.0.0</version>
85+
<scope>test</scope>
86+
</dependency>
87+
</dependencies>
88+
89+
<build>
90+
<plugins>
91+
92+
<plugin>
93+
<artifactId>maven-compiler-plugin</artifactId>
94+
<version>3.5.1</version>
95+
<configuration>
96+
<source>${jdkVersion}</source>
97+
<target>${jdkVersion}</target>
98+
<compilerVersion>1.5</compilerVersion>
99+
<showDeprecation>true</showDeprecation>
100+
<showWarnings>true</showWarnings>
101+
<debug>true</debug>
102+
<fork>true</fork>
103+
<compilerArgs>
104+
<arg>-Xlint:unchecked</arg>
105+
</compilerArgs>
106+
</configuration>
107+
</plugin>
108+
109+
<plugin>
110+
<groupId>com.github.github</groupId>
111+
<artifactId>site-maven-plugin</artifactId>
112+
<version>0.12</version>
113+
<configuration>
114+
<message>Creating site for ${project.version}</message>
115+
<server>github</server>
116+
</configuration>
117+
<executions>
118+
<execution>
119+
<goals>
120+
<goal>site</goal>
121+
</goals>
122+
<phase>site</phase>
123+
</execution>
124+
</executions>
125+
</plugin>
126+
127+
<plugin>
128+
<groupId>org.apache.maven.plugins</groupId>
129+
<artifactId>maven-surefire-plugin</artifactId>
130+
<version>2.17</version>
131+
<configuration>
132+
<groups>cn.jpush.api.FastTests</groups>
133+
<argLine>-Dfile.encoding=UTF-8</argLine>
134+
<excludes>
135+
<exclude>**/mock/*Test.java</exclude>
136+
</excludes>
137+
</configuration>
138+
<dependencies>
139+
<dependency>
140+
<groupId>org.apache.maven.surefire</groupId>
141+
<artifactId>surefire-junit47</artifactId>
142+
<version>2.17</version>
143+
</dependency>
144+
</dependencies>
145+
</plugin>
146+
147+
</plugins>
148+
</build>
149+
150+
<reporting>
151+
<plugins>
152+
153+
<plugin>
154+
<groupId>org.apache.maven.plugins</groupId>
155+
<artifactId>maven-project-info-reports-plugin</artifactId>
156+
<version>2.8.1</version>
157+
<reportSets>
158+
<reportSet>
159+
<reports>
160+
<report>dependencies</report>
161+
<report>license</report>
162+
<report>scm</report>
163+
</reports>
164+
</reportSet>
165+
</reportSets>
166+
</plugin>
167+
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-javadoc-plugin</artifactId>
171+
<version>2.10.3</version>
172+
<configuration>
173+
<overview>resources/javadoc-overview.html</overview>
174+
</configuration>
175+
</plugin>
176+
177+
</plugins>
178+
</reporting>
179+
180+
</project>

‎release.properties‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#release configuration
2+
#Fri Jun 24 14:21:35 CST 2016
3+
scm.tag=jiguang-common-0.1.2
4+
scm.url=scm\:git\:[email protected]\:jpush/jiguang-java-client-common.git
5+
pushChanges=true
6+
preparationGoals=clean verify
7+
project.scm.cn.jpush.api\:jiguang-common.tag=v0.0.1
8+
project.dev.cn.jpush.api\:jiguang-common=0.1.3-SNAPSHOT
9+
project.scm.cn.jpush.api\:jiguang-common.url=https\://github.com/jpush/jiguang-java-client-common
10+
project.scm.cn.jpush.api\:jiguang-common.developerConnection=scm\:git\:[email protected]\:jpush/jiguang-java-client-common.git
11+
project.rel.cn.jpush.api\:jiguang-common=0.1.2
12+
remoteTagging=true
13+
scm.commentPrefix=[maven-release-plugin]
14+
project.scm.cn.jpush.api\:jiguang-common.connection=scm\:git\:[email protected]\:jpush/jiguang-java-client-common.git
15+
exec.additionalArguments=\ -Psonatype-oss-release
16+
completedPhase=run-preparation-goals

‎src/main/java/cn/jpush/api/TestOrder.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package cn.jpush.api;
2+
3+
import java.lang.annotation.Retention;
4+
import java.lang.annotation.RetentionPolicy;
5+
6+
@Retention(RetentionPolicy.RUNTIME)
7+
public @interface TestOrder {
8+
public int order();
9+
}

src/main/java/cn/jiguang/commom/log4j.properties renamed to src/main/java/log4j.properties

File renamed without changes.

0 commit comments

Comments
 (0)