Merge pull request #2 from apiportal/develop

Develop to master
apiportal · May 8, 2019 · 68306b3 · 68306b3
2 parents bc0cc66 + ea5bc77
commit 68306b3
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 56 deletions.
diff --git a/.travis.maven.settings.xml b/.travis.maven.settings.xml
@@ -0,0 +1,35 @@
+<settings>
+    <profiles>
+        <profile>
+            <id>sonatype-oss-release</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <gpg.keyname>${env.GPG_ID}</gpg.keyname>
+                <passphraseServerId>${gpg.keyname}</passphraseServerId>
+            </properties>
+        </profile>
+    </profiles>
+    <servers>
+        <server>
+            <id>${env.GPG_ID}</id>
+            <passphrase>${env.GPG_PASSPHRASE}</passphrase>
+        </server>
+        <server>
+            <id>github</id>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_PASSWORD}</password>
+        </server>
+        <server>
+            <id>sonatype-nexus-snapshots</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+        <server>
+            <id>sonatype-nexus-staging</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,18 @@
+language: java
+jdk:
+  - openjdk8
+cache:
+  directories:
+    - "$HOME/.m2"
+before_install:
+  - echo $GPG_SECRET_KEYS | base64 --decode | gpg --import
+  - echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust
+install:
+  - mvn -s .travis.maven.settings.xml -version -B
+script:
+  - mvn -s .travis.maven.settings.xml clean install deploy -P sonatype-oss-release
+
+# Send notification to Slack
+notifications:
+  slack:
+    secure: "QYCVTAsDm8bvD6JmcB6IO4wkyQWyqWRB6kZSCOQWFreid77ZEF7cxA5GwYWfArb/awM9hwp/E1m7G0uzMh1L199XknMed6nKWSINuDYK0Zvd/4gTff4eUAOc8RHVrK327J6hhSVBky7w6vgYXSOY2GoL0bgOhDZdzqqnS8xK4y+2fJkfbV5stx5Q+tbsyO3s6wvSzuZhczTOw3XhTwHJN9CftYfrz5rJ7h/Ht4RQvH3nDywAjfmrY2ANOFpXjwsYvBRtIsJoic4HEPH7e4ROhCBGUG18jzBVIxpJLaYlJK9jOX1RlOcsMFT1Ile4HRIYWMMMVILG/XHfbENRYojURih0LHxUWVAcb0poKGx+QDxlrdsGnDg3binPSriJEx3K/Qj4czIONdZuLoxAaEcyypJ99UAvxbJulxMtxV9S6/fQO7d9Ifc95BSUBkiQP41GK0s37bMkysttz3RuhgjlpErIShOhVttVcFT8QtnExXPWvWIXjHDj0M3ARA8ct+qkPen6A8Uil9w9W/LyrmOLLYCa/4V7LJ2/jdFaBI0s7jyfVHvOoQIvB728+X+Utlu05eE4IYTY0qf1tMc8cLwBv6oXsaW4EsQ7wfu7bItIzalV3dE6bbKinfLvkPOJdOOvulXVboJ1F3PXqHIrMskx+lg3TktP3YpF/3kG0SmxDd8="
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/apiportal/abyss-spec-transformer.svg?branch=master)](https://travis-ci.org/apiportal/abyss-spec-transformer)
+
 # ABYSS SPEC TRANSFORMER
 
 This application transforms provided `WSDL` into an `OpenAPI v3` spec yaml file. WSDL should be provided via path, URI or String  

diff --git a/pom.xml b/pom.xml
@@ -2,8 +2,15 @@
 <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.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
+        <relativePath/>
+    </parent>
+
     <groupId>com.verapi.abyss</groupId>
     <artifactId>abyss-spec-transformer</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -49,24 +56,35 @@
             <organization>Verapi</organization>
             <organizationUrl>https://verapi.com</organizationUrl>
             <roles>
-                <role>Enterprise Architect</role>
+                <role>Developer</role>
             </roles>
             <timezone>+3</timezone>
         </contributor>
     </contributors>
 
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/apiportal/abyss-spec-transformer/issues</url>
-    </issueManagement>
-
     <scm>
         <url>https://github.com/apiportal/abyss-spec-transformer</url>
         <connection>scm:git:https://github.com/apiportal/abyss-spec-transformer.git</connection>
         <developerConnection>scm:git:https://github.com/apiportal/abyss-spec-transformer.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
+    <issueManagement>
+        <system>GitHub Issues</system>
+        <url>https://github.com/apiportal/abyss-spec-transformer/issues</url>
+    </issueManagement>
+
+    <ciManagement>
+        <system>Travis CI</system>
+        <url>https://travis-ci.org/apiportal/abyss-spec-transformer</url>
+    </ciManagement>
+
+    <distributionManagement>
+        <site>
+            <id>site</id>
+            <url>scm:git:https://github.com/apiportal/abyss-spec-transformer.git</url>
+        </site>
+    </distributionManagement>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -97,7 +115,7 @@
         <version.maven-gpg-plugin.plugin>1.6</version.maven-gpg-plugin.plugin>
         <version.maven-scm-publish-plugin>3.0.0</version.maven-scm-publish-plugin>
         <version.maven-source-plugin>3.0.1</version.maven-source-plugin>
-        <version.maven-javadoc-plugin>3.0.0</version.maven-javadoc-plugin>
+        <version.maven-javadoc-plugin>3.1.0</version.maven-javadoc-plugin>
         <site.path>snapshot</site.path>
     </properties>
 
@@ -337,10 +355,12 @@
                         <configuration>
                             <keyname>${gpg.keyname}</keyname>
                             <passphraseServerId>${gpg.keyname}</passphraseServerId>
-                            <gpgArguments>
-                                <arg>--pinentry-mode</arg>
-                                <arg>loopback</arg>
-                            </gpgArguments>
+                            <!--
+                                                        <gpgArguments>
+                                                            <arg>&#45;&#45;pinentry-mode</arg>
+                                                            <arg>loopback</arg>
+                                                        </gpgArguments>
+                            -->
                         </configuration>
                     </execution>
                 </executions>
@@ -454,26 +474,25 @@
 
     <profiles>
         <profile>
-            <id>release</id>
+            <id>sonatype-oss-release</id>
             <properties>
                 <site.path>release</site.path>
             </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>${version.maven-javadoc-plugin}</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${version.maven-gpg-plugin.plugin}</version>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 
-    <distributionManagement>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <site>
-            <id>site</id>
-            <url>scm:git:https://github.com/apiportal/abyss-spec-transformer.git</url>
-        </site>
-    </distributionManagement>
-
 </project>
diff --git a/src/main/java/com/verapi/abyss/spec/transformer/IAbyssTransformer.java b/src/main/java/com/verapi/abyss/spec/transformer/IAbyssTransformer.java
@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright 2019 Verapi Inc
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ *     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.
  */
 
 package com.verapi.abyss.spec.transformer;

diff --git a/src/main/java/com/verapi/abyss/spec/transformer/OpenAPITransformer.java b/src/main/java/com/verapi/abyss/spec/transformer/OpenAPITransformer.java
@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright 2019 Verapi Inc
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ *     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.
  */
 
 package com.verapi.abyss.spec.transformer;

diff --git a/src/test/java/com/verapi/abyss/spec/transformer/SwaggerFileTest.java b/src/test/java/com/verapi/abyss/spec/transformer/SwaggerFileTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2019 Verapi Inc
+ *
+ * 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.
+ */
+
 package com.verapi.abyss.spec.transformer;
 
 import com.fasterxml.jackson.core.JsonProcessingException;