[Git][java-team/openrefine-butterfly][master] 5 commits: New upstream version 1.2.3
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sat Dec 25 18:15:06 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine-butterfly
Commits:
6aef5900 by Markus Koschany at 2021-12-21T21:55:31+01:00
New upstream version 1.2.3
- - - - -
5aae98f1 by Markus Koschany at 2021-12-21T21:55:31+01:00
Update upstream source from tag 'upstream/1.2.3'
Update to upstream version '1.2.3'
with Debian dir aee54d94f4b152fd478aa8a26db6d632f3de9434
- - - - -
171fcf21 by Markus Koschany at 2021-12-21T22:17:08+01:00
Use log4j2 instead of log4j1.2.
- - - - -
861e87ae by Markus Koschany at 2021-12-25T19:03:05+01:00
Update changelog
- - - - -
6250d264 by Markus Koschany at 2021-12-25T19:11:03+01:00
Ignore org.apache.logging.log4j
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/maven.ignoreRules
- debian/maven.rules
- main/appengine/WEB-INF/log4j.properties
- main/pom.xml
- main/src/edu/mit/simile/butterfly/Butterfly.java
- main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java
- main/tests/src/tests.log4j.properties → main/tests/src/log4j2.properties
- main/webapp/WEB-INF/log4j.properties
- pom.xml
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+openrefine-butterfly (1.2.3-1) unstable; urgency=medium
+
+ * New upstream version 1.2.3.
+ * Use log4j2 instead of log4j1.2.
+
+ -- Markus Koschany <apo at debian.org> Sat, 25 Dec 2021 19:02:43 +0100
+
openrefine-butterfly (1.2.0-1) unstable; urgency=medium
* New upstream version 1.2.0.
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends:
libcommons-io-java,
libcommons-lang-java,
liblessen-java,
- liblog4j1.2-java,
+ liblog4j2-java,
librhino-java,
libservlet-api-java,
libslf4j-java,
=====================================
debian/maven.ignoreRules
=====================================
@@ -7,3 +7,4 @@ org.apache.maven.plugins maven-surefire-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
org.mockito mockito-core * * * *
org.testng testng * * * *
+org.apache.logging.log4j log4j-slf4j-impl * * * *
=====================================
debian/maven.rules
=====================================
@@ -4,4 +4,3 @@ javax.servlet s/javax.servlet-api/servlet-api/ jar s/.*/debian/ * *
org.apache.velocity velocity jar s/.*/debian/ * *
org.openrefine.dependencies butterfly-container pom s/.*/debian/ * *
org.openrefine.dependencies butterfly jar s/.*/debian/ * *
-log4j log4j * s/1\.2\..*/1.2.x/ * *
=====================================
main/appengine/WEB-INF/log4j.properties
=====================================
@@ -2,4 +2,5 @@ log4j.rootLogger=error, console
log4j.logger.velocity=error
log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.SimpleLayout
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
=====================================
main/pom.xml
=====================================
@@ -7,12 +7,12 @@
<parent>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly-container</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
</parent>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
<name>SIMILE Butterfly Engine</name>
<url>https://github.com/OpenRefine/simile-butterfly/</url>
@@ -62,11 +62,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>edu.mit.simile</groupId>
- <artifactId>tracer</artifactId>
- <version>1.0</version>
- </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -88,9 +83,9 @@
<version>1.6.3</version>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.7R2</version>
+ <groupId>org.mozilla</groupId>
+ <artifactId>rhino</artifactId>
+ <version>1.7.14-RC1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -108,24 +103,10 @@
<version>1.7.32</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.32</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -136,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.12.4</version>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
main/src/edu/mit/simile/butterfly/Butterfly.java
=====================================
@@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.ExtendedProperties;
-import org.apache.log4j.PropertyConfigurator;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
import org.mozilla.javascript.Context;
@@ -248,18 +247,6 @@ public class Butterfly extends HttpServlet {
_autoreload = _properties.getBoolean(AUTORELOAD, false);
- if (!_appengine) {
- String log4j = System.getProperty("butterfly.log4j");
- File logProperties = (log4j == null) ? new File(_webInfDir, "log4j.properties") : new File(log4j);
- if (logProperties.exists()) {
- if (_autoreload) {
- PropertyConfigurator.configureAndWatch(logProperties.getAbsolutePath(), watcherDelay);
- } else {
- PropertyConfigurator.configure(logProperties.getAbsolutePath());
- }
- }
- }
-
_logger = LoggerFactory.getLogger(_name);
_logger.info("Starting {} ...", _name);
=====================================
main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java
=====================================
@@ -14,11 +14,6 @@ public class ButterflyTest {
transient protected Logger logger;
- @BeforeSuite
- public void init() {
- System.setProperty("log4j.configuration", "tests.log4j.properties");
- }
-
protected HttpServletRequest getRequest(String scheme, String host, String requestURI, String pathInfo, String originalHost, String originalContext) {
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getScheme()).thenReturn(scheme);
=====================================
main/tests/src/tests.log4j.properties → main/tests/src/log4j2.properties
=====================================
@@ -3,5 +3,6 @@ log4j.logger.butterfly=warn
log4j.logger.javascript=info
log4j.logger.Velocity=error
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
+log4j.appender.console=ConsoleAppender
+log4j.appender.console.layout=PatternLayout
+log4j.appender.console.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
=====================================
main/webapp/WEB-INF/log4j.properties
=====================================
@@ -4,4 +4,5 @@ log4j.logger.javascript=INFO
log4j.logger.velocity=ERROR
log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
=====================================
pom.xml
=====================================
@@ -12,7 +12,7 @@
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly-container</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
<packaging>pom</packaging>
<name>SIMILE Butterfly</name>
@@ -58,6 +58,10 @@
<module>main</module>
</modules>
+ <properties>
+ <log4j.version>2.17.0</log4j.version>
+ </properties>
+
<scm>
<connection>scm:git:https://github.com/OpenRefine/simile-butterfly.git</connection>
<developerConnection>scm:git:https://github.com/OpenRefine/simile-butterfly.git</developerConnection>
View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/c3f8bad6aec36619db42f955683870d566341e48...6250d264df820aacde90371bf7938dfe06dca068
--
View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/c3f8bad6aec36619db42f955683870d566341e48...6250d264df820aacde90371bf7938dfe06dca068
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20211225/8af1ebcd/attachment.htm>
More information about the pkg-java-commits
mailing list