Move the log4j classes to core. Thanks to @MarcMil. (#57)

j256 · Dec 9, 2020 · fd6eec8 · fd6eec8
1 parent f21f57b
commit fd6eec8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 173 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,9 +40,6 @@
 		<joda-time-version>1.5</joda-time-version>
 		<ormlite-version>${project.version}</ormlite-version>
 		<commons-logging-version>1.1.1</commons-logging-version>
-		<!-- yes we know this is an issue but it is here for backwards compatibility -->
-		<log4j-version>1.2.17</log4j-version>
-		<log4j2-version>2.0-beta4</log4j2-version>
 	</properties>
 	<developers>
 		<developer>
@@ -342,20 +339,6 @@
 			<version>${ormlite-version}</version>
 		</dependency>
 
-		<!-- provided dependencies for optional features -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j-version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-			<version>${log4j2-version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>com.j256.ormlite</groupId>

diff --git a/src/main/java/com/j256/ormlite/jdbc/logger/Log4j2Log.java b/src/main/java/com/j256/ormlite/jdbc/logger/Log4j2Log.java
diff --git a/src/main/java/com/j256/ormlite/jdbc/logger/Log4jLog.java b/src/main/java/com/j256/ormlite/jdbc/logger/Log4jLog.java
diff --git a/src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java b/src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java
diff --git a/src/test/java/com/j256/ormlite/jdbc/stmt/JdbcQueryBuilderTest.java b/src/test/java/com/j256/ormlite/jdbc/stmt/JdbcQueryBuilderTest.java
@@ -35,7 +35,6 @@ public class JdbcQueryBuilderTest extends BaseJdbcTest {
 	private Foo foo2;
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void testAnd() throws Exception {
 		Dao<Foo, String> fooDao = createTestData();
 		QueryBuilder<Foo, String> qb = fooDao.queryBuilder();
@@ -64,7 +63,6 @@ public void testAnd() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void testOr() throws Exception {
 		Dao<Foo, String> fooDao = createTestData();
 		QueryBuilder<Foo, String> qb = fooDao.queryBuilder();
@@ -242,7 +240,6 @@ public void testNotBad() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void testNotNotComparison() throws Exception {
 		Dao<Foo, String> fooDao = createTestData();
 		QueryBuilder<Foo, String> qb = fooDao.queryBuilder();