4 files changed, 8 insertions, 1 deletions
diff --git a/solenv/bin/version.py b/solenv/bin/version.py
index b1164483f660..3193b3fa39f1 100755
--- a/solenv/bin/version.py
+++ b/solenv/bin/version.py
@@ -12,6 +12,7 @@ M = {
   'ridl': 'ridljar',
   'unoil': 'unoil',
   'unoloader': 'ridljar',
+  'libreoffice': 'ridljar',
 }
 
 parser = OptionParser()
@@ -40,7 +41,7 @@ def replace_in_file(filename, src_pattern):
 src_pattern = re.compile(r'^(\s*<version>)([-.@\w]+)(</version>\s*)$',
                          re.MULTILINE)
 
-for a in ['juh', 'jurt', 'officebean', 'ridl', 'unoil', 'unoloader']:
+for a in ['juh', 'jurt',  'libreoffice', 'officebean', 'ridl', 'unoil', 'unoloader']:
   replace_in_file(os.path.join(M[a], 'pom.%s.xml' % a), src_pattern)
 
 src_pattern = re.compile(r"^(LIBREOFFICE_VERSION = ')([-.@\w]+)(')$",
diff --git a/solenv/buck/build.defs b/solenv/buck/build.defs
index b7b81ec8cb3c..f6a1a7463b94 100644
--- a/solenv/buck/build.defs
+++ b/solenv/buck/build.defs
@@ -1,11 +1,13 @@
 def java_sources(
     name,
     srcs,
+    root = None,
     visibility = []
   ):
   java_library(
     name = name,
     resources = srcs,
+    resources_root = root,
     visibility = visibility,
   )
 
diff --git a/solenv/maven/BUCK b/solenv/maven/BUCK
index f5bca38be2a3..fd1252df0c37 100644
--- a/solenv/maven/BUCK
+++ b/solenv/maven/BUCK
@@ -16,6 +16,7 @@ maven_package(
     'ridl': '//:ridl',
     'unoil': '//:unoil',
     'unoloader': '//:unoloader',
+    'libreoffice': '//:libreoffice',
   },
   src = {
     'juh': '//javaunohelper:juh-src',
@@ -24,6 +25,7 @@ maven_package(
     'ridl': '//ridljar:ridl-src',
     'unoil': '//unoil:unoil-src',
     'unoloader': '//ridljar/source/unoloader:unoloader-src',
+    'libreoffice': '//ridljar:libreoffice-src',
   },
   doc = {
     'juh': '//javaunohelper:juh-javadoc',
@@ -32,6 +34,7 @@ maven_package(
     'ridl': '//ridljar:ridl-javadoc',
     'unoil': '//unoil:unoil-javadoc',
     'unoloader': '//ridljar/source/unoloader:unoloader-javadoc',
+    'libreoffice': '//ridljar:libreoffice-javadoc',
   },
 )
 
diff --git a/solenv/maven/mvn.py b/solenv/maven/mvn.py
index caa15eeb9fd8..5b45447daa07 100755
--- a/solenv/maven/mvn.py
+++ b/solenv/maven/mvn.py
@@ -18,6 +18,7 @@ M = {
   'ridl': 'ridljar',
   'unoil': 'unoil',
   'unoloader': 'ridljar',
+  'libreoffice': 'ridljar',
 }
 
 opts = OptionParser()