add jaxb-core

lucee · Feb 23, 2024 · 8b37274 · 8b37274
1 parent 27a81fb
commit 8b37274
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -378,6 +378,13 @@
       <artifactId>ulid-creator</artifactId>
       <version>5.2.3</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-core -->
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-core</artifactId>
+    <version>2.3.0.1</version>
+</dependency>
+
   </dependencies>
 
   <repositories>

diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF
@@ -361,7 +361,8 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
  org.lucee.txtmark;bundle-version=0.16.0,
  com.github.f4b6a3.ulid;bundle-version=5.2.3,
  org.lucee.janino;bundle-version=3.1.9,
- org.lucee.janinocc;bundle-version=3.1.9
+ org.lucee.janinocc;bundle-version=3.1.9,
+ com.sun.xml.bind.jaxb-c;bundle-version=2.3.0.1
 Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;version=8.1.0,
  99A4EF8D-F2FD-40C8-8FB8C2E67A4EEEB6;name=MSSQL;label=MS SQL Server;version=12.2.0.jre8,
  671B01B8-B3B3-42B9-AC055A356BED5281;name=PostgreSQL;label=PostgreSQL;version=42.6.0,

diff --git a/core/src/main/java/META-INF/osgi-maven-mapping.ini b/core/src/main/java/META-INF/osgi-maven-mapping.ini
@@ -1421,4 +1421,8 @@ artifactId=asm
 
 [org.objectweb.asm.tree]
 groupId=org.ow2.asm
-artifactId=asm-tree
+artifactId=asm-tree
+
+[com.sun.xml.bind.jaxb-c]
+groupId=com.sun.xml.bind
+artifactId=jaxb-core
diff --git a/core/src/main/java/lucee/commons/io/res/type/datasource/core/MySQL.java b/core/src/main/java/lucee/commons/io/res/type/datasource/core/MySQL.java
@@ -236,9 +236,6 @@ public void write(DatasourceConnection dc, String prefix, Attr attr, InputStream
 	}
 
 	private void writeUpdate(DatasourceConnection dc, String prefix, Attr attr, InputStream is, boolean append) throws SQLException {
-
-		// update rdr_data set rdr_data = concat(rdr_data,'susi') where rdr_id = 1
-
 		String sql = append ? "update " + prefix + "data set rdr_data=concat(rdr_data,?) where rdr_id=?" : "update " + prefix + "data set rdr_data=? where rdr_id=?";
 		log(sql);
 		PreparedStatement stat1 = null;

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.0.57-SNAPSHOT"/>
+  <property name="version" value="6.1.0.58-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.0.57-SNAPSHOT</version>
+  <version>6.1.0.58-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>
@@ -667,6 +667,12 @@
     <scope>provided</scope>
     </dependency>
 
+    <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-core -->
+<dependency>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb-core</artifactId>
+    <version>2.3.0.1</version>
+</dependency>
 
 
 </dependencies>

diff --git a/loader/src/main/java/lucee/loader/engine/BundleProvider.java b/loader/src/main/java/lucee/loader/engine/BundleProvider.java
@@ -440,6 +440,7 @@ public final class BundleProvider {
 		put(mappings, "org.objectweb.asm.util", new Info("org.ow2.asm", "asm-util"));
 		put(mappings, "org.objectweb.asm", new Info("org.ow2.asm", "asm"));
 		put(mappings, "org.objectweb.asm.tree", new Info("org.ow2.asm", "asm-tree"));
+		put(mappings, "com.sun.xml.bind.jaxb-c", new Info("com.sun.xml.bind", "jaxb-core"));
 
 	}