Skip to content

Commit

Permalink
Pom cleanup. (sofastack#8)
Browse files Browse the repository at this point in the history 
* Change scope of resteasy from provider to compile.

* Add javadoc plugin of sofa-rpc-all.

* Add description and others to sofa-rpc-all.
  • Loading branch information
@ujjboy
ujjboy authored Apr 13, 2018
1 parent 3413d7e commit 7c3dafa
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 129 deletions.
119 changes: 94 additions & 25 deletions all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
<artifactId>sofa-rpc-all</artifactId>
<version>5.3.0</version>

<name>${project.groupId}:${project.artifactId}</name>
<url>http://github.com/alipay/sofa-rpc</url>
<description>A high-performance, high-extensibility, production-level Java RPC framework.</description>

<inceptionYear>2008</inceptionYear>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<organization>
<name>The Ant Financial</name>
<url>http://www.antfin.com/</url>
Expand Down Expand Up @@ -38,6 +50,13 @@
<maven.compiler.target>1.6</maven.compiler.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<sofa.rpc.version>${project.version}</sofa.rpc.version>
<slf4j.version>1.7.21</slf4j.version>
<sofa.common.tools.version>1.0.12</sofa.common.tools.version>
<javassist.version>3.20.0-GA</javassist.version>
<netty.version>4.1.13.Final</netty.version>
<hessian.version>3.3.0</hessian.version>
<resteasy.version>3.0.12.Final</resteasy.version>
<bolt.version>1.4.1</bolt.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -107,12 +126,6 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-bootstrap-dubbo</artifactId>
<version>${sofa.rpc.version}</version>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
Expand All @@ -138,34 +151,62 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-registry-zk</artifactId>
<version>${sofa.rpc.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-remoting-bolt</artifactId>
<version>${sofa.rpc.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-remoting-resteasy</artifactId>
<version>${sofa.rpc.version}</version>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>bolt</artifactId>
<version>${bolt.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
<version>${sofa.common.tools.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>hessian</artifactId>
<version>${hessian.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-netty4</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -230,7 +271,10 @@
</goals>
<configuration>
<createSourcesJar>true</createSourcesJar>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
<keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
<createDependencyReducedPom>true</createDependencyReducedPom>
<dependencyReducedPomLocation>${basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
<include>com.alipay.sofa:sofa-rpc-common</include>
Expand Down Expand Up @@ -315,6 +359,31 @@
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<detectOfflineLinks>true</detectOfflineLinks>
<breakiterator>true</breakiterator>
<author>false</author>
<keywords>true</keywords>
<quiet>true</quiet>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>com.alipay.sofa:sofa-rpc-*</dependencySourceInclude>
</dependencySourceIncludes>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand All @@ -152,19 +151,16 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>${resteasy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-netty4</artifactId>
<version>${resteasy.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
Expand Down
0 core-impl/proxy/src/main/resources/log4j.xml → core-impl/proxy/src/test/resources/log4j.xml
View file
File renamed without changes.
1 change: 0 additions & 1 deletion extension-impl/remoting-bolt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
4 changes: 0 additions & 4 deletions extension-impl/remoting-resteasy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand All @@ -46,17 +45,14 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-netty4</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@
<profile>
<id>release</id>
<properties>
<maven.javadoc.quite>true</maven.javadoc.quite>
<maven.javadoc.skip>false</maven.javadoc.skip>
</properties>
</profile>
Expand Down
21 changes: 2 additions & 19 deletions test/test-integration-3rd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<artifactId>sofa-rpc-test-integration-3rd</artifactId>

<dependencies>
<!-- add all transitive dependencies for calculate code coverage -->
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-test-common</artifactId>
Expand All @@ -29,23 +30,11 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-bootstrap-dubbo</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-registry-zk</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -57,13 +46,7 @@
<artifactId>zkclient</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<scope>test</scope>
</dependency>


<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
Loading

0 comments on commit 7c3dafa

Please sign in to comment.