Skip to content

A
apollo
Commit 1ea0ac31 authored by Yiming Liu's avatar Yiming Liu
Browse files
Options

Fix github site issue

parent 1def2409
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 121 deletions
.travis.yml
View file @ 1ea0ac31
language: java language: java
jdk: jdk:
- oraclejdk8 - oraclejdk8
notification:
email:
recipients:
- liuyiming.vip@gmail.com,nobodyiam@gmail.com,lepdou@gmail.com
on_success: always
on_failure: always
before_script:
- echo "MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=512m'" > ~/.mavenrc
before_install: before_install:
- pip install --user codecov - pip install --user codecov
...@@ -17,6 +26,7 @@ branches: ...@@ -17,6 +26,7 @@ branches:
env: env:
global: global:
- secure: "DYJkJ7ArGJuIyTJsmjvUAJRyUKXEaGFWYZFAGZq6vxbrMN3tThz7drfNhhvP2YE7hdS7YX7hZBWVQEnNR+pBN+ykQFx7TpLr311eEk2/Yy3G5qegeHMsgqYXfAp3FFpYlE6Kr3Dcf4kFSWtRi735kSo5oHicoaxbyWENgmKT+uQjYERKhDXEoenMaDpcf8WO8KARzxI1cXf69ECnYP2rzNOfkNW4IGjTcJnplXPZ9BNBRn3WfyPwEHlemETAMwJxJXolNM9qn1bDBTB/35yJrneQY/pYp9Q8PbQID2lNJu7PFKYaI9mvsKHUgxjbzsC29zlMY94pDr6sQtr7IA0dSuk+qO2tEqAStTwRI5JOcozLAslTMNnUn6HLvy0/Kkq1TL+JrIohoRD58F34SzjcnuB4w0/GCWGU4BMSbzPwHsgQZM4lkHDWv+w1OSwP3dgCFI/vYYr9xNV0zqTgyZ9ITkMZPL0wOh0DZ7Bxxm80wyHfJuRwywemMtzitgjPR4BKENbpcoGN4lcKWciksAuiyX+dedOPfGoOWfnIKh1g7yeVB84LMggCSad/9cqnYf2Sm8xSyVzNmyhSOy2Ocy40RDas2uHIK3/QPy56Le/t1LD2On/x1TZBIoSavedNYA5N54s/ZCDZOcepUMvlwtjgnx/SMjU85ZLKCcliPGdTWws=" - secure: "DYJkJ7ArGJuIyTJsmjvUAJRyUKXEaGFWYZFAGZq6vxbrMN3tThz7drfNhhvP2YE7hdS7YX7hZBWVQEnNR+pBN+ykQFx7TpLr311eEk2/Yy3G5qegeHMsgqYXfAp3FFpYlE6Kr3Dcf4kFSWtRi735kSo5oHicoaxbyWENgmKT+uQjYERKhDXEoenMaDpcf8WO8KARzxI1cXf69ECnYP2rzNOfkNW4IGjTcJnplXPZ9BNBRn3WfyPwEHlemETAMwJxJXolNM9qn1bDBTB/35yJrneQY/pYp9Q8PbQID2lNJu7PFKYaI9mvsKHUgxjbzsC29zlMY94pDr6sQtr7IA0dSuk+qO2tEqAStTwRI5JOcozLAslTMNnUn6HLvy0/Kkq1TL+JrIohoRD58F34SzjcnuB4w0/GCWGU4BMSbzPwHsgQZM4lkHDWv+w1OSwP3dgCFI/vYYr9xNV0zqTgyZ9ITkMZPL0wOh0DZ7Bxxm80wyHfJuRwywemMtzitgjPR4BKENbpcoGN4lcKWciksAuiyX+dedOPfGoOWfnIKh1g7yeVB84LMggCSad/9cqnYf2Sm8xSyVzNmyhSOy2Ocy40RDas2uHIK3/QPy56Le/t1LD2On/x1TZBIoSavedNYA5N54s/ZCDZOcepUMvlwtjgnx/SMjU85ZLKCcliPGdTWws="
- "MAVEN_OPTS=-Xmx2g"
addons: addons:
coverity_scan: coverity_scan:
......
apollo-adminservice/pom.xml
View file @ 1ea0ac31
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-adminservice</artifactId> <artifactId>apollo-adminservice</artifactId>
<name>Apollo AdminService</name> <name>Apollo AdminService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<!-- apollo --> <!-- apollo -->
<dependency> <dependency>
......
apollo-biz/pom.xml
View file @ 1ea0ac31
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
<artifactId>apollo-biz</artifactId> <artifactId>apollo-biz</artifactId>
<name>Apollo Biz</name> <name>Apollo Biz</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
......
apollo-buildtools/pom.xml
View file @ 1ea0ac31
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
<artifactId>apollo</artifactId> <artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-buildtools</artifactId> <artifactId>apollo-buildtools</artifactId>
<name>Apollo BuildTools</name> <name>Apollo BuildTools</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
</project> </project>
apollo-client/pom.xml
View file @ 1ea0ac31
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
<artifactId>apollo</artifactId> <artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-client</artifactId> <artifactId>apollo-client</artifactId>
<name>Apollo Client</name> <name>Apollo Client</name>
<properties> <properties>
<java.version>1.7</java.version> <java.version>1.7</java.version>
</properties> <github.path>${project.artifactId}</github.path>
<dependencies> </properties>
<!-- apollo --> <dependencies>
<dependency> <!-- apollo -->
<groupId>com.ctrip.apollo</groupId> <dependency>
<artifactId>apollo-core</artifactId> <groupId>com.ctrip.apollo</groupId>
</dependency> <artifactId>apollo-core</artifactId>
<!-- end of apollo --> </dependency>
<!-- foundation service --> <!-- end of apollo -->
<dependency> <!-- foundation service -->
<groupId>com.ctrip.framework</groupId> <dependency>
<artifactId>framework-foundation</artifactId> <groupId>com.ctrip.framework</groupId>
</dependency> <artifactId>framework-foundation</artifactId>
<!-- end of foundation service --> </dependency>
<!-- cat --> <!-- end of foundation service -->
<dependency> <!-- cat -->
<groupId>com.dianping.cat</groupId> <dependency>
<artifactId>cat-client</artifactId> <groupId>com.dianping.cat</groupId>
</dependency> <artifactId>cat-client</artifactId>
<!-- end of cat --> </dependency>
<!-- log --> <!-- end of cat -->
<dependency> <!-- log -->
<groupId>org.slf4j</groupId> <dependency>
<artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId>
</dependency> <artifactId>slf4j-api</artifactId>
<dependency> </dependency>
<groupId>org.apache.logging.log4j</groupId> <dependency>
<artifactId>log4j-slf4j-impl</artifactId> <groupId>org.apache.logging.log4j</groupId>
<exclusions> <artifactId>log4j-slf4j-impl</artifactId>
<exclusion> <exclusions>
<groupId>org.slf4j</groupId> <exclusion>
<artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId>
</exclusion> <artifactId>slf4j-api</artifactId>
<exclusion> </exclusion>
<groupId>org.apache.logging.log4j</groupId> <exclusion>
<artifactId>log4j-api</artifactId> <groupId>org.apache.logging.log4j</groupId>
</exclusion> <artifactId>log4j-api</artifactId>
</exclusions> </exclusion>
<scope>provided</scope> </exclusions>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>org.apache.logging.log4j</groupId> <dependency>
<artifactId>log4j-core</artifactId> <groupId>org.apache.logging.log4j</groupId>
<scope>provided</scope> <artifactId>log4j-core</artifactId>
</dependency> <scope>provided</scope>
<!-- end of log --> </dependency>
<!-- test --> <!-- end of log -->
<dependency> <!-- test -->
<groupId>org.eclipse.jetty</groupId> <dependency>
<artifactId>jetty-server</artifactId> <groupId>org.eclipse.jetty</groupId>
<scope>test</scope> <artifactId>jetty-server</artifactId>
</dependency> <scope>test</scope>
<!-- end of test --> </dependency>
</dependencies> <!-- end of test -->
</dependencies>
</project> </project>
apollo-common/pom.xml
View file @ 1ea0ac31
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-common</artifactId> <artifactId>apollo-common</artifactId>
<name>Apollo Common</name> <name>Apollo Common</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
......
apollo-configservice/pom.xml
View file @ 1ea0ac31
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-configservice</artifactId> <artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name> <name>Apollo ConfigService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<!-- apollo --> <!-- apollo -->
<dependency> <dependency>
......
apollo-core/pom.xml
View file @ 1ea0ac31
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
<artifactId>apollo-core</artifactId> <artifactId>apollo-core</artifactId>
<name>Apollo Core</name> <name>Apollo Core</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<!-- json --> <!-- json -->
<dependency> <dependency>
......
apollo-demo/pom.xml
View file @ 1ea0ac31
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent>
<parent> <artifactId>apollo</artifactId>
<artifactId>apollo</artifactId> <groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.apollo</groupId> <version>0.0.1-SNAPSHOT</version>
<version>0.0.1-SNAPSHOT</version> </parent>
</parent> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <artifactId>apollo-demo</artifactId>
<artifactId>apollo-demo</artifactId> <name>Apollo Demo</name>
<name>Apollo Demo</name> <packaging>jar</packaging>
<packaging>jar</packaging> <properties>
<dependencies> <github.path>${project.artifactId}</github.path>
<dependency> </properties>
<groupId>com.ctrip.apollo</groupId> <dependencies>
<artifactId>apollo-client</artifactId> <dependency>
<version>${project.version}</version> <groupId>com.ctrip.apollo</groupId>
</dependency> <artifactId>apollo-client</artifactId>
<dependency> <version>${project.version}</version>
<groupId>org.apache.logging.log4j</groupId> </dependency>
<artifactId>log4j-core</artifactId> <dependency>
</dependency> <groupId>org.apache.logging.log4j</groupId>
<dependency> <artifactId>log4j-core</artifactId>
<groupId>org.apache.logging.log4j</groupId> </dependency>
<artifactId>log4j-api</artifactId> <dependency>
</dependency> <groupId>org.apache.logging.log4j</groupId>
<dependency> <artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId> </dependency>
<artifactId>log4j-slf4j-impl</artifactId> <dependency>
</dependency> <groupId>org.apache.logging.log4j</groupId>
<dependency> <artifactId>log4j-slf4j-impl</artifactId>
<groupId>commons-logging</groupId> </dependency>
<artifactId>commons-logging</artifactId> <dependency>
</dependency> <groupId>commons-logging</groupId>
</dependencies> <artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
</project> </project>
apollo-portal/pom.xml
View file @ 1ea0ac31
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-portal</artifactId> <artifactId>apollo-portal</artifactId>
<name>Apollo Portal</name> <name>Apollo Portal</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
......
pom.xml
View file @ 1ea0ac31
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<jetty.version>9.3.8.v20160314</jetty.version> <jetty.version>9.3.8.v20160314</jetty.version>
<github.global.server>github</github.global.server> <github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token> <github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
<github.path></github.path>
</properties> </properties>
<modules> <modules>
...@@ -175,13 +176,6 @@ ...@@ -175,13 +176,6 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>1.1.0.M5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
...@@ -299,7 +293,9 @@ ...@@ -299,7 +293,9 @@
<artifactId>site-maven-plugin</artifactId> <artifactId>site-maven-plugin</artifactId>
<version>0.12</version> <version>0.12</version>
<configuration> <configuration>
<message>Building site for ${project.version}</message> <message>Site for ${project.artifactId}, ${project.version}</message>
<path>${github.path}</path>
<merge>true</merge>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment