Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add transitive dependency to fix javadoc plugin failure when releasing #544

Merged
merged 1 commit into from
Oct 17, 2017
Merged

Add transitive dependency to fix javadoc plugin failure when releasing #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions components/org.wso2.carbon.identity.oauth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 10 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,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>

Expand Down Expand Up @@ -708,6 +717,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>

Expand Down Expand Up @@ -741,15 +751,7 @@
<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>

<commons-codec.test.version>1.4</commons-codec.test.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>
Expand Down