Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
9dfb8dcc
Commit
9dfb8dcc
authored
May 25, 2016
by
Yiming Liu
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #220 from nobodyiam/upgrade-client-version
Upgrade client version
parents
a66c3b41
d821de9e
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
88 additions
and
24 deletions
+88
-24
pom.xml
apollo-adminservice/pom.xml
+1
-1
startup.sh
apollo-adminservice/src/main/scripts/startup.sh
+18
-2
pom.xml
apollo-assembly/pom.xml
+1
-1
startup.sh
apollo-assembly/src/main/scripts/startup.sh
+18
-2
pom.xml
apollo-biz/pom.xml
+1
-1
pom.xml
apollo-buildtools/pom.xml
+1
-1
pom.xml
apollo-client/pom.xml
+1
-1
pom.xml
apollo-common/pom.xml
+1
-1
pom.xml
apollo-configservice/pom.xml
+1
-1
startup.sh
apollo-configservice/src/main/scripts/startup.sh
+18
-2
pom.xml
apollo-core/pom.xml
+1
-1
pom.xml
apollo-demo/pom.xml
+1
-1
pom.xml
apollo-portal/pom.xml
+1
-1
startup.sh
apollo-portal/src/main/scripts/startup.sh
+18
-2
pom.xml
pom.xml
+6
-6
No files found.
apollo-adminservice/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-adminservice/src/main/scripts/startup.sh
View file @
9dfb8dcc
#!/bin/bash
SERVICE_NAME
=
apollo-adminservice
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
PATH_TO_JAR
=
$SERVICE_NAME
".jar"
export
JAVA_OPTS
=
"-server -Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
export
JAVA_OPTS
=
"
$JAVA_OPTS
-Xloggc:/opt/logs/100003172/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003172/HeapDumpOnOutOfMemoryError/"
...
...
@@ -12,8 +11,25 @@ fi
cd
`
dirname
$0
`
/..
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
if
[[
!
-f
PATH_TO_JAR
&&
-d
current
]]
;
then
cd
current
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
fi
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
...
...
apollo-assembly/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-assembly/src/main/scripts/startup.sh
View file @
9dfb8dcc
#!/bin/bash
SERVICE_NAME
=
apollo-assembly
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
PATH_TO_JAR
=
$SERVICE_NAME
".jar"
export
JAVA_OPTS
=
"-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
export
JAVA_OPTS
=
"
$JAVA_OPTS
-Xloggc:/opt/logs/100003171/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003171/HeapDumpOnOutOfMemoryError/"
...
...
@@ -12,8 +11,25 @@ fi
cd
`
dirname
$0
`
/..
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
if
[[
!
-f
PATH_TO_JAR
&&
-d
current
]]
;
then
cd
current
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
fi
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
...
...
apollo-biz/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-biz
</artifactId>
...
...
apollo-buildtools/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-client/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-common/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-configservice/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-configservice/src/main/scripts/startup.sh
View file @
9dfb8dcc
#!/bin/bash
SERVICE_NAME
=
apollo-configservice
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
PATH_TO_JAR
=
$SERVICE_NAME
".jar"
export
JAVA_OPTS
=
"-server -Xms5632m -Xmx5632m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=2560m -XX:MaxNewSize=2560m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
export
JAVA_OPTS
=
"
$JAVA_OPTS
-Xloggc:/opt/logs/100003171/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003171/HeapDumpOnOutOfMemoryError/"
...
...
@@ -12,8 +11,25 @@ fi
cd
`
dirname
$0
`
/..
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
if
[[
!
-f
PATH_TO_JAR
&&
-d
current
]]
;
then
cd
current
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
fi
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
...
...
apollo-core/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-demo/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-demo
</artifactId>
...
...
apollo-portal/pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-portal/src/main/scripts/startup.sh
View file @
9dfb8dcc
#!/bin/bash
SERVICE_NAME
=
apollo-portal
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
PATH_TO_JAR
=
$SERVICE_NAME
".jar"
export
JAVA_OPTS
=
"-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
export
JAVA_OPTS
=
"
$JAVA_OPTS
-Xloggc:/opt/logs/100003173/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003173/HeapDumpOnOutOfMemoryError/"
...
...
@@ -12,8 +11,25 @@ fi
cd
`
dirname
$0
`
/..
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
if
[[
!
-f
PATH_TO_JAR
&&
-d
current
]]
;
then
cd
current
for
i
in
`
ls
$SERVICE_NAME
-
*
.jar 2>/dev/null
`
do
if
[[
!
$i
==
*
"-sources.jar"
]]
then
PATH_TO_JAR
=
$i
break
fi
done
fi
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
...
...
pom.xml
View file @
9dfb8dcc
...
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1
-SNAPSHOT
</version>
<version>
0.0.1
</version>
<name>
Apollo
</name>
<packaging>
pom
</packaging>
<description>
Ctrip Configuration Center
</description>
...
...
@@ -309,9 +309,9 @@
<version>
2.6
</version>
</plugin>
<plugin>
<groupId>
org.
apache.maven.plugins
</groupId>
<artifactId>
maven-release
-plugin
</artifactId>
<version>
2.
5.3
</version>
<groupId>
org.
codehaus.mojo
</groupId>
<artifactId>
versions-maven
-plugin
</artifactId>
<version>
2.
2
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
...
...
@@ -330,8 +330,8 @@
<artifactId>
findbugs-maven-plugin
</artifactId>
</plugin>
<plugin>
<groupId>
org.
apache.maven.plugins
</groupId>
<artifactId>
maven-release
-plugin
</artifactId>
<groupId>
org.
codehaus.mojo
</groupId>
<artifactId>
versions-maven
-plugin
</artifactId>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment