Skip to content

Commit

Permalink
LPS-62721 Fix transitive dependencies in addons
Browse files Browse the repository at this point in the history
  • Loading branch information
@rotty3000 @brianchandotcom
rotty3000 authored and brianchandotcom committed Jan 29, 2016
1 parent eb4146e commit 1287d2b
Show file tree
Hide file tree
Showing 17 changed files with 81 additions and 62 deletions.
9 changes: 7 additions & 2 deletions modules/addons/layout-type-controller/layout-type-controller-control-panel/build.gradle
View file
@@ -1,6 +1,11 @@
dependencies {
compile project(":apps:application-list:application-list-api")
compile project(":apps:application-list:application-list-taglib")
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "util-taglib", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
provided project(":apps:application-list:application-list-api")
provided project(":apps:application-list:application-list-taglib")
}

liferay {
Expand Down
9 changes: 7 additions & 2 deletions ...s/addons/layout-type-controller/layout-type-controller-full-page-application/build.gradle
View file
@@ -1,6 +1,11 @@
dependencies {
compile project(":apps:application-list:application-list-api")
compile project(":apps:application-list:application-list-taglib")
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "util-taglib", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
provided project(":apps:application-list:application-list-api")
provided project(":apps:application-list:application-list-taglib")
}

liferay {
Expand Down
9 changes: 7 additions & 2 deletions modules/addons/layout-type-controller/layout-type-controller-node/build.gradle
View file
@@ -1,6 +1,11 @@
dependencies {
compile project(":apps:application-list:application-list-api")
compile project(":apps:application-list:application-list-taglib")
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "util-taglib", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
provided project(":apps:application-list:application-list-api")
provided project(":apps:application-list:application-list-taglib")
}

liferay {
Expand Down
10 changes: 7 additions & 3 deletions modules/addons/layout-type-controller/layout-type-controller-shared-portlet/build.gradle
View file
@@ -1,7 +1,11 @@
dependencies {
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
compile project(":apps:application-list:application-list-api")
compile project(":apps:application-list:application-list-taglib")
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "util-taglib", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
provided project(":apps:application-list:application-list-api")
provided project(":apps:application-list:application-list-taglib")
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-close/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions ...s/addons/portlet-configuration-icon/portlet-configuration-icon-edit-defaults/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-edit-guest/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-edit/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-facebook/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-help/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-igoogle/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-maximize/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-minimize/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-netvibes/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-print/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
8 changes: 4 additions & 4 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-refresh/build.gradle
View file
@@ -1,8 +1,8 @@
dependencies {
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down
10 changes: 5 additions & 5 deletions modules/addons/portlet-configuration-icon/portlet-configuration-icon-widget/build.gradle
View file
@@ -1,11 +1,11 @@
dependencies {
// @formatter:off
compile group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
compile group: "com.liferay.portal", name: "portal-impl", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "portal-service", version: liferay.portalVersion
provided group: "com.liferay.portal", name: "portal-impl", version: liferay.portalVersion
// @formatter:on
compile group: "javax.portlet", name: "portlet-api", version: "2.0"
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
compile group: "org.osgi", name: "org.osgi.compendium", version: "5.0.0"
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
}

liferay {
Expand Down

0 comments on commit 1287d2b

Please sign in to comment.