Add transitive dependency to fix javadoc plugin failure when releasing

wso2-extensions · Oct 17, 2017 · ae80058 · ae80058
1 parent c922390
commit ae80058
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -34,6 +34,15 @@
     <url>http://wso2.org</url>
 
     <dependencies>
+        <!--
+            This dependency is added as a quick fix
+            for https://github.com/wso2-extensions/identity-inbound-auth-oauth/issues/543. Remove this tomcat
+            dependency only after fixing the issue. Otherwise will result in build failures when javadoc plugin runs.
+         -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-lang.wso2</groupId>
             <artifactId>commons-lang</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -468,6 +468,15 @@
                 <scope>test</scope>
             </dependency>
 
+            <!--
+                See https://github.com/wso2-extensions/identity-inbound-auth-oauth/issues/543 for the requirement to
+                 have this dependency
+            -->
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-coyote</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -701,6 +710,7 @@
         <joda.wso2.version>2.8.2.wso2v1</joda.wso2.version>
         <joda.wso2.osgi.version.range>[2.8.2,3.0.0)</joda.wso2.osgi.version.range>
 
+        <tomcat.version>7.0.69</tomcat.version>
         <tomcat-util.version>3.3.2</tomcat-util.version>
         <tomcat.wso2.imp.pkg.version.range>[1.7.0,2.0)</tomcat.wso2.imp.pkg.version.range>
 
@@ -734,12 +744,6 @@
         <maven.surefire.plugin.version>2.18.1</maven.surefire.plugin.version>
         <javaee.web.api.version>7.0</javaee.web.api.version>
         <h2database.version>1.0.60</h2database.version>
-
-        <!--
-            Please do not remove this property until all javadoc comments are fixed. Removing this will cause build
-            failures during component release.
-         -->
-        <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 
 </project>