Skip to content

Commit 872d5df

Browse files
skodapetrskodapetr
committed
Update pom.xml and slf4j
Fix build issues, fix logging issues during build, enable tests for Docker build.
1 parent 3bce50a commit 872d5df

File tree

121 files changed

+503
-532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+503
-532
lines changed

‎dataunit-core/pom.xml

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?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/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<parent>
57
<groupId>com.linkedpipes</groupId>
@@ -28,22 +30,18 @@
2830
<dependency>
2931
<groupId>org.eclipse.rdf4j</groupId>
3032
<artifactId>rdf4j-model</artifactId>
31-
<scope>provided</scope>
3233
</dependency>
3334
<dependency>
3435
<groupId>org.eclipse.rdf4j</groupId>
3536
<artifactId>rdf4j-repository-sail</artifactId>
36-
<scope>provided</scope>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.eclipse.rdf4j</groupId>
4040
<artifactId>rdf4j-sail-nativerdf</artifactId>
41-
<scope>provided</scope>
4241
</dependency>
4342
<dependency>
4443
<groupId>org.eclipse.rdf4j</groupId>
4544
<artifactId>rdf4j-sail-memory</artifactId>
46-
<scope>provided</scope>
4745
</dependency>
4846
<!-- Jackson for serialization. -->
4947
<dependency>
@@ -54,19 +52,16 @@
5452
<dependency>
5553
<groupId>org.osgi</groupId>
5654
<artifactId>org.osgi.compendium</artifactId>
57-
<scope>provided</scope>
5855
</dependency>
5956
<!-- Required so we can use OSGI DS annotations. -->
6057
<dependency>
6158
<groupId>org.apache.felix</groupId>
6259
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
63-
<scope>provided</scope>
6460
</dependency>
6561
<!-- Provided by runtime env. -->
6662
<dependency>
6763
<groupId>commons-io</groupId>
6864
<artifactId>commons-io</artifactId>
69-
<scope>provided</scope>
7065
</dependency>
7166
<!-- Test. -->
7267
<dependency>

‎deploy-dependencies/pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?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/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<parent>
57
<groupId>com.linkedpipes</groupId>
@@ -8,8 +10,8 @@
810
<relativePath>../pom-plugin/pom.xml</relativePath>
911
</parent>
1012
<artifactId>deploy-dependencies</artifactId>
11-
<packaging>pom</packaging>
1213
<name>LinkedPipes Deploy Plugins</name>
14+
<packaging>pom</packaging>
1315

1416
<properties>
1517
<deploy.directory>../deploy</deploy.directory>
@@ -27,8 +29,9 @@
2729
<build>
2830
<plugins>
2931
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
3033
<artifactId>maven-clean-plugin</artifactId>
31-
<version>3.0.0</version>
34+
<version>3.2.0</version>
3235
<configuration>
3336
<filesets>
3437
<fileset>

‎executor-monitor/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM openjdk:17.0.1-jdk-slim-bullseye as lp-etl-build
2-
ARG LP_ETL_BUILD=-DskipTests
2+
ARG LP_ETL_BUILD=""
33

44
WORKDIR /opt/lp-etl/
55
COPY ./ ./
6-
RUN ./mvnw install $LP_ETL_BUILD -P "install-executor-monitor"
6+
RUN ./mvnw install $LP_ETL_BUILD -P "install-executor-monitor"
77

88
FROM openjdk:17.0.1-slim-bullseye
99
ARG LP_ETL_USER=5987

‎executor-monitor/pom.xml

+6-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?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/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<parent>
57
<groupId>com.linkedpipes</groupId>
@@ -8,9 +10,8 @@
810
<relativePath>../pom-backend/pom.xml</relativePath>
911
</parent>
1012
<artifactId>executor-monitor</artifactId>
11-
<version>0.0.0</version>
12-
<packaging>jar</packaging>
1313
<name>LinkedPipes Executor Monitor</name>
14+
<packaging>jar</packaging>
1415

1516
<dependencies>
1617
<!-- Java EE API used by RDF4J to hash blank nodes. -->
@@ -28,14 +29,10 @@
2829
<dependency>
2930
<groupId>com.linkedpipes</groupId>
3031
<artifactId>vocabulary</artifactId>
31-
<version>${lp.version}</version>
32-
<scope>compile</scope>
3332
</dependency>
3433
<dependency>
3534
<groupId>com.linkedpipes</groupId>
3635
<artifactId>library-rdf</artifactId>
37-
<version>${lp.version}</version>
38-
<scope>compile</scope>
3936
</dependency>
4037
<!-- FTP server -->
4138
<dependency>
@@ -53,7 +50,6 @@
5350
<dependency>
5451
<groupId>org.springframework</groupId>
5552
<artifactId>spring-context</artifactId>
56-
<scope>compile</scope>
5753
</dependency>
5854
<dependency>
5955
<groupId>org.springframework</groupId>
@@ -67,17 +63,14 @@
6763
<dependency>
6864
<groupId>ch.qos.logback</groupId>
6965
<artifactId>logback-classic</artifactId>
70-
<scope>compile</scope>
7166
</dependency>
7267
<dependency>
7368
<groupId>ch.qos.logback</groupId>
7469
<artifactId>logback-core</artifactId>
75-
<scope>compile</scope>
7670
</dependency>
7771
<dependency>
7872
<groupId>org.slf4j</groupId>
7973
<artifactId>log4j-over-slf4j</artifactId>
80-
<scope>compile</scope>
8174
</dependency>
8275
<!-- Jetty. -->
8376
<dependency>
@@ -109,37 +102,30 @@
109102
<dependency>
110103
<groupId>org.eclipse.rdf4j</groupId>
111104
<artifactId>rdf4j-model</artifactId>
112-
<scope>compile</scope>
113105
</dependency>
114106
<dependency>
115107
<groupId>org.eclipse.rdf4j</groupId>
116108
<artifactId>rdf4j-repository-api</artifactId>
117-
<scope>compile</scope>
118109
</dependency>
119110
<dependency>
120111
<groupId>org.eclipse.rdf4j</groupId>
121112
<artifactId>rdf4j-repository-sail</artifactId>
122-
<scope>compile</scope>
123113
</dependency>
124114
<dependency>
125115
<groupId>org.eclipse.rdf4j</groupId>
126116
<artifactId>rdf4j-repository-sparql</artifactId>
127-
<scope>compile</scope>
128117
</dependency>
129118
<dependency>
130119
<groupId>org.eclipse.rdf4j</groupId>
131120
<artifactId>rdf4j-sail-nativerdf</artifactId>
132-
<scope>compile</scope>
133121
</dependency>
134122
<dependency>
135123
<groupId>org.eclipse.rdf4j</groupId>
136124
<artifactId>rdf4j-sail-memory</artifactId>
137-
<scope>compile</scope>
138125
</dependency>
139126
<dependency>
140127
<groupId>org.eclipse.rdf4j</groupId>
141128
<artifactId>rdf4j-rio-jsonld</artifactId>
142-
<scope>compile</scope>
143129
</dependency>
144130
<!-- HTTP related, particularly: Multipart file upload. -->
145131
<dependency>
@@ -216,8 +202,9 @@
216202
<build>
217203
<plugins>
218204
<plugin>
205+
<groupId>org.apache.maven.plugins</groupId>
219206
<artifactId>maven-clean-plugin</artifactId>
220-
<version>3.1.0</version>
207+
<version>3.2.0</version>
221208
<configuration>
222209
<filesets>
223210
<fileset>

‎executor/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
FROM openjdk:17.0.1-jdk-slim-bullseye as lp-etl-build
2-
ARG LP_ETL_BUILD=-DskipTests
2+
ARG LP_ETL_BUILD=""
33

44
WORKDIR /opt/lp-etl/
55
COPY ./ ./
6+
# Copy Docker specific configuration file as we need it for install-plugins.
7+
RUN cp ./deploy/configuration.docker.properties ./deploy/configuration.properties.sample
68
RUN ./mvnw install $LP_ETL_BUILD -P "install-executor,install-plugins"
79

810
FROM openjdk:17.0.1-slim-bullseye

‎executor/pom.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<project xmlns="http://maven.apache.org/POM/4.0.0"
23
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -28,17 +29,14 @@
2829
<dependency>
2930
<groupId>com.linkedpipes</groupId>
3031
<artifactId>plugin-api</artifactId>
31-
<version>0.0.0</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.linkedpipes</groupId>
3535
<artifactId>library-template</artifactId>
36-
<version>${lp.version}</version>
3736
</dependency>
3837
<dependency>
3938
<groupId>com.linkedpipes</groupId>
4039
<artifactId>library-rdf</artifactId>
41-
<version>0.0.0</version>
4240
</dependency>
4341
<dependency>
4442
<groupId>com.linkedpipes</groupId>
@@ -69,7 +67,6 @@
6967
<dependency>
7068
<groupId>org.springframework</groupId>
7169
<artifactId>spring-context</artifactId>
72-
<scope>compile</scope>
7370
</dependency>
7471
<dependency>
7572
<groupId>org.springframework</groupId>
@@ -190,8 +187,9 @@
190187
<build>
191188
<plugins>
192189
<plugin>
190+
<groupId>org.apache.maven.plugins</groupId>
193191
<artifactId>maven-clean-plugin</artifactId>
194-
<version>3.1.0</version>
192+
<version>3.2.0</version>
195193
<configuration>
196194
<filesets>
197195
<fileset>

‎executor/src/main/java/com/linkedpipes/etl/executor/plugin/osgi/OsgiPackageList.java

+18-10
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,27 @@ private OsgiPackageList() {
1818
+ "javax.xml.bind.annotation.adapters;version=\"2.3.0\","
1919
+ "javax.annotation;version=\"1.3.2\"";
2020

21+
//
22+
/**
23+
* Since some libraries have not been updated to employ slf4j version 2.00
24+
* we need to export both versions. As stated in documentation
25+
* the change should be additive:
26+
* https://www.slf4j.org/faq.html#changesInVersion200
27+
*/
2128
private static final String SLF4J = ""
22-
+ "org.slf4j;version=\"1.7.21\","
23-
+ "org.slf4j.helpers;version=\"1.7.21\","
24-
+ "org.slf4j.spi;version=\"1.7.21\"";
29+
+ "org.slf4j;version=\"1.7\","
30+
+ "org.slf4j;version=\"2.0.7\","
31+
+ "org.slf4j.helpers;version=\"2.0.7\","
32+
+ "org.slf4j.spi;version=\"2.0.7\"";
2533

2634
private static final String LOGBACK = ""
27-
+ "ch.qos.logback.classic;version=\"1.1.7\","
28-
+ "ch.qos.logback.classic.joran;version=\"1.1.7\","
29-
+ "ch.qos.logback.core;version=\"1.1.7\","
30-
+ "ch.qos.logback.core.joran.action;version=\"1.1.7\","
31-
+ "ch.qos.logback.core.joran.spi;version=\"1.1.7\","
32-
+ "ch.qos.logback.core.rolling;version=\"1.1.7\","
33-
+ "ch.qos.logback.core.util;version=\"1.1.7\"";
35+
+ "ch.qos.logback.classic;version=\"1.4.7\","
36+
+ "ch.qos.logback.classic.joran;version=\"1.4.7\","
37+
+ "ch.qos.logback.core;version=\"1.4.7\","
38+
+ "ch.qos.logback.core.joran.action;version=\"1.4.7\","
39+
+ "ch.qos.logback.core.joran.spi;version=\"1.4.7\","
40+
+ "ch.qos.logback.core.rolling;version=\"1.4.7\","
41+
+ "ch.qos.logback.core.util;version=\"1.4.7\"";
3442

3543
private static final String LOG4J = ""
3644
+ "org.apache.log4j;version=\"1.7.18\","

‎frontend/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM node:16.14.2-bullseye as lp-etl-build
2-
ARG LP_ETL_BUILD=-DskipTests
2+
ARG LP_ETL_BUILD=""
33
RUN apt-get update && apt-get -y --no-install-recommends install openjdk-17-jdk
44
WORKDIR /opt/lp-etl/
55
COPY ./ ./
@@ -15,7 +15,6 @@ RUN mkdir -p /data/lp-etl/logs \
1515
COPY --from=lp-etl-build --chown=linkedpipes /opt/lp-etl/deploy/configuration.docker.properties /opt/lp-etl/configuration/configuration.properties
1616
COPY --from=lp-etl-build --chown=linkedpipes /opt/lp-etl/deploy/frontend /opt/lp-etl/frontend
1717

18-
1918
WORKDIR /opt/lp-etl/frontend
2019
USER $LP_ETL_USER
2120
EXPOSE 8080

‎frontend/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<groupId>com.linkedpipes</groupId>
77
<artifactId>frontend</artifactId>
88
<version>0.0.0</version>
9-
<packaging>pom</packaging>
109
<name>LinkedPipes Frontend</name>
10+
<packaging>pom</packaging>
1111

1212
<properties>
1313
<deploy.directory>../deploy/</deploy.directory>
@@ -24,8 +24,9 @@
2424
<build>
2525
<plugins>
2626
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
2728
<artifactId>maven-clean-plugin</artifactId>
28-
<version>3.0.0</version>
29+
<version>3.2.0</version>
2930
<configuration>
3031
<filesets>
3132
<fileset>

‎libraries/library-io/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<relativePath>../../pom-backend/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>library-io</artifactId>
13-
<packaging>jar</packaging>
1413
<name>LinkedPipes Library IO</name>
14+
<packaging>jar</packaging>
1515
<dependencies>
1616
<dependency>
1717
<groupId>com.fasterxml.jackson.core</groupId>

‎libraries/library-pipeline/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
<relativePath>../../pom-backend/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>library-pipeline</artifactId>
13-
<packaging>jar</packaging>
1413
<name>LinkedPipes Library Pipeline</name>
14+
<packaging>jar</packaging>
1515
<dependencies>
1616
<dependency>
1717
<groupId>com.linkedpipes</groupId>
1818
<artifactId>library-rdf</artifactId>
19-
<version>0.0.0</version>
2019
</dependency>
2120
<!-- Testing. -->
2221
<dependency>

‎libraries/library-rdf/pom.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,29 @@
1010
<relativePath>../../pom-backend/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>library-rdf</artifactId>
13-
<packaging>jar</packaging>
1413
<name>LinkedPipes Library RDF</name>
14+
<packaging>jar</packaging>
1515
<dependencies>
1616
<!-- RDF4j -->
1717
<dependency>
1818
<groupId>org.eclipse.rdf4j</groupId>
1919
<artifactId>rdf4j-model</artifactId>
20-
<version>${rdf4j.version}</version>
2120
</dependency>
2221
<dependency>
2322
<groupId>org.eclipse.rdf4j</groupId>
2423
<artifactId>rdf4j-rio-api</artifactId>
25-
<version>${rdf4j.version}</version>
2624
</dependency>
2725
<dependency>
2826
<groupId>org.eclipse.rdf4j</groupId>
2927
<artifactId>rdf4j-rio-jsonld</artifactId>
30-
<version>${rdf4j.version}</version>
3128
</dependency>
3229
<dependency>
3330
<groupId>org.eclipse.rdf4j</groupId>
3431
<artifactId>rdf4j-rio-trig</artifactId>
35-
<version>${rdf4j.version}</version>
3632
</dependency>
3733
<dependency>
3834
<groupId>org.eclipse.rdf4j</groupId>
3935
<artifactId>rdf4j-rio-nquads</artifactId>
40-
<version>${rdf4j.version}</version>
4136
</dependency>
4237
<!-- Dependencies for RDF4j -->
4338
<dependency>

0 commit comments

Comments
 (0)