jfreereport: stop pointlessly renaming the jar files

Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781

7 files changed, 10 insertions, 14 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b1a650ee2cdb..75d2b5248821 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2915,12 +2915,12 @@ endef
 else # !SYSTEM_JFREEREPORT
 
 $(eval $(call gb_Helper_register_jars,OOO,\
-	flow-engine-0.9.4 \
+	flow-engine \
 	flute-1.1.6 \
 	libbase-1.1.6 \
 	libfonts-1.1.6 \
 	libformula-1.1.7 \
-	liblayout-0.2.10 \
+	liblayout \
 	libloader-1.1.6 \
 	librepository-1.1.6 \
 	libserializer-1.1.6 \
@@ -2929,7 +2929,7 @@ $(eval $(call gb_Helper_register_jars,OOO,\
 ))
 
 define gb_Jar__use_flow-engine
-$(call gb_Jar_use_jar,$(1),flow-engine-0.9.4)
+$(call gb_Jar_use_jar,$(1),flow-engine)
 endef
 
 define gb_Jar__use_flute
@@ -2949,7 +2949,7 @@ $(call gb_Jar_use_jar,$(1),libformula-1.1.7)
 endef
 
 define gb_Jar__use_liblayout
-$(call gb_Jar_use_jar,$(1),liblayout-0.2.10)
+$(call gb_Jar_use_jar,$(1),liblayout)
 endef
 
 define gb_Jar__use_libloader
diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
index 1482967b91c0..ca60a2716e5d 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
@@ -14,6 +14,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreere
 
 $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
 
-$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine.jar,build/lib/flow-engine.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
index fc19dd1554fb..c5d330b73fe8 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
@@ -14,6 +14,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreerepo
 
 $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
 
-$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout.jar,build/lib/liblayout.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/version.mk b/external/jfreereport/version.mk
index 4156932d87c7..af5980f4a5a3 100644
--- a/external/jfreereport/version.mk
+++ b/external/jfreereport/version.mk
@@ -3,10 +3,8 @@ LIBBASE_VERSION=1.1.6
 LIBFONTS_VERSION=1.1.6
 LIBFORMAT_VERSION=1.1.6
 LIBFORMULA_VERSION=1.1.7
-LIBLAYOUT_VERSION=0.2.10
 LIBLOADER_VERSION=1.1.6
 LIBREPOSITORY_VERSION=1.1.6
 LIBSERIALIZER_VERSION=1.1.6
 LIBXML_VERSION=1.1.7
-FLOW_ENGINE_VERSION=0.9.4
 
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
index f98127d5b403..502de48a3eaa 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
@@ -1,7 +1,7 @@
 RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
 Class-Path: reportbuilderwizard.jar
   flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
-  libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
+  libfonts-1.1.6.jar libformula-1.1.7.jar liblayout.jar
   libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar
-  flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
+  flow-engine.jar sac.jar commons-logging-1.1.1.jar
 UNO-Type-Path: 
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 830d0a40f3e8..4d4e33d0557b 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -137,12 +137,10 @@ endif
 ifneq ($(SYSTEM_JFREEREPORT),YES)
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DFLOW_ENGINE_VERSION=$(FLOW_ENGINE_VERSION) \
 	-DFLUTE_VERSION=$(FLUTE_VERSION) \
 	-DLIBBASE_VERSION=$(LIBBASE_VERSION) \
 	-DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
 	-DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \
-	-DLIBLAYOUT_VERSION=$(LIBLAYOUT_VERSION) \
 	-DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \
 	-DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \
 	-DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index 1c5b0f3e187a..9e0ba424e752 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -57,12 +57,12 @@ STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1)
 
 /* Not sure, if can we use CONCAT3 in that context here? */
 #ifndef SYSTEM_JFREEREPORT
-    STD_JAR_FILE( gid_File_Jar_FlowEngine, CONCAT3(flow-engine,-,FLOW_ENGINE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine )
     STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) )
     STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) )
     STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) )
     STD_JAR_FILE( gid_File_Jar_Libformula, CONCAT3(libformula,-,LIBFORMULA_VERSION) )
-    STD_JAR_FILE( gid_File_Jar_Liblayout, CONCAT3(liblayout,-,LIBLAYOUT_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Liblayout, liblayout )
     STD_JAR_FILE( gid_File_Jar_Libloader, CONCAT3(libloader,-,LIBLOADER_VERSION) )
     STD_JAR_FILE( gid_File_Jar_Librepository, CONCAT3(librepository,-,LIBREPOSITORY_VERSION) )
     STD_JAR_FILE( gid_File_Jar_Libserializer, CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) )