From 126d991775bbbc292ff410467b13ae9303be6830 Mon Sep 17 00:00:00 2001
From: KenChoi1992 <caiyg@jpush.cn>
Date: Fri, 24 Jun 2016 14:24:01 +0800
Subject: [PATCH] move log4j.properties

---
 .classpath                                    |   6 +-
 pom.xml.releaseBackup                         | 180 ++++++++++++++++++
 release.properties                            |  16 ++
 src/main/java/cn/jpush/api/TestOrder.java     |   9 +
 .../{cn/jiguang/commom => }/log4j.properties  |   0
 5 files changed, 206 insertions(+), 5 deletions(-)
 create mode 100644 pom.xml.releaseBackup
 create mode 100644 release.properties
 create mode 100644 src/main/java/cn/jpush/api/TestOrder.java
 rename src/main/java/{cn/jiguang/commom => }/log4j.properties (100%)

diff --git a/.classpath b/.classpath
index 115d526..fc7c3c2 100644
--- a/.classpath
+++ b/.classpath
@@ -17,14 +17,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="libs/gson-2.2.4.jar"/>
 	<classpathentry kind="lib" path="libs/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="libs/slf4j-api-1.7.7.jar"/>
 	<classpathentry kind="lib" path="libs/slf4j-log4j12-1.7.7.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup
new file mode 100644
index 0000000..80c7eaa
--- /dev/null
+++ b/pom.xml.releaseBackup
@@ -0,0 +1,180 @@
+<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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>cn.jpush.api</groupId>
+	<artifactId>jiguang-common</artifactId>
+	<version>0.1.2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<url>https://github.com/jpush/jiguang-java-client-common</url>
+	<name>Jiguang Client Common Dependencies</name>
+	<description>Jiguang common dependecies for jiguang java client.</description>
+
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<properties>
+		<github.global.server>github</github.global.server>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jdkVersion>1.7</jdkVersion>
+		<jdkVersion.test>1.8</jdkVersion.test>
+	</properties>
+
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>9</version>
+	</parent>
+
+	<scm>
+		<url>https://github.com/jpush/jiguang-java-client-common</url>
+		<connection>scm:git:git@github.com:jpush/jiguang-java-client-common.git</connection>
+		<developerConnection>scm:git:git@github.com:jpush/jiguang-java-client-common.git</developerConnection>
+		<tag>v0.0.1</tag>
+	</scm>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-release-plugin</artifactId>
+			<version>2.5.3</version>
+			<type>maven-plugin</type>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+
+		<!-- Test Dependencies -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.7</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp</groupId>
+			<artifactId>mockwebserver</artifactId>
+			<version>2.0.0</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source>${jdkVersion}</source>
+					<target>${jdkVersion}</target>
+					<compilerVersion>1.5</compilerVersion>
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+					<debug>true</debug>
+					<fork>true</fork>
+					<compilerArgs>
+						<arg>-Xlint:unchecked</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>com.github.github</groupId>
+				<artifactId>site-maven-plugin</artifactId>
+				<version>0.12</version>
+				<configuration>
+					<message>Creating site for ${project.version}</message>
+					<server>github</server>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>site</goal>
+						</goals>
+						<phase>site</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.17</version>
+				<configuration>
+					<groups>cn.jpush.api.FastTests</groups>
+					<argLine>-Dfile.encoding=UTF-8</argLine>
+					<excludes>
+						<exclude>**/mock/*Test.java</exclude>
+					</excludes>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.surefire</groupId>
+						<artifactId>surefire-junit47</artifactId>
+						<version>2.17</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.8.1</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>license</report>
+							<report>scm</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+				<configuration>
+					<overview>resources/javadoc-overview.html</overview>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</reporting>
+
+</project>
diff --git a/release.properties b/release.properties
new file mode 100644
index 0000000..6550950
--- /dev/null
+++ b/release.properties
@@ -0,0 +1,16 @@
+#release configuration
+#Fri Jun 24 14:21:35 CST 2016
+scm.tag=jiguang-common-0.1.2
+scm.url=scm\:git\:git@github.com\:jpush/jiguang-java-client-common.git
+pushChanges=true
+preparationGoals=clean verify
+project.scm.cn.jpush.api\:jiguang-common.tag=v0.0.1
+project.dev.cn.jpush.api\:jiguang-common=0.1.3-SNAPSHOT
+project.scm.cn.jpush.api\:jiguang-common.url=https\://github.com/jpush/jiguang-java-client-common
+project.scm.cn.jpush.api\:jiguang-common.developerConnection=scm\:git\:git@github.com\:jpush/jiguang-java-client-common.git
+project.rel.cn.jpush.api\:jiguang-common=0.1.2
+remoteTagging=true
+scm.commentPrefix=[maven-release-plugin] 
+project.scm.cn.jpush.api\:jiguang-common.connection=scm\:git\:git@github.com\:jpush/jiguang-java-client-common.git
+exec.additionalArguments=\ -Psonatype-oss-release
+completedPhase=run-preparation-goals
diff --git a/src/main/java/cn/jpush/api/TestOrder.java b/src/main/java/cn/jpush/api/TestOrder.java
new file mode 100644
index 0000000..b3681d4
--- /dev/null
+++ b/src/main/java/cn/jpush/api/TestOrder.java
@@ -0,0 +1,9 @@
+package cn.jpush.api;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TestOrder {
+    public int order();
+}
\ No newline at end of file
diff --git a/src/main/java/cn/jiguang/commom/log4j.properties b/src/main/java/log4j.properties
similarity index 100%
rename from src/main/java/cn/jiguang/commom/log4j.properties
rename to src/main/java/log4j.properties