From ea6bc1e6afd4c8f902f4e2da3924a90bd1c73ecf Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 12 Feb 2009 11:44:09 +0000
Subject: CWS-TOOLING: integrate CWS jl115 2009-01-29 13:13:16 +0100 jsk 
 r267121 : #i98596# 2009-01-23 14:50:24 +0100 jl  r266821 : #98273#
 climaker.exe.config prevents using publisher policy 2009-01-23 14:10:51 +0100
 jl  r266817 : #i98392# wrong use of iterator when removing a factory, which
 may lead to a crash 2009-01-19 11:36:29 +0100 jl  r266484 : #i96690# test
 extension 2009-01-19 11:32:46 +0100 jl  r266483 : #i96690# 2009-01-16
 17:09:19 +0100 jl  r266439 : #i96690# ignore duplicate path URLs in
 manifest.xml. These may be introduces by copy/paste and lead to nasty errors
 2009-01-16 14:04:00 +0100 jl  r266416 : #i92032# increasing minimum version
 of Java 2009-01-16 10:57:02 +0100 jl  r266407 : #i96816# compiler warning
 breaks build 2009-01-15 16:58:54 +0100 jl  r266384 : #i94938# patch from cmc.
 2009-01-15 16:35:18 +0100 jl  r266383 : #i95838# applying patch 2009-01-15
 16:15:58 +0100 jl  r266381 : #i70855# #i96102# WaitForMultipleObjects wrong
 implemented 2009-01-14 12:46:21 +0100 jl  r266287 : #i98038# increased
 assembly versions 2009-01-14 12:44:55 +0100 jl  r266285 : #i98038# increased
 assembly versions 2009-01-13 17:11:20 +0100 jl  r266239 : #i98038# new test
 library for assemblies from 3.0.1

---
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml  | 13 ++++++-------
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |  6 +++---
 jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml    |  6 +++---
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml    |  4 ++--
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml    |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'jvmfwk/distributions/OpenOfficeorg')

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index e62f482ab5ff..f3bf44addc25 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -3,24 +3,23 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2004-01-30</updated>
+ <updated>2008-01-16</updated>
 
  <vendorInfos>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="IBM Corporation">
-    <minVersion>1.3.1</minVersion>
-    <maxVersion>1.4.2</maxVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="Blackdown Java-Linux Team">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="Free Software Foundation, Inc.">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="BEA Systems, Inc.">
-    <minVersion>1.4.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 1cf20d535c30..1d7894a11025 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -3,14 +3,14 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2006-05-02</updated>
+ <updated>2008-01-16</updated>
 
  <vendorInfos>
   <vendor name="Apple Computer, Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  <vendor name="Apple Inc.">
-  <minVersion>1.3.1</minVersion>
+  <minVersion>1.5.0</minVersion>
  </vendor>
  </vendorInfos>
  <plugins>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
index 89f896104f89..5ba2eaf76251 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
@@ -3,14 +3,14 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2004-01-30</updated>
+ <updated>2008-01-16</updated>
 
  <vendorInfos>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="IBM Corporation">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 187a1d39f10c..b9b8296edf8f 100755
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -3,11 +3,11 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2004-01-30</updated>
+ <updated>2008-01-16</updated>
 
  <vendorInfos>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index c97b5b4f89b4..47a5800659ca 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -3,14 +3,14 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2004-01-30</updated>
+ <updated>2008-01-16</updated>
 
  <vendorInfos>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="IBM Corporation">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
-- 
cgit v1.2.3