Skip to content
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

Jump to bottom

Update to slf4j 1.7.36 #270

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Update to slf4j 1.7.36 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0097e5f
Update to slf4j 1.7.36
DaGeRe Aug 26, 2024
9605a00
Remove unused slf4j version (since its already present in the pom.xml
DaGeRe Aug 26, 2024
9b1898e
Manage slf4j version in parent pom.xml
DaGeRe Aug 28, 2024
5ad8e95
Update maven compiler plugin to 3.13.0 and mvn war plugin to 3.4.0 to be
DaGeRe Aug 28, 2024
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
6 changes: 3 additions & 3 deletions interfaces/tools.descartes.teastore.entities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<url>http://descartes.tools</url>

<properties>
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>net.kieker-monitoring</groupId>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
</dependencies>
<parent>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<properties>
<teastoreversion>1.4.2</teastoreversion>
<slf4j.version>1.7.36</slf4j.version>
</properties>

<prerequisites>
Expand Down Expand Up @@ -56,6 +57,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
4 changes: 2 additions & 2 deletions services/tools.descartes.teastore.image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
Expand Down
4 changes: 2 additions & 2 deletions services/tools.descartes.teastore.registry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
<dependency> <!-- Logging framework also used by ribbon -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>

<!-- WebApp Dependencies -->
Expand Down
1 change: 0 additions & 1 deletion utilities/tools.descartes.teastore.dockerbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ RUN keytool -import -noprompt -trustcacerts -alias teastoressl -file /usr/local/
COPY kieker.monitoring.properties /kieker/config/kieker.monitoring.properties
COPY aop.xml /usr/local/tomcat/lib/aop.xml
COPY kieker-1.15-SNAPSHOT-aspectj.jar /kieker/agent/agent.jar
COPY slf4j-simple-1.7.21.jar /usr/local/slf4j-simple-1.7.21.jar

EXPOSE 8080

Expand Down
Binary file removed utilities/tools.descartes.teastore.dockerbase/slf4j-simple-1.7.21.jar
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion utilities/tools.descartes.teastore.dockerbase/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ fi
touch /usr/local/tomcat/bin/setenv.sh
chmod +x /usr/local/tomcat/bin/setenv.sh
echo 'export JAVA_OPTS="-javaagent:/kieker/agent/agent.jar --add-opens=java.base/java.lang=ALL-UNNAMED -Dkieker.monitoring.configuration=/kieker/config/kieker.monitoring.properties -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=aop.xml -Dkieker.monitoring.skipDefaultAOPConfiguration=true -Daj.weaving.loadersToSkip=java.net.URLClassLoader -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true"' > /usr/local/tomcat/bin/setenv.sh
echo 'export CLASSPATH=$CLASSPATH:/usr/local/slf4j-simple-1.7.21.jar' >> /usr/local/tomcat/bin/setenv.sh

4 changes: 2 additions & 2 deletions utilities/tools.descartes.teastore.kieker.rabbitmq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>net.kieker-monitoring</groupId>
Expand Down
4 changes: 2 additions & 2 deletions utilities/tools.descartes.teastore.registryclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
<!-- Logging framework also used by ribbon -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
Expand Down
Loading