[Git][java-team/openrefine-butterfly][master] 4 commits: New upstream version 1.2.0
Markus Koschany (@apo)
gitlab at salsa.debian.org
Mon Nov 15 11:38:37 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine-butterfly
Commits:
5d7ca3a5 by Markus Koschany at 2021-11-15T12:18:21+01:00
New upstream version 1.2.0
- - - - -
cee1837b by Markus Koschany at 2021-11-15T12:18:21+01:00
Update upstream source from tag 'upstream/1.2.0'
Update to upstream version '1.2.0'
with Debian dir 3dfa403bed5127d83a58f86b5e2dc80a5428f225
- - - - -
cd602fe4 by Markus Koschany at 2021-11-15T12:20:38+01:00
Update changelog
- - - - -
c3f8bad6 by Markus Koschany at 2021-11-15T12:21:56+01:00
Ignore mockito-core instead of mockito-all
- - - - -
11 changed files:
- − .classpath
- + .github/dependabot.yml
- .github/workflows/maven.yml
- debian/changelog
- debian/maven.ignoreRules
- − main/.classpath
- main/pom.xml
- main/webapp/WEB-INF/log4j.properties
- pom.xml
- − server/.classpath
- server/src/log4j.properties
Changes:
=====================================
.classpath deleted
=====================================
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="main/src"/>
- <classpathentry kind="src" path="main/tests/src"/>
- <classpathentry kind="src" path="modules/samples/extended-examples/MOD-INF/src"/>
- <classpathentry kind="src" path="server/src"/>
- <classpathentry kind="lib" path="main/tests/lib/mockito-all-1.8.4.jar"/>
- <classpathentry kind="lib" path="main/tests/lib/testng-5.12.1.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib-src/commons-collections-3.2.1-sources.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib-src/commons-io-1.4-sources.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib-src/rhino-1.7R2-sources.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/commons-io-1.4.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/commons-lang-2.5.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/log4j-1.2.15.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/rhino-1.7R2.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/tracer-1.0.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/velocity-1.6.3.jar"/>
- <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/lessen-trunk-r8.jar"/>
- <classpathentry kind="lib" path="server/lib/log4j-1.2.15.jar"/>
- <classpathentry kind="lib" path="server/lib/servlet-api-2.5.jar"/>
- <classpathentry kind="lib" path="server/lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="server/lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="lib" path="server/lib/tracer-1.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="server/lib/jetty-client-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-security-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-util-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-webapp-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-server-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-http-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-io-9.4.26.v20200117.jar"/>
- <classpathentry kind="lib" path="server/lib/jetty-servlet-9.4.26.v20200117.jar"/>
- <classpathentry kind="output" path="server/classes"/>
-</classpath>
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: maven
+ directory: "/"
+ schedule:
+ interval: daily
+ open-pull-requests-limit: 10
=====================================
.github/workflows/maven.yml
=====================================
@@ -11,14 +11,18 @@ on:
jobs:
build:
+ strategy:
+ matrix:
+ java: [ 8, 11, 16 ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout at v2
- - name: Set up JDK 1.8
+ - name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java at v1
with:
- java-version: 1.8
+ distribution: 'adopt'
+ java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B package --file pom.xml
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+openrefine-butterfly (1.2.0-1) unstable; urgency=medium
+
+ * New upstream version 1.2.0.
+
+ -- Markus Koschany <apo at debian.org> Mon, 15 Nov 2021 12:20:24 +0100
+
openrefine-butterfly (1.1.1-2) unstable; urgency=medium
* Source-only rebuild.
=====================================
debian/maven.ignoreRules
=====================================
@@ -5,5 +5,5 @@ org.apache.maven.plugins maven-gpg-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
org.apache.maven.plugins maven-surefire-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
-org.mockito mockito-all * * * *
+org.mockito mockito-core * * * *
org.testng testng * * * *
=====================================
main/.classpath deleted
=====================================
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="tests/src">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/butterfly server/lib/servlet-api-2.5.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/log4j-1.2.15.jar"/>
- <classpathentry kind="lib" path="tests/lib/mockito-all-1.8.4.jar"/>
- <classpathentry kind="lib" path="tests/lib/testng-5.12.1.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/rhino-1.7R2.jar" sourcepath="webapp/WEB-INF/lib-src/rhino-1.7R2-sources.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/tracer-1.0.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-io-1.4.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/velocity-1.6.3.jar"/>
- <classpathentry kind="lib" path="webapp/WEB-INF/lib/lessen-trunk-r8.jar"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
=====================================
main/pom.xml
=====================================
@@ -7,12 +7,12 @@
<parent>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly-container</artifactId>
- <version>1.1.1</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly</artifactId>
- <version>1.1.1</version>
+ <version>1.2.0</version>
<name>SIMILE Butterfly Engine</name>
<url>https://github.com/OpenRefine/simile-butterfly/</url>
@@ -75,12 +75,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -95,7 +95,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>com.metaweb</groupId>
@@ -105,17 +105,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>1.7.32</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.7.32</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<exclusions>
<exclusion>
<groupId>com.sun.jmx</groupId>
@@ -130,13 +130,13 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>7.1.0</version>
+ <version>7.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.4</version>
+ <artifactId>mockito-core</artifactId>
+ <version>3.12.4</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
main/webapp/WEB-INF/log4j.properties
=====================================
@@ -1,7 +1,7 @@
log4j.rootLogger=error, console
-log4j.logger.butterfly=info
-log4j.logger.javascript=info
-log4j.logger.velocity=error
+log4j.logger.butterfly=INFO
+log4j.logger.javascript=INFO
+log4j.logger.velocity=ERROR
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
=====================================
pom.xml
=====================================
@@ -12,7 +12,7 @@
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly-container</artifactId>
- <version>1.1.1</version>
+ <version>1.2.0</version>
<packaging>pom</packaging>
<name>SIMILE Butterfly</name>
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -84,7 +84,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -97,7 +97,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.3.1</version>
<configuration>
<javadocExecutable>/usr/bin/javadoc</javadocExecutable>
<source>8</source>
@@ -122,7 +122,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -142,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>3.3.1</version>
<configuration>
<aggregate>true</aggregate>
<source>1.8</source>
@@ -170,4 +170,13 @@
</plugins>
</reporting>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>7.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
=====================================
server/.classpath deleted
=====================================
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="lib" path="lib/servlet-api-2.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty-6.1.22.jar"/>
- <classpathentry kind="lib" path="lib/jetty-util-6.1.22.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="output" path="classes"/>
-</classpath>
=====================================
server/src/log4j.properties
=====================================
@@ -1,6 +1,6 @@
log4j.rootLogger=INFO, console
log4j.logger.org.mortbay.log=WARN
log4j.logger.org.mortbay.jetty=ERROR
-
+log4j.logger.butterfly=WARN
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/5a3265424c5f8953e1c417d194b86a768ba887e8...c3f8bad6aec36619db42f955683870d566341e48
--
View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/5a3265424c5f8953e1c417d194b86a768ba887e8...c3f8bad6aec36619db42f955683870d566341e48
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/20211115/5ca5fc6b/attachment.htm>
More information about the pkg-java-commits
mailing list