Skip to content

S
solo
Commit 84ff0dec authored by Liang Ding's avatar Liang Ding
Browse files
Options

项目构建简化 

去除多余的 maven 插件、依赖。
parent 14ee547f
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 641 deletions
nbactions.xml
View file @ 84ff0dec
......@@ -10,6 +10,15 @@
<jpda.listen>maven</jpda.listen>
</properties>
</action>
<action>
<actionName>CUSTOM-release</actionName>
<displayName>release</displayName>
<goals>
<goal>clean</goal>
<goal>min:min</goal>
<goal>install</goal>
</goals>
</action>
<action>
<actionName>CUSTOM-license-check</actionName>
<displayName>license-check</displayName>
......@@ -24,11 +33,4 @@
<goal>license:format</goal>
</goals>
</action>
<action>
<actionName>CUSTOM-checkstyle-checkstyle</actionName>
<displayName>checkstyle-checkstyle</displayName>
<goals>
<goal>checkstyle:checkstyle</goal>
</goals>
</action>
</actions>
pom.xml
View file @ 84ff0dec
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 2.3.1.6, Sep 28, 2015
Version: 2.3.1.7, Sep 30, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -101,16 +101,6 @@
<scm>
<url>https://github.com/b3log/solo</url>
</scm>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
<version>${maven-javancss-plugin.version}</version>
</plugin>
</plugins>
</reporting>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -120,20 +110,16 @@
<servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
<freemarker-gae.version>2.3.20</freemarker-gae.version>
<jsoup.version>1.5.2</jsoup.version>
<markdownpapers-core.version>1.3.2</markdownpapers-core.version>
<markdownpapers-core.version>1.4.2</markdownpapers-core.version>
<qiniu.version>7.0.4.1</qiniu.version>
<!-- maven plugin -->
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.5</maven-resources-plugin.version>
<maven-surefire-plugin.version>2.9</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<maven-license-plugin.version>1.9.0</maven-license-plugin.version>
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
<maven-javancss-plugin.version>2.0</maven-javancss-plugin.version>
<maven-javadoc-plugin.version>2.7</maven-javadoc-plugin.version>
<coveralls-maven-plugin.version>3.0.1</coveralls-maven-plugin.version>
<coveralls-maven-plugin.version>4.0.0</coveralls-maven-plugin.version>
<maven-min-plugin.version>1.0.0</maven-min-plugin.version>
<!-- Unit Test -->
<testng.version>6.1.1</testng.version>
......@@ -147,12 +133,18 @@
<groupId>org.b3log</groupId>
<artifactId>latke</artifactId>
<version>${org.b3log.latke.version}</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
......@@ -188,19 +180,6 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker-gae</artifactId>
<version>${freemarker-gae.version}</version>
</dependency>
<dependency>
<groupId>org.tautua.markdownpapers</groupId>
<artifactId>markdownpapers-core</artifactId>
......@@ -271,17 +250,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
......@@ -302,32 +270,6 @@
</configuration>
</plugin>
<plugin>
<groupId>com.tiobe.jacobe</groupId>
<artifactId>maven-jacobe-plugin</artifactId>
<version>1.0</version>
<configuration>
<jacobeExecutable>${jacobeExecutable}</jacobeExecutable>
<rules>
<param>indent=4</param>
<param>continuationindent=2</param>
</rules>
<configurationFile>../src/main/resources/etc/jacobe/sun.cfg</configurationFile>
<comparisonThreshold>0.01</comparisonThreshold>
<javadoc>private</javadoc>
<noAssert>true</noAssert>
<noEnum>false</noEnum>
<noBackup>true</noBackup>
<overwrite>true</overwrite>
<outputExtension>formatted</outputExtension>
<input>src/main/java</input>
</configuration>
<executions>
<!-- <execution> <phase>process-resources</phase> <goals> <goal>jacobe</goal>
</goals> </execution> -->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
......@@ -428,12 +370,14 @@
<jsTargetDir>src/main/webapp/js</jsTargetDir>
</configuration>
<executions>
<!--
<execution>
<phase>process-resources</phase>
<goals>
<goal>min</goal>
</goals>
</execution>
-->
</executions>
</plugin>
......
src/main/java/org/b3log/solo/service/InitService.java
View file @ 84ff0dec
......@@ -268,7 +268,7 @@ public class InitService {
req.setURL(new URL(Latkes.getServePath() + "/blog/symphony/user"));
urlFetchService.fetch(req);
} catch (final Exception e) {
LOGGER.log(Level.WARN, "Sync account failed");
LOGGER.log(Level.TRACE, "Sync account failed");
}
pluginManager.load();
......
src/main/resources/etc/beyondtrack_checks.xml deleted 100644 → 0
View file @ 14ee547f
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2008, 2009, 2010, 2011, 2012, B3log Team
The contents of this file are subject to the terms of the Common
Development and Distribution License (the License). You may not
use this file except in compliance with the License.
You can obtain a copy of the License at
https://beyondtrack.dev.java.net/License/CDDL1.txt
See the License for the specific language governing
permission and limitations under the License.
When distributing Covered Code, include this CDDL
Header Notice in each file and include the License file
at BeyondTrack/License/CDDL1.txt
See all project members at:
https://beyondtrack.dev.java.net/servlets/ProjectMemberList
-->
<!--
Description: BeyondTrack coding conventions check configuration
for CheckStyle. Checkstyle configuration that checks the sun
coding conventions from:
- the Java Language Specification at
http://java.sun.com/docs/books/jls/second_edition/html/index.html
- the Sun Code Conventions at http://java.sun.com/docs/codeconv/
- the Javadoc guidelines at
http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
- the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
- some best practices
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
Most Checks are configurable, be sure to consult the documentation.
To completely disable a check, just comment it out or delete it from the file.
Finally, it is worth reading the documentation.
Version: 1.0.1.7, Jan 9, 2013
Author: Liang Ding
-->
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<module name="FileLength"/>
<module name="FileTabCharacter"/>
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
<!-- <module name="PackageHtml"/> -->
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
<!-- module name="NewlineAtEndOfFile"/ -->
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
<module name="TreeWalker">
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<property name="cacheFile" value="target/checkstyle-cache"/>
<module name="JavadocMethod"/>
<module name="JavadocType">
<property name="authorFormat" value="\S"/>
<property name="versionFormat" value="\d+\.\d+\.\d+\.\d+, [A-Z]+[a-z]{2,2} \d{1,2}, \d\d\d\d"/>
</module>
<module name="JavadocVariable"/>
<module name="JavadocStyle">
<property name="checkFirstSentence" value="true"/>
</module>
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<module name="AbstractClassName" />
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="ConstantName" />
<module name="TypeName"/>
<!-- Checks for Headers -->
<!-- See http://checkstyle.sf.net/config_header.html -->
<!-- <module name="Header"> -->
<!-- The follow property value demonstrates the ability -->
<!-- to have access to ANT properties. In this case it uses -->
<!-- the ${basedir} property to allow Checkstyle to be run -->
<!-- from any directory within a project. See property -->
<!-- expansion, -->
<!-- http://checkstyle.sf.net/config.html#properties -->
<!-- <property -->
<!-- name="headerFile" -->
<!-- value="${basedir}/java.header"/> -->
<!-- </module> -->
<!-- Following interprets the header file as regular expressions. -->
<!-- <module name="RegexpHeader"/> -->
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_imports.html -->
<!--<module name="AvoidStarImport"/>-->
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes .html -->
<!--
<module name="LineLength">
<property name="max" value="140"/>
</module>
-->
<module name="MethodLength"/>
<module name="ParameterNumber"/>
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
<module name="MethodParamPad"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!--<module name="AvoidInlineConditionals"/>-->
<module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="FinalLocalVariable">
<property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
</module>
<module name="HiddenField">
<property name="tokens" value="VARIABLE_DEF"/>
</module>
<module name="IllegalCatch">
<property name="illegalClassNames" value="java.lang.Throwable, java.lang.RuntimeException" />
</module>
<module name="IllegalInstantiation"/>
<module name="IllegalThrows"/>
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="UnnecessaryParentheses"/>
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
<!-- <module name="DesignForExtension"/> -->
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="VisibilityModifier"/>
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
<!-- <module name="FinalParameters"/> -->
<!--
<module name="GenericIllegalRegexp">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
<property name="format" value="System\.out\.println"/>
<property name="message" value="System.out.println invoked!"/>
</module>
-->
<!-- <module name="TodoComment"/> -->
<module name="UpperEll"/>
</module>
</module>
src/main/resources/etc/jacobe/sun.cfg deleted 100644 → 0
View file @ 14ee547f
// Jacobe configuration file for the Sun code conventions for Java
// $Id: sun.cfg,v 1.94 2006/05/31 09:29:01 stappers Exp $
// reference: http://java.sun.com/docs/codeconv/
// (c) 2000-2006 Tiobe Software BV -- All rights reserved
// support@jacobe.com, www.jacobe.com, Eindhoven, The Netherlands
// INDENTATION
// -----------
--indent=4
//--indenttab=1
//--tablen=4
//--unindentjumplabel
// LINE LENGTH
// -----------
--wrap=140
// WRAPPING LINES
// --------------
//--wrapinfixoplineterm=1
--wraplineterminfixop=1
--indentcontinuation=2
//--continuationindent=4
//--wraplinetermcomma=1
--wrapcommalineterm=1
--wraparrayinitopenbracelineterm=1
--wrapmethodcallopenparenlineterm=1
//--wrapassoplineterm=1
// COMMENTS
// --------
--opencommentspace=1
//--opencommentlineterm=1
--indentcomment=1
//--commentstarspace=1
// JAVADOC
// -------
// The rules below are only available in Jacobe Professional
--javadocstartlineterm=1
--linetermendjavadoc=1
--javadocdescr
--javadocdescrlineterm=2
--javadocauthor
--javadocauthorlineterm=1
--javadocversion
--javadocversionlineterm=2
--javadocparam
--javadocparamorder
--javadocparamlineterm=1
--javadocreturn
--javadocreturnlineterm=1
--javadocthrows
--javadocthrowsorder
--javadocthrowslineterm=1
--javadocorder
--javadoctagspacearg=1
// DECLARATIONS AND STATEMENTS
// ---------------------------
--colonlineterm=1
--spaceopenbrace=1
--closebracelineterm=1
--openbracespace=1
--openbracespaceclosebrace=0
--openbracelinetermclosebrace=0
--openparenspacecloseparen=0
--linetermopenbracket=0
--indentbraces=0
--indentblock=1
//--dimopenbracketspace=0
//--dimspaceclosebracket=0
//--indexopenbracketspace=0
//--indexspaceclosebracket=0
--openbracketspaceclosebracket=0
// DECLARATIONS
// ------------
--decllineterm=1
--modifierslineterm=0
--modifiersspace=1
//--typespace=1
--classspace=1
--classlineterm=0
--classlinetermopenbrace=0
--classopenbracelineterm=1
--classlinetermclosebrace=1
--spaceextends=1
--extendsspace=1
--linetermextends=0
--extendslineterm=0
//--linetermimplements=0
//--implementslineterm=0
//--linetermthrows=0
--methodlinetermopenbrace=0
--methodopenbracelineterm=1
--methodlinetermclosebrace=1
//--arrayinitlinetermopenbrace=0
//--arrayinitopenbracelineterm=0
//--arrayinitlinetermclosebrace=0
//--arrayinitclosebracelineterm=0
--arrayinitopenbracespace=0
--arrayinitspaceclosebrace=0
--returntypelineterm=0
//--typelineterm=0
//--paramtypelineterm=0
//--fortypelineterm=0
//--declarraytoarraytype
//--linetermclass=1
//--linetermconstructor=1
--closebracelinetermopenbrace=1
--importlineterm=0
--modifierlineterm=0
//--seplineterm=0
//--paramopenparenlineterm=0
//--paramlinetermcloseparen=0
//--paramlinetermopenparen=0
//--paramcloseparenlineterm=0
//--paramspaceopenparen=0
//--enumcommalineterm=0
// SIMPLE STATEMENTS
// -----------------
--statlineterm=1
--methodcallspaceopenparen=0
--methodcalllinetermopenparen=0
--dotlineterm=0
--linetermdot=0
--linetermsep=0
--lineterminfixop=0
--infixoplineterm=0
--prefixoplineterm=0
--linetermpostfixop=0
--linetermcomma=0
--commalineterm=0
--openparenlineterm=0
--linetermcloseparen=0
--assoplineterm=0
--linetermassop=0
// COMPOUND STATEMENTS
// -------------------
--blocklinetermopenbrace=0
--blockopenbracelineterm=1
--blocklinetermclosebrace=1
--insertbraces
--blockstatlinetermopenbrace=0
// IF STATEMENTS
// -------------
--spaceelse=1
--closebracelinetermelse=0
//--semicolonlinetermelse=1
--elselinetermif=0
// FOR STATEMENTS
// --------------
--forstatlineterm=0
// DO-WHILE STATEMENTS
// -------------------
--closebracelinetermdowhile=0
--semicolonlinetermdowhile=1
// SWITCH STATEMENTS
// -----------------
--blanklinescase=1
--indentcase=0
//--insertbracescasestats
// TRY-CATCH STATEMENTS
// --------------------
--spacecatch=1
--linetermcatch=0
--spacefinally=1
--linetermfinally=0
// WHITE SPACE
// -----------
//--lineterm
// BLANK LINES
// -----------
//--blanklinescompilationunit=0
--methodblanklines=1
--declblanklinesstat=1
--statblanklinesdecl=0
--blanklinescomment=1
--sectionblanklines=2
--classblanklines=2
//--enumconstantblanklinesdecl=1
// SPACES
// ------
//--keywordspace=1
--keywordspaceopenparen=1
--keywordlinetermopenparen=0
--methodnamespace=0
--spacecomma=0
--commaspace=1
--spacesemicolon=0
--semicolonspace=1
--spacecolon=0
--colonspace=1
--assignspace=1
--spaceassign=1
--dotspace=0
--spacedot=0
--prefixopspace=0
--infixopspace=1
--spaceinfixop=1
--spacepostfixop=0
--spaceopenbracket=0
--castspace=1
--castopenparenspace=0
--castspacecloseparen=0
//--castopenparenlineterm=0
//--castlinetermcloseparen=0
//--castlinetermopenparen=0
//--castcloseparenlineterm=0
//--castspaceopenparen=0
//--castcloseparenspace=0
//--statopenparenlineterm=0
//--statlinetermcloseparen=0
//--statcloseparenspace=0
//--statcloseparenlineterm=0
//--castcloseparenspacegroupopenparen=1
--statopenparenspace=0
--statspacecloseparen=0
--groupopenparenspace=0
--groupspacecloseparen=0
//--groupspaceopenparen=0
//--groupcloseparenspace=0
//--groupopenparenlineterm=0
//--grouplinetermcloseparen=0
//--grouplinetermopenparen=0
//--groupcloseparenlineterm=0
--methodopenparenspace=0
--methodspacecloseparen=0
//--methodopenparenlineterm=0
//--methodlinetermcloseparen=0
//--methodcloseparenspace=0
//--methodcloseparenlineterm=0
//--horspaceslineterm
// ANNOTATIONS
// -----------
//--annotationatspace=0
//--annotationatlineterm=0
//--annotationspaceopenparen=0
//--annotationlinetermopenparen=0
//--annotationopenparenspace=0
//--annotationopenparenlineterm=0
//--annotationspacecloseparen=0
//--annotationlinetermcloseparen=0
//--annotationcloseparenspace=0
//--annotationcloseparenlineterm=0
//--annotationspaceopenbrace=0
//--annotationlinetermopenbrace=0
//--annotationopenbracespace=0
//--annotationopenbracelineterm=0
//--annotationspaceclosebrace=0
//--annotationlinetermclosebrace=0
//--annotationclosebracespace=0
//--annotationclosebracelineterm=0
//--annotationspace=1
//--annotationlineterm=1
src/test/resources/log4j.properties
View file @ 84ff0dec
......@@ -16,18 +16,17 @@
#
# Description: Solo logging configurations for tesing.
# Version: 1.0.0.0, Jul 8, 2013
# Version: 1.0.0.0, Sep 30, 2015
# Author: Liang Ding
#
log4j.rootLogger=INFO, stdout
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n
log4j.logger.org.b3log.solo=DEBUG
log4j.logger.org.b3log.latke=DEBUG
log4j.logger.org.b3log.solo=WARN
log4j.logger.org.b3log.latke=ERROR
src/test/resources/skins/classic/skin.properties deleted 100644 → 0
View file @ 14ee547f
#
# Copyright (C) 2009, 2010, 2010, B3log Team
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# Description: Classic blue skin (mock for test).
# Version: 1.0.0.0, Jan 7, 2012
# Author: Liang Ding
#
name=\u7ecf\u5178\u6de1\u84dd
version=2.0.1
forSolo=0.4.1
memo=\u8fd9\u4e2a\u76ae\u80a4\u5f88\u4e11\u4e48\uff1f\u6211\u52d2\u4e2a\u53bb\u3002
src/test/resources/skins/ease/skin.properties deleted 100644 → 0
View file @ 14ee547f
#
# Copyright (C) 2009, 2010, 2011, B3log Team
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# Description: ease skin (mock for test).
# Version: 1.0.0.3, Feb 4, 2013
# Author: Liang Ding
#
name=ease
version=1.0.3
forSolo=0.5.6
memo=\u56de\u5f52\u606c\u9759
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