Merge 77907a0 into 4b69ff6

apache · Dec 4, 2019 · 11bb10a · 11bb10a
2 parents 4b69ff6 + 77907a0
commit 11bb10a
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 6 deletions.
diff --git a/.../oasv/compatibility/validators/parameter/ParameterAllowEmptyValueChangeDiffValidator.java b/.../oasv/compatibility/validators/parameter/ParameterAllowEmptyValueChangeDiffValidator.java
@@ -34,7 +34,7 @@
 import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 
 /**
- * Parameter.allowEmpty only allow change false->true
+ * Parameter.allowEmpty only allow change false to true
  */
 public class ParameterAllowEmptyValueChangeDiffValidator
   extends OasObjectDiffValidatorTemplate<Parameter>

diff --git a/...it/oasv/compatibility/validators/parameter/ParameterAllowReservedChangeDiffValidator.java b/...it/oasv/compatibility/validators/parameter/ParameterAllowReservedChangeDiffValidator.java
@@ -34,7 +34,7 @@
 import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 
 /**
- * Parameter.allowReserved only allow change false->true
+ * Parameter.allowReserved only allow change false to true
  */
 public class ParameterAllowReservedChangeDiffValidator
   extends OasObjectDiffValidatorTemplate<Parameter>

diff --git a/...toolkit/oasv/compatibility/validators/parameter/ParameterRequiredChangeDiffValidator.java b/...toolkit/oasv/compatibility/validators/parameter/ParameterRequiredChangeDiffValidator.java
@@ -34,7 +34,7 @@
 import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 
 /**
- * Parameter.required only allow change true->false
+ * Parameter.required only allow change true-&gt;false
  */
 public class ParameterRequiredChangeDiffValidator
   extends OasObjectDiffValidatorTemplate<Parameter>

diff --git a/...kit/oasv/compatibility/validators/requestbody/RequestBodyRequiredChangeDiffValidator.java b/...kit/oasv/compatibility/validators/requestbody/RequestBodyRequiredChangeDiffValidator.java
@@ -33,7 +33,7 @@
 import static java.util.Collections.singletonList;
 
 /**
- * RequestBody.required only allow change true->false
+ * RequestBody.required only allow change true-&gt;false
  */
 public class RequestBodyRequiredChangeDiffValidator
   extends OasObjectDiffValidatorTemplate<RequestBody>

diff --git a/.../apache/servicecomb/toolkit/oasv/style/validator/openapi/OpenApiTagsSizeGteValidator.java b/.../apache/servicecomb/toolkit/oasv/style/validator/openapi/OpenApiTagsSizeGteValidator.java
@@ -36,7 +36,7 @@
  * size validator
  * <ul>
  *   <li>config item: openAPI.tags.size.gte=expected</li>
- *   <li>size should be >= *expected*</li>
+ *   <li>size should be &gt;= *expected*</li>
  * </ul>
  */
 public class OpenApiTagsSizeGteValidator implements OpenApiValidator {

diff --git a/...g/apache/servicecomb/toolkit/oasv/style/validator/openapi/OpenApiVersionGteValidator.java b/...g/apache/servicecomb/toolkit/oasv/style/validator/openapi/OpenApiVersionGteValidator.java
@@ -31,7 +31,7 @@
  * .openapi property validator
  <ul>
  *   <li>config item: openAPI.openapi.gte=expected</li>
- *   <li>version should be >= *expected*</li>
+ *   <li>version should be &gt;= *expected*</li>
  * </ul>
  */
 public class OpenApiVersionGteValidator implements OpenApiValidator {

diff --git a/toolkit-distribution/pom.xml b/toolkit-distribution/pom.xml
@@ -25,6 +25,107 @@
   <artifactId>apache-servicecomb-toolkit-distribution</artifactId>
   <name>Toolkit::Distribution</name>
   <packaging>pom</packaging>
+
+  <!-- sort by project directory name, easy to check if the module is missed -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>cli</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>codegen</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>contractgen</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>docgen</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-core-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-test</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-style</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-compatibility</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-validator-compatibility-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-generator-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-generator-servicecomb</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-generator-jaxrs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.servicecomb.toolkit</groupId>
+      <artifactId>oas-generator-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+  </dependencies>
+
   <profiles>
     <profile>
       <id>release</id>
@@ -45,6 +146,18 @@
                   </descriptors>
                 </configuration>
               </execution>
+              <execution>
+                <id>bin</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/assembly/bin.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>

diff --git a/toolkit-distribution/src/assembly/bin.xml b/toolkit-distribution/src/assembly/bin.xml
@@ -0,0 +1,54 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>${project.build.finalName}-bin</baseDirectory>
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>DISCLAIMER</include>
+        <include>README.md</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>NOTICE</include>
+        <include>LICENSE</include>
+        <include>licenses/**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>false</unpack>
+      <outputDirectory>/libs</outputDirectory>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>