Skip to content

Commit 6327bf0

Browse files
shai-almogshai-almog
committed
2 parents e0cde5c + deb8e3f commit 6327bf0

File tree

8 files changed

+104
-5
lines changed

8 files changed

+104
-5
lines changed

‎Ports/JavaSE/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<copy file="../../../codenameone-skins/iphone5_os7.skin" tofile="src/iphone5.skin" />
159159
<copy file="../../../codenameone-skins/xoom.skin" todir="src" / -->
160160
<copydir src="${project.CodenameOne}/build/classes" dest="build/classes" />
161-
<unjar src="../../../cn1-binaries/javase/sqlite-jdbc-3.46.0.1.jar" dest="build/classes" />
161+
<unjar src="../../../cn1-binaries/javase/sqlite-jdbc-3.46.1.0.jar" dest="build/classes" />
162162
<unjar src="../../../cn1-binaries/javase/Filters.jar" dest="build/classes" />
163163
</target>
164164

‎Ports/JavaSE/nbproject/project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ file.reference.Filters.jar=../../../cn1-binaries/javase/Filters.jar
3535
file.reference.jcef.jar=../../../cn1-binaries/javase/jcef.jar
3636
file.reference.jmf-2.1.1e.jar=../../../cn1-binaries/javase/jmf-2.1.1e.jar
3737
file.reference.jfxrt.jar=../../../cn1-binaries/jfxrt.jar
38-
file.reference.sqlite-jdbc-3.46.0.1.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.46.0.1.jar
38+
file.reference.sqlite-jdbc-3.46.1.0.jar=../../../cn1-binaries/javase/sqlite-jdbc-3.46.1.0.jar
3939
includes=**
4040
jar.compress=false
4141
javafx.path=../../../cn1-binaries/javafx/lib
4242
javac.classpath=\
4343
${reference.CodenameOne.jar}:\
44-
${file.reference.sqlite-jdbc-3.46.0.1.jar}:\
44+
${file.reference.sqlite-jdbc-3.46.1.0.jar}:\
4545
${file.reference.Filters.jar}:\
4646
${file.reference.jcef.jar}:\
4747
${file.reference.jmf-2.1.1e.jar}:\

‎maven/javase/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919

2020
</dependency>
2121
<dependency>
22-
<groupId>org.xerial</groupId>
22+
<groupId>com.codenameone</groupId>
2323
<artifactId>sqlite-jdbc</artifactId>
24-
<version>3.46.0.1</version>
2524
</dependency>
2625
<dependency>
2726
<groupId>com.jhlabs</groupId>

‎maven/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<module>java-runtime</module>
6868
<module>core</module>
6969
<module>factory</module>
70+
<module>sqlite-jdbc</module>
7071
<module>javase</module>
7172
<module>javase-svg</module>
7273
<module>android</module>
@@ -94,6 +95,11 @@
9495
<artifactId>codenameone-core</artifactId>
9596
<version>${project.version}</version>
9697
</dependency>
98+
<dependency>
99+
<groupId>com.codenameone</groupId>
100+
<artifactId>sqlite-jdbc</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
97103
<dependency>
98104
<groupId>com.codenameone</groupId>
99105
<artifactId>codenameone-designer</artifactId>

‎maven/sqlite-jdbc/README.adoc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
= sqlite-jdbc Shaded Jar
2+
3+
This is a shaded jar that includes the sqlite-jdbc jar with the slf4j-api jar shaded into it at a different package,
4+
so as not to conflict with other libraries that might include slf4j.
5+
6+
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.

‎maven/sqlite-jdbc/dependency-reduced-pom.xml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>codenameone</artifactId>
5+
<groupId>com.codenameone</groupId>
6+
<version>8.0-SNAPSHOT</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>sqlite-jdbc</artifactId>
10+
<version>8.0-SNAPSHOT</version>
11+
<build>
12+
<plugins>
13+
<plugin>
14+
<artifactId>maven-shade-plugin</artifactId>
15+
<version>3.3.0</version>
16+
<executions>
17+
<execution>
18+
<phase>package</phase>
19+
<goals>
20+
<goal>shade</goal>
21+
</goals>
22+
<configuration>
23+
<relocations>
24+
<relocation>
25+
<pattern>org.slf4j</pattern>
26+
<shadedPattern>com.codename1.compat.sqlite.slf4j</shadedPattern>
27+
</relocation>
28+
</relocations>
29+
</configuration>
30+
</execution>
31+
</executions>
32+
</plugin>
33+
</plugins>
34+
</build>
35+
</project>

‎maven/sqlite-jdbc/pom.xml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<artifactId>sqlite-jdbc</artifactId>
7+
<version>8.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
9+
<parent>
10+
<groupId>com.codenameone</groupId>
11+
<artifactId>codenameone</artifactId>
12+
<version>8.0-SNAPSHOT</version>
13+
</parent>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-shade-plugin</artifactId>
20+
<version>3.3.0</version>
21+
<executions>
22+
<execution>
23+
<phase>package</phase>
24+
<goals>
25+
<goal>shade</goal>
26+
</goals>
27+
<configuration>
28+
<relocations>
29+
<relocation>
30+
<pattern>org.slf4j</pattern>
31+
<shadedPattern>com.codename1.compat.sqlite.slf4j</shadedPattern>
32+
</relocation>
33+
</relocations>
34+
</configuration>
35+
</execution>
36+
</executions>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
41+
<dependencies>
42+
<dependency>
43+
<groupId>org.xerial</groupId>
44+
<artifactId>sqlite-jdbc</artifactId>
45+
<version>3.46.1.0</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-api</artifactId>
50+
<version>1.7.36</version>
51+
</dependency>
52+
</dependencies>
53+
</project>

‎maven/sqlite-jdbc/src/.gitignore

Whitespace-only changes.

0 commit comments

Comments
 (0)