diff --git a/Ports/JavaSE/build.xml b/Ports/JavaSE/build.xml index 6884bc78cf..a8f6657be7 100644 --- a/Ports/JavaSE/build.xml +++ b/Ports/JavaSE/build.xml @@ -158,7 +158,7 @@ - + diff --git a/Ports/JavaSE/nbproject/project.properties b/Ports/JavaSE/nbproject/project.properties index 070233a736..956da8fb2a 100644 --- a/Ports/JavaSE/nbproject/project.properties +++ b/Ports/JavaSE/nbproject/project.properties @@ -35,13 +35,13 @@ file.reference.Filters.jar=../../../cn1-binaries/javase/Filters.jar file.reference.jcef.jar=../../../cn1-binaries/javase/jcef.jar file.reference.jmf-2.1.1e.jar=../../../cn1-binaries/javase/jmf-2.1.1e.jar file.reference.jfxrt.jar=../../../cn1-binaries/jfxrt.jar -file.reference.sqlite-jdbc-3.46.0.1.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.46.0.1.jar +file.reference.sqlite-jdbc-3.46.1.0.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.46.1.0.jar includes=** jar.compress=false javafx.path=../../../cn1-binaries/javafx/lib javac.classpath=\ ${reference.CodenameOne.jar}:\ - ${file.reference.sqlite-jdbc-3.46.0.1.jar}:\ + ${file.reference.sqlite-jdbc-3.46.1.0.jar}:\ ${file.reference.Filters.jar}:\ ${file.reference.jcef.jar}:\ ${file.reference.jmf-2.1.1e.jar}:\ diff --git a/maven/javase/pom.xml b/maven/javase/pom.xml index 3ca4ec282e..9016fde94e 100644 --- a/maven/javase/pom.xml +++ b/maven/javase/pom.xml @@ -19,9 +19,8 @@ - org.xerial + com.codenameone sqlite-jdbc - 3.46.0.1 com.jhlabs diff --git a/maven/pom.xml b/maven/pom.xml index 538d0b5db7..b5f7766999 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -67,6 +67,7 @@ java-runtime core factory + sqlite-jdbc javase javase-svg android @@ -94,6 +95,11 @@ codenameone-core ${project.version} + + com.codenameone + sqlite-jdbc + ${project.version} + com.codenameone codenameone-designer diff --git a/maven/sqlite-jdbc/README.adoc b/maven/sqlite-jdbc/README.adoc new file mode 100644 index 0000000000..38030c08a0 --- /dev/null +++ b/maven/sqlite-jdbc/README.adoc @@ -0,0 +1,6 @@ += sqlite-jdbc Shaded Jar + +This is a shaded jar that includes the sqlite-jdbc jar with the slf4j-api jar shaded into it at a different package, +so as not to conflict with other libraries that might include slf4j. + +We needed to add this when we upgraded to version 3.46.1.0 of the sqlite-jdbc library, because it adds a dependency on slf4j-api. diff --git a/maven/sqlite-jdbc/dependency-reduced-pom.xml b/maven/sqlite-jdbc/dependency-reduced-pom.xml new file mode 100644 index 0000000000..821ac86633 --- /dev/null +++ b/maven/sqlite-jdbc/dependency-reduced-pom.xml @@ -0,0 +1,35 @@ + + + + codenameone + com.codenameone + 8.0-SNAPSHOT + + 4.0.0 + sqlite-jdbc + 8.0-SNAPSHOT + + + + maven-shade-plugin + 3.3.0 + + + package + + shade + + + + + org.slf4j + com.codename1.compat.sqlite.slf4j + + + + + + + + + diff --git a/maven/sqlite-jdbc/pom.xml b/maven/sqlite-jdbc/pom.xml new file mode 100644 index 0000000000..de7df1b959 --- /dev/null +++ b/maven/sqlite-jdbc/pom.xml @@ -0,0 +1,53 @@ + + 4.0.0 + + sqlite-jdbc + 8.0-SNAPSHOT + jar + + com.codenameone + codenameone + 8.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + + package + + shade + + + + + org.slf4j + com.codename1.compat.sqlite.slf4j + + + + + + + + + + + + org.xerial + sqlite-jdbc + 3.46.1.0 + + + org.slf4j + slf4j-api + 1.7.36 + + + diff --git a/maven/sqlite-jdbc/src/.gitignore b/maven/sqlite-jdbc/src/.gitignore new file mode 100644 index 0000000000..e69de29bb2