From 8e4a78d601ecd9f40b6dc37377b3afd70a6aa5fe Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Wed, 13 Jul 2016 12:31:35 +0100 Subject: [PATCH] SAK-31493 Harmonise maven project versions (#3016) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit oauth - this was at 1.2-SNAPSHOT simple-rss-portlet - this was at 1.2.3-SNAPSHOT Also marked the oauth-api as provided and set a version in the master pom so it doesn’t get deployed in other versions. Put jsf dependency names onto one line to make them easier to parse. --- access/access-tool/tool/pom.xml | 2 -- common/ddl/pom.xml | 12 ++++++------ entitybroker/tool/pom.xml | 2 -- jsf/jsf-widgets-sun-depend/pom.xml | 3 +-- jsf/myfaces-widgets-depend/pom.xml | 3 +-- master/pom.xml | 6 ++++++ oauth/api/pom.xml | 2 +- oauth/dao-hbm/pom.xml | 2 +- oauth/dao-memory/pom.xml | 2 +- oauth/dao-server-config/pom.xml | 2 +- oauth/impl/pom.xml | 3 +-- oauth/pack/pom.xml | 3 +-- oauth/pom.xml | 1 - oauth/tool/pom.xml | 2 +- simple-rss-portlet/pom.xml | 1 - 15 files changed, 21 insertions(+), 25 deletions(-) diff --git a/access/access-tool/tool/pom.xml b/access/access-tool/tool/pom.xml index 83a4e271bd91..3fdc4ae0e8b3 100644 --- a/access/access-tool/tool/pom.xml +++ b/access/access-tool/tool/pom.xml @@ -25,8 +25,6 @@ org.sakaiproject.oauth oauth-api - 1.2-SNAPSHOT - provided diff --git a/common/ddl/pom.xml b/common/ddl/pom.xml index 70b2545c930f..2bf4deb0e362 100644 --- a/common/ddl/pom.xml +++ b/common/ddl/pom.xml @@ -11,7 +11,7 @@ org.sakaiproject.common common - 1.2-SNAPSHOT + 12-SNAPSHOT @@ -24,30 +24,30 @@ org.sakaiproject.common sakai-common-edu-person-api - 1.2-SNAPSHOT + 12-SNAPSHOT org.sakaiproject.common sakai-common-composite-component-data - 1.2-SNAPSHOT + 12-SNAPSHOT org.sakaiproject.common sakai-common-composite-component - 1.2-SNAPSHOT + 12-SNAPSHOT org.sakaiproject.common sakai-common-manager-api - 1.2-SNAPSHOT + 12-SNAPSHOT provided org.sakaiproject.common sakai-common-type-api - 1.2-SNAPSHOT + 12-SNAPSHOT provided diff --git a/entitybroker/tool/pom.xml b/entitybroker/tool/pom.xml index 5cd5ef5660c6..c74ff5660ef3 100644 --- a/entitybroker/tool/pom.xml +++ b/entitybroker/tool/pom.xml @@ -42,8 +42,6 @@ org.sakaiproject.oauth oauth-api - 1.2-SNAPSHOT - provided diff --git a/jsf/jsf-widgets-sun-depend/pom.xml b/jsf/jsf-widgets-sun-depend/pom.xml index b503553deb38..557a222123a8 100644 --- a/jsf/jsf-widgets-sun-depend/pom.xml +++ b/jsf/jsf-widgets-sun-depend/pom.xml @@ -8,8 +8,7 @@ 12-SNAPSHOT - Sakai JSF widget dependencies for Sun's RI - (sakai-depend-jsf-widgets-sun) + Sakai JSF widget dependencies for Sun's RI (sakai-depend-jsf-widgets-sun) org.sakaiproject.jsf jsf-widgets-sun-depend diff --git a/jsf/myfaces-widgets-depend/pom.xml b/jsf/myfaces-widgets-depend/pom.xml index 116a65722ade..2afb4bf5190e 100644 --- a/jsf/myfaces-widgets-depend/pom.xml +++ b/jsf/myfaces-widgets-depend/pom.xml @@ -8,8 +8,7 @@ 12-SNAPSHOT - Sakai JSF Widgets Dependencies for MyFaces - (sakai-depend-jsf-widgets-myfaces) + Sakai JSF Widgets Dependencies for MyFaces (sakai-depend-jsf-widgets-myfaces) org.sakaiproject.jsf myfaces-widgets-depend diff --git a/master/pom.xml b/master/pom.xml index 2f812c563da7..21a4fe1ee614 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1537,6 +1537,12 @@ ${sakai.version} provided + + org.sakaiproject.oauth + oauth-api + ${sakai.version} + provided + org.sakaiproject.jsf jsf-app diff --git a/oauth/api/pom.xml b/oauth/api/pom.xml index 92fb5ebad633..b802b96a611a 100755 --- a/oauth/api/pom.xml +++ b/oauth/api/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT oauth-api diff --git a/oauth/dao-hbm/pom.xml b/oauth/dao-hbm/pom.xml index 1715c19b5bf3..b39833d5ba18 100755 --- a/oauth/dao-hbm/pom.xml +++ b/oauth/dao-hbm/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT ../pom.xml diff --git a/oauth/dao-memory/pom.xml b/oauth/dao-memory/pom.xml index ec022d6bd93d..6802efdee130 100755 --- a/oauth/dao-memory/pom.xml +++ b/oauth/dao-memory/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT ../pom.xml diff --git a/oauth/dao-server-config/pom.xml b/oauth/dao-server-config/pom.xml index 9160444ab73c..72164a9f167e 100755 --- a/oauth/dao-server-config/pom.xml +++ b/oauth/dao-server-config/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT ../pom.xml diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml index f905fe3abead..500d8ee9774d 100755 --- a/oauth/impl/pom.xml +++ b/oauth/impl/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT oauth-impl @@ -19,7 +19,6 @@ ${project.groupId} oauth-api - provided diff --git a/oauth/pack/pom.xml b/oauth/pack/pom.xml index 127b5c702ed2..b9a519e18778 100755 --- a/oauth/pack/pom.xml +++ b/oauth/pack/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT oauth-pack @@ -23,7 +23,6 @@ ${project.groupId} oauth-api - provided ${project.groupId} diff --git a/oauth/pom.xml b/oauth/pom.xml index 0fd3b152dd54..1e19475ab327 100755 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -5,7 +5,6 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT pom diff --git a/oauth/tool/pom.xml b/oauth/tool/pom.xml index 185e1992741e..9e0c67c02d2e 100755 --- a/oauth/tool/pom.xml +++ b/oauth/tool/pom.xml @@ -6,7 +6,7 @@ org.sakaiproject.oauth oauth-base - 1.2-SNAPSHOT + 12-SNAPSHOT oauth-tool diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml index 9af01e1471ff..4152f14a3564 100644 --- a/simple-rss-portlet/pom.xml +++ b/simple-rss-portlet/pom.xml @@ -8,7 +8,6 @@ An RSS/Atom feed reader. https://wiki.jasig.org/display/PLT/Simple+RSS+Portlet - 1.2.3-SNAPSHOT war