Skip to content

HSEARCH-4432 + HSEARCH-4433 + HSEARCH-4434 Upgrade to Hibernate ORM 5.4.33.Final #2831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 11, 2022
Merged

HSEARCH-4432 + HSEARCH-4433 + HSEARCH-4434 Upgrade to Hibernate ORM 5.4.33.Final #2831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
973dfac
HSEARCH-4433 Move the tests to log4j2
fax4ever Oct 21, 2020
40cde4f
HSEARCH-4433 Use log4j2 in Spring ITs
yrodiere Jan 10, 2022
f44434b
HSEARCH-4433 Remove unused appenders
fax4ever Oct 27, 2020
16d84ce
HSEARCH-4433 Avoid to log UNICODE 0xFFFF (and 0xFFFE)
fax4ever Oct 28, 2020
2087eaf
HSEARCH-4433 Scope ExpectedLog4jLog to a given logger instead of the …
yrodiere Oct 28, 2020
22a795e
HSEARCH-4433 Properly display Log4j2 events as they were received whe…
yrodiere Oct 28, 2020
2b139c3
HSEARCH-4433 Display matching events as well as extra events upon fai…
yrodiere Oct 28, 2020
8e01cea
HSEARCH-4433 Make log checking in ExpectedLog4jLog thread-safe
yrodiere Oct 28, 2020
910fe81
HSEARCH-4433 Avoid NPE in LogChecker
yrodiere Nov 20, 2020
82ad2b9
HSEARCH-4433 Upgade to log4j 2.17.1
yrodiere Jan 10, 2022
5baa9ad
HSEARCH-4434 Avoid unnecessary synchronization in ExpectedLog4jLog
yrodiere Jan 10, 2022
da6ddfd
HSEARCH-4432 Upgrade to Hibernate ORM 5.4.33.Final
yrodiere Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backends/jgroups/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
48 changes: 0 additions & 48 deletions backends/jgroups/src/test/resources/log4j.properties
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions backends/jgroups/src/test/resources/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
### direct log messages to stdout ###
appender.stdout.type=Console
appender.stdout.name=STDOUT
appender.stdout.layout.type=PatternLayout
appender.stdout.layout.pattern=%d{ABSOLUTE} (%t) %5p %c{1}:%L - %m%n

## Loggers
rootLogger.level=info
rootLogger.appenderRef.stdout.ref=STDOUT

### JBoss logger
logger.jboss.name=org.jboss
logger.jboss.level=info

### Hibernate logger
logger.hibernate.name=org.hibernate
logger.hibernate.level=info

### Search logger
logger.search.name=org.hibernate.search
logger.search.level=info

### Hbm2ddl logger
logger.hbm2ddl.name=org.hibernate.tool.hbm2ddl
logger.hbm2ddl.level=warn

### Elasticsearch logger
logger.elasticsearch.name=org.elasticsearch.client
logger.elasticsearch.level=debug
4 changes: 2 additions & 2 deletions elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
57 changes: 0 additions & 57 deletions elasticsearch/src/test/resources/log4j.properties
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions elasticsearch/src/test/resources/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
### direct log messages to stdout ###
appender.stdout.type=Console
appender.stdout.name=STDOUT
appender.stdout.layout.type=PatternLayout
appender.stdout.layout.pattern=%d{ABSOLUTE} (%t) %5p %c{1}:%L - %m%n

## Loggers
rootLogger.level=info
rootLogger.appenderRef.stdout.ref=STDOUT

### JBoss logger
logger.jboss.name=org.jboss
logger.jboss.level=info

### Hibernate logger
logger.hibernate.name=org.hibernate
logger.hibernate.level=info

### Search logger
logger.search.name=org.hibernate.search
logger.search.level=info

### Hbm2ddl logger
logger.hbm2ddl.name=org.hibernate.tool.hbm2ddl
logger.hbm2ddl.level=warn

### Elasticsearch logger
logger.elasticsearch.name=org.elasticsearch.client
logger.elasticsearch.level=debug
4 changes: 2 additions & 2 deletions engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/hibernate/search/test/analyzer/common/PropertyLevelAnalyzerDeprecationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.junit.Rule;
import org.junit.Test;

import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.hamcrest.CoreMatchers;

Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/hibernate/search/test/analyzer/common/TypeLevelAnalyzerDeprecationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.junit.Rule;
import org.junit.Test;

import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.hamcrest.CoreMatchers;

Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/org/hibernate/search/test/configuration/IndexNameOverrideDeprecationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.junit.Rule;
import org.junit.Test;

import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import org.hamcrest.CoreMatchers;

@TestForIssue(jiraKey = "HSEARCH-4336")
Expand Down
23 changes: 19 additions & 4 deletions ...e/src/test/java/org/hibernate/search/test/configuration/IndexWriterTuningAppliedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@

import java.io.IOException;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.core.appender.NullAppender;
import org.apache.lucene.index.IndexWriter;
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.backend.impl.lucene.AbstractWorkspaceImpl;
import org.hibernate.search.spi.IndexedTypeIdentifier;
import org.hibernate.search.spi.impl.PojoIndexedTypeIdentifier;
import org.hibernate.search.test.util.impl.log4j.Log4j2ConfigurationAccessor;
import org.hibernate.search.testsupport.TestForIssue;
import org.hibernate.search.testsupport.junit.SearchFactoryHolder;
import org.hibernate.search.testsupport.junit.SkipOnElasticsearch;
import org.hibernate.search.util.logging.impl.LuceneLogCategories;

import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand All @@ -36,20 +39,32 @@
@TestForIssue(jiraKey = "HSEARCH-1508")
@Category(SkipOnElasticsearch.class) // IndexWriters are specific to Lucene
public class IndexWriterTuningAppliedTest {
private static final String LOGGER_NAME = LuceneLogCategories.INFOSTREAM_LOGGER_CATEGORY.getName();

@Rule
public SearchFactoryHolder sfHolder = new SearchFactoryHolder( Dvd.class, Book.class )
.withProperty( "hibernate.search.default.indexwriter.max_thread_states", "23" )
.withProperty( "hibernate.search.index2.indexwriter.max_thread_states", "7" )
.withProperty( "hibernate.search.index2.indexwriter.infostream", "true" );

private final Log4j2ConfigurationAccessor programmaticConfig = new Log4j2ConfigurationAccessor( LOGGER_NAME );
private final IndexedTypeIdentifier dvdTestType = PojoIndexedTypeIdentifier.convertFromLegacy( Dvd.class );
private final IndexedTypeIdentifier bookTestType = PojoIndexedTypeIdentifier.convertFromLegacy( Book.class );

@Before
public void setUp() throws Exception {
// This will enable trace level on the magic category,
// which is necessary for infostreams to be actually enabled.
programmaticConfig.addAppender( NullAppender.createAppender( "LuceneTestAppender" ) );
}

@After
public void tearDown() throws Exception {
programmaticConfig.removeAppender();
}

@Test
public void testInfoStream() throws IOException {
//Enable trace level on the magic category:
Logger.getLogger( LuceneLogCategories.INFOSTREAM_LOGGER_CATEGORY.getName() ).setLevel( Level.TRACE );
AbstractWorkspaceImpl dvdsWorkspace = sfHolder.extractWorkspace( dvdTestType );
AbstractWorkspaceImpl booksWorkspace = sfHolder.extractWorkspace( bookTestType );
IndexWriter dvdsIndexWriter = dvdsWorkspace.getIndexWriter();
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/hibernate/search/test/configuration/MultipleTypesInSingleIndexDeprecationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.junit.Rule;
import org.junit.Test;

import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import org.hamcrest.CoreMatchers;

@TestForIssue(jiraKey = "HSEARCH-4336")
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/hibernate/search/test/configuration/NonExclusiveIndexUseDeprecationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.junit.Test;
import org.junit.experimental.categories.Category;

import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import org.hamcrest.CoreMatchers;

@TestForIssue(jiraKey = "HSEARCH-4336")
Expand Down
Loading