You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/04 17:51:58 UTC

[1/2] cxf-fediz git commit: Fixing OSGi exports

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes c67a89578 -> 1bbdb5e7b


Fixing OSGi exports


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/eadac166
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/eadac166
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/eadac166

Branch: refs/heads/1.2.x-fixes
Commit: eadac166bcda8e0cefe8b3b4db7abfadde37d792
Parents: c67a895
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:49:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 16:51:30 2015 +0000

----------------------------------------------------------------------
 plugins/cxf/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/eadac166/plugins/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index 0a55b49..33b3ee7 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -118,7 +118,7 @@
                         </Export-Package>
                         <Import-Package>
                             !org.apache.cxf.fediz.spring*,
-                            org.apache.cxf.fediz.core.*,
+                            org.apache.cxf.fediz.cxf.*,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>


[2/2] cxf-fediz git commit: Fixing previous merge

Posted by co...@apache.org.
Fixing previous merge


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1bbdb5e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1bbdb5e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1bbdb5e7

Branch: refs/heads/1.2.x-fixes
Commit: 1bbdb5e7b7cc40f6068bb11216c055893e850143
Parents: eadac16
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:50:37 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 16:51:37 2015 +0000

----------------------------------------------------------------------
 plugins/cxf/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1bbdb5e7/plugins/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index 33b3ee7..1435291 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -114,11 +114,11 @@
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
                         <Specification-Version>${project.version}</Specification-Version>
                         <Export-Package>
-                            org.apache.cxf.fediz.spring.*;version="${project.version}"
+                            org.apache.cxf.fediz.cxf.*;version="${project.version}"
                         </Export-Package>
                         <Import-Package>
                             !org.apache.cxf.fediz.spring*,
-                            org.apache.cxf.fediz.cxf.*,
+                            org.apache.cxf.fediz.core.*,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>