This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit e519b350798059e9c9e311bb25a03cb5ce3a7691 Author: Daniel Qian <[email protected]> AuthorDate: Thu Nov 14 10:42:16 2019 +0800 SCB-1573 Cleanup third party dependency version Manage third parties version and maven plugins version the root pom.xml --- cli/pom.xml | 18 +- codegen/pom.xml | 20 -- common/pom.xml | 8 - contractgen/pom.xml | 9 - core/pom.xml | 10 - docgen/pom.xml | 8 - integration-tests/coverage-aggregate/pom.xml | 1 - integration-tests/pom.xml | 1 - oas-generator/oas-generator-core/pom.xml | 1 + oas-generator/oas-generator-jaxrs/pom.xml | 5 + oas-generator/oas-generator-servicecomb/pom.xml | 6 + oas-generator/oas-generator-spring/pom.xml | 5 + oas-generator/pom.xml | 99 +------- oas-validator/oas-validator-compliance/pom.xml | 2 - oas-validator/oas-validator-web/pom.xml | 4 +- oas-validator/pom.xml | 76 ------ pom.xml | 322 +++++++++++++++++++++++- toolkit-distribution/pom.xml | 76 +++--- toolkit-maven-plugin/pom.xml | 22 +- 19 files changed, 378 insertions(+), 315 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 00618bf..43ebf97 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -23,6 +23,7 @@ <artifactId>toolkit</artifactId> <groupId>org.apache.servicecomb.toolkit</groupId> <version>0.2.0-SNAPSHOT</version> + <relativePath>../</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -30,7 +31,7 @@ <properties> <main.class>org.apache.servicecomb.toolkit.cli.ToolkitMain</main.class> - <log4j2.version>2.3</log4j2.version> + </properties> <dependencies> @@ -43,7 +44,6 @@ <artifactId>annotations</artifactId> </exclusion> </exclusions> - <version>0.7</version> </dependency> <dependency> @@ -54,7 +54,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> @@ -66,19 +65,16 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> @@ -97,26 +93,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>1.5.12.RELEASE</version> <configuration> <fork>true</fork> <mainClass>${main.class}</mainClass> diff --git a/codegen/pom.xml b/codegen/pom.xml index 4963938..b338395 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -28,15 +28,6 @@ <artifactId>codegen</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <swagger-codegen-version>2.4.3</swagger-codegen-version> - <maven-plugin-version>1.0.0</maven-plugin-version> - <junit-version>4.8.1</junit-version> - <log4j2.version>2.3</log4j2.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> @@ -46,7 +37,6 @@ <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-codegen</artifactId> - <version>${swagger-codegen-version}</version> <exclusions> <exclusion> <groupId>org.checkerframework</groupId> @@ -66,31 +56,26 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency><!-- 桥接：告诉commons logging使用Log4j2 --> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> </dependencies> @@ -100,11 +85,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> - <configuration> - <source>8</source> - <target>8</target> - </configuration> </plugin> </plugins> diff --git a/common/pom.xml b/common/pom.xml index 0149615..0479c2a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -37,7 +37,6 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>5.3.0.201903130848-r</version> <exclusions> <exclusion> <groupId>org.bouncycastle</groupId> @@ -57,14 +56,12 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.25.0</version> <scope>test</scope> </dependency> </dependencies> @@ -74,11 +71,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> </plugins> </build> diff --git a/contractgen/pom.xml b/contractgen/pom.xml index b5c5a87..cd2564f 100644 --- a/contractgen/pom.xml +++ b/contractgen/pom.xml @@ -52,28 +52,24 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.25.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>3.3.0</version> <scope>test</scope> </dependency> </dependencies> @@ -83,11 +79,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> </plugins> </build> diff --git a/core/pom.xml b/core/pom.xml index 4683cdf..fcf7c91 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,15 +28,10 @@ <artifactId>core</artifactId> - <properties> - <swagger-codegen-version>2.4.3</swagger-codegen-version> - </properties> - <dependencies> <dependency> <groupId>org.openapitools</groupId> <artifactId>openapi-generator</artifactId> - <version>4.1.2</version> </dependency> </dependencies> @@ -45,11 +40,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> </plugins> </build> diff --git a/docgen/pom.xml b/docgen/pom.xml index 417ecef..df8436d 100644 --- a/docgen/pom.xml +++ b/docgen/pom.xml @@ -48,7 +48,6 @@ <dependency> <groupId>org.apache.servicecomb</groupId> <artifactId>swagger-generator-core</artifactId> - <version>1.2.0</version> <exclusions> <exclusion> <groupId>org.checkerframework</groupId> @@ -64,13 +63,11 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> @@ -80,11 +77,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> </plugins> </build> diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index f34941b..5dc42f9 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -62,7 +62,6 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index b79e8a9..eae80a5 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -37,7 +37,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> <configuration> <skip>true</skip> </configuration> diff --git a/oas-generator/oas-generator-core/pom.xml b/oas-generator/oas-generator-core/pom.xml index 23d5d02..2a11ebe 100644 --- a/oas-generator/oas-generator-core/pom.xml +++ b/oas-generator/oas-generator-core/pom.xml @@ -47,6 +47,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> diff --git a/oas-generator/oas-generator-jaxrs/pom.xml b/oas-generator/oas-generator-jaxrs/pom.xml index 807d9cf..ba38025 100644 --- a/oas-generator/oas-generator-jaxrs/pom.xml +++ b/oas-generator/oas-generator-jaxrs/pom.xml @@ -38,6 +38,11 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.powermock</groupId> diff --git a/oas-generator/oas-generator-servicecomb/pom.xml b/oas-generator/oas-generator-servicecomb/pom.xml index 1b250c4..e2d15b8 100644 --- a/oas-generator/oas-generator-servicecomb/pom.xml +++ b/oas-generator/oas-generator-servicecomb/pom.xml @@ -54,6 +54,12 @@ </exclusions> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/oas-generator/oas-generator-spring/pom.xml b/oas-generator/oas-generator-spring/pom.xml index 7e832f5..ab2edbd 100644 --- a/oas-generator/oas-generator-spring/pom.xml +++ b/oas-generator/oas-generator-spring/pom.xml @@ -36,6 +36,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/oas-generator/pom.xml b/oas-generator/pom.xml index 3477019..f5dae84 100644 --- a/oas-generator/pom.xml +++ b/oas-generator/pom.xml @@ -34,99 +34,12 @@ <artifactId>oas-generator</artifactId> - <properties> - <swagger.version>2.0.10</swagger.version> - <junit.version>4.12</junit.version> - <asm.version>7.2</asm.version> - <powermock.version>1.6.2</powermock.version> - <javachassis.version>1.2.0</javachassis.version> - <spring.version>5.1.6.RELEASE</spring.version> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-models</artifactId> - <version>${swagger.version}</version> - </dependency> - - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - <version>${swagger.version}</version> - </dependency> - - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-core</artifactId> - <version>${swagger.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>${asm.version}</version> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.1</version> - </dependency> - - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-rest-common</artifactId> - <version>${javachassis.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-pojo</artifactId> - <version>${javachassis.version}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <target>1.8</target> - <source>1.8</source> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + </plugins> </build> </project> \ No newline at end of file diff --git a/oas-validator/oas-validator-compliance/pom.xml b/oas-validator/oas-validator-compliance/pom.xml index 33b4f42..5edd334 100644 --- a/oas-validator/oas-validator-compliance/pom.xml +++ b/oas-validator/oas-validator-compliance/pom.xml @@ -56,14 +56,12 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-test</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core-spring</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/oas-validator/oas-validator-web/pom.xml b/oas-validator/oas-validator-web/pom.xml index f65b1c6..176831a 100644 --- a/oas-validator/oas-validator-web/pom.xml +++ b/oas-validator/oas-validator-web/pom.xml @@ -83,13 +83,12 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> - <version>4.3.1</version> </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> </dependency> </dependencies> @@ -110,7 +109,6 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot.version}</version> <executions> <execution> <id>boot-repackage</id> diff --git a/oas-validator/pom.xml b/oas-validator/pom.xml index cc48467..bd09062 100644 --- a/oas-validator/pom.xml +++ b/oas-validator/pom.xml @@ -30,21 +30,6 @@ <artifactId>oas-validator-parent</artifactId> <packaging>pom</packaging> - <properties> - <java.version>1.8</java.version> - <maven.compiler.source>${java.version}</maven.compiler.source> - <maven.compiler.target>${java.version}</maven.compiler.target> - <fabric8.dmp.version>0.28.0</fabric8.dmp.version> - - <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version> - <maven.surefire.version>3.0.0-M3</maven.surefire.version> - - <swagger-parser.version>2.0.15</swagger-parser.version> - <commons-collections4.version>4.3</commons-collections4.version> - <commons-io.version>2.6</commons-io.version> - <spring-boot.version>2.1.4.RELEASE</spring-boot.version> - </properties> - <modules> <module>oas-validator-core</module> <module>oas-validator-core-spring</module> @@ -56,65 +41,4 @@ <module>oas-validator-web</module> </modules> - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commons-collections4.version}</version> - </dependency> - - <dependency> - <groupId>io.swagger.parser.v3</groupId> - <artifactId>swagger-parser</artifactId> - <version>${swagger-parser.version}</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven.surefire.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven.surefire.version}</version> - <executions> - <execution> - <id>report</id> - <phase>post-integration-test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </pluginManagement> - - </build> - - </project> diff --git a/pom.xml b/pom.xml index 75c7d8c..446cda0 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,51 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <java.version>1.8</java.version> + <maven.compiler.source>${java.version}</maven.compiler.source> + <maven.compiler.target>${java.version}</maven.compiler.target> + + <javax.ws.rs-api.version>2.1</javax.ws.rs-api.version> + <swagger.version>2.0.10</swagger.version> + <swagger-codegen.version>2.4.3</swagger-codegen.version> + <junit.version>4.12</junit.version> + <asm.version>7.2</asm.version> + <powermock.version>1.6.2</powermock.version> + <javachassis.version>1.2.0</javachassis.version> + <spring.version>5.1.6.RELEASE</spring.version> + <airline.version>0.7</airline.version> + <log4j2.version>2.3</log4j2.version> + <org.eclipse.jgit.version>5.3.0.201903130848-r</org.eclipse.jgit.version> + <mockito-core.version>2.25.0</mockito-core.version> + <maven-core.version>3.6.0</maven-core.version> + <openapi-generator.version>4.1.2</openapi-generator.version> + <commons-lang3.version>3.4</commons-lang3.version> + <maven-aether-provider.version>3.2.2</maven-aether-provider.version> + <swagger-parser.version>2.0.15</swagger-parser.version> + <commons-collections4.version>4.3</commons-collections4.version> + <commons-io.version>2.6</commons-io.version> + <spring-boot.version>2.1.4.RELEASE</spring-boot.version> + <fabric8.dmp.version>0.28.0</fabric8.dmp.version> + <maven-compat.version>3.2.2</maven-compat.version> + <webjars.version>4.3.1</webjars.version> + + <maven.surefire.version>3.0.0-M3</maven.surefire.version> + <maven-plugin-plugin.version>3.5</maven-plugin-plugin.version> + <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> + <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version> + <maven-resources-plugin.version>3.0.0</maven-resources-plugin.version> + <spring-boot-maven-plugin.version>1.5.12.RELEASE</spring-boot-maven-plugin.version> + <maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version> + <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> + <maven-release-plugin.version>2.5.3</maven-release-plugin.version> + <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version> + <maven-source-plugin.version>2.2.1</maven-source-plugin.version> + <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> + <jacoco-maven-plugin.version>0.7.8</jacoco-maven-plugin.version> + <maven-remote-resources-plugin.version>1.6.0</maven-remote-resources-plugin.version> + <apache-rat-plugin.version>0.13</apache-rat-plugin.version> + <license-maven-plugin.version>1.19</license-maven-plugin.version> + <jacoco-maven-plugin.version>0.7.8</jacoco-maven-plugin.version> </properties> <licenses> @@ -223,6 +268,213 @@ <artifactId>oas-generator-spring</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.ws.rs-api.version}</version> + </dependency> + + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-models</artifactId> + <version>${swagger.version}</version> + </dependency> + + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> + <version>${swagger.version}</version> + </dependency> + + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-core</artifactId> + <version>${swagger.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>${asm.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>provider-rest-common</artifactId> + <version>${javachassis.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>provider-pojo</artifactId> + <version>${javachassis.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> + </dependency> + + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>${powermock.version}</version> + </dependency> + + <dependency> + <groupId>io.airlift</groupId> + <artifactId>airline</artifactId> + <version>${airline.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency><!-- 桥接：告诉commons logging使用Log4j2 --> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-codegen</artifactId> + <version>${swagger-codegen.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>${org.eclipse.jgit.version}</version> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito-core.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven-core.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>${maven-plugin-testing-harness.version}</version> + </dependency> + + <dependency> + <groupId>org.openapitools</groupId> + <artifactId>openapi-generator</artifactId> + <version>${openapi-generator.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>swagger-generator-core</artifactId> + <version>${javachassis.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven-core.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${maven-core.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-annotations</artifactId> + <version>${maven-core.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>${maven-aether-provider.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven-compat.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${commons-collections4.version}</version> + </dependency> + + <dependency> + <groupId>io.swagger.parser.v3</groupId> + <artifactId>swagger-parser</artifactId> + <version>${swagger-parser.version}</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + <version>${webjars.version}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -232,7 +484,8 @@ <plugin> <groupId>org.eluder.coveralls</groupId> <artifactId>coveralls-maven-plugin</artifactId> - <version>4.3.0</version> + <version>${coveralls-maven-plugin.version}</version> + <configuration> <jacocoReports> <jacocoReport> @@ -245,7 +498,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.8</version> + <version>${jacoco-maven-plugin.version}</version> <executions> <execution> <id>default-prepare-agent</id> @@ -281,6 +534,56 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin.version}</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring-boot-maven-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>${maven-plugin-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven.surefire.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${maven.surefire.version}</version> + <executions> + <execution> + <id>report</id> + <phase>post-integration-test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> @@ -289,7 +592,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.19</version> + <version>${license-maven-plugin.version}</version> <executions> <execution> <id>default-cli</id> @@ -320,7 +623,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>${apache-rat-plugin.version}</version> <configuration> <excludes> <exclude>DISCLAIMER</exclude> @@ -354,7 +657,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.6.0</version> + <version>${maven-remote-resources-plugin.version}</version> <executions> <execution> <id>process-resource-bundles</id> @@ -383,7 +686,6 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.8</version> </plugin> </plugins> </build> @@ -402,7 +704,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> + <version>${maven-gpg-plugin.version}</version> <executions> <execution> <id>sign-artifacts</id> @@ -416,7 +718,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.2.1</version> + <version>${maven-source-plugin.version}</version> <executions> <execution> <id>attach-sources</id> @@ -429,7 +731,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>${maven-javadoc-plugin.version}</version> <executions> <execution> <id>attach-javadocs</id> @@ -442,7 +744,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> + <version>${maven-release-plugin.version}</version> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> <useReleaseProfile>false</useReleaseProfile> diff --git a/toolkit-distribution/pom.xml b/toolkit-distribution/pom.xml index d750a41..dee4791 100644 --- a/toolkit-distribution/pom.xml +++ b/toolkit-distribution/pom.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more ~ contributor license agreements. See the NOTICE file distributed with @@ -14,43 +15,40 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<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> - <parent> - <groupId>org.apache.servicecomb.toolkit</groupId> - <artifactId>toolkit</artifactId> - <version>0.2.0-SNAPSHOT</version> - </parent> - <artifactId>apache-servicecomb-toolkit-distribution</artifactId> - <name>Toolkit::Distribution</name> - <packaging>pom</packaging> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>src</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> +<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> + <parent> + <groupId>org.apache.servicecomb.toolkit</groupId> + <artifactId>toolkit</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <artifactId>apache-servicecomb-toolkit-distribution</artifactId> + <name>Toolkit::Distribution</name> + <packaging>pom</packaging> + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>src</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/toolkit-maven-plugin/pom.xml b/toolkit-maven-plugin/pom.xml index 763ae78..c43e81e 100644 --- a/toolkit-maven-plugin/pom.xml +++ b/toolkit-maven-plugin/pom.xml @@ -17,8 +17,8 @@ --> <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";> + 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";> <parent> <artifactId>toolkit</artifactId> <groupId>org.apache.servicecomb.toolkit</groupId> @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <packaging>maven-plugin</packaging> <artifactId>toolkit-maven-plugin</artifactId> - + <dependencies> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> @@ -47,25 +47,21 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.0</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> - <version>3.6.0</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-annotations</artifactId> - <version>3.6.0</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.0</version> <exclusions> <exclusion> <groupId>org.checkerframework</groupId> @@ -83,42 +79,36 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>3.3.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-aether-provider</artifactId> - <version>3.2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> </dependencies> @@ -128,17 +118,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.5</version> <configuration> <goalPrefix>toolkit</goalPrefix> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
