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.

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

Fix dependabot warnings #441

Merged
merged 3 commits into from
Jun 26, 2024
Merged
Changes from all commits
Commits
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
104 changes: 67 additions & 37 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.ucsb.nceas</groupId>
<artifactId>metadig-engine</artifactId>
<version>3.0.2</version>
<version>3.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>metadig-engine</name>
<description>MetaDIG library for running metadata quality tests</description>
Expand All @@ -16,12 +18,13 @@
<renjin.version>0.8.2567</renjin.version>
<jython.version>2.7.3</jython.version>
<gson.version>2.10.1</gson.version>
<json-path.version>2.8.0</json-path.version>
<json-path.version>2.9.0</json-path.version>
<moxy.version>2.7.0</moxy.version>
<log4j.version>2.23.0</log4j.version>
<d1_cn_index_processor_version>2.3.15</d1_cn_index_processor_version>
<d1_cn_index_common_version>2.3.2</d1_cn_index_common_version>
<!-- Have to use a very old version of Spring in order to stay compatible with d1_cn_index_processor -->
<!-- Have to use a very old version of Spring in order to stay compatible with
d1_cn_index_processor -->
<!-- <spring.version>4.3.8.RELEASE</spring.version> -->
<spring.version>5.3.22</spring.version>
<!-- <docker.registry>docker.io</docker.registry> -->
Expand Down Expand Up @@ -86,12 +89,18 @@
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json-path.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.0</version>
<version>2.5.1</version>
</dependency>
<!-- http://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
Expand Down Expand Up @@ -140,14 +149,15 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion><groupId>org.javassist</groupId>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.rabbitmq/amqp-client -->
<dependency>
Expand Down Expand Up @@ -240,11 +250,17 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.0</version>
<version>1.3.2</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
Expand Down Expand Up @@ -396,8 +412,8 @@
</exclusion>
</exclusions>
</dependency>
<!-- API, java.xml.bind module -->
<dependency>
<!-- API, java.xml.bind module -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
Expand Down Expand Up @@ -426,7 +442,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
Expand All @@ -441,7 +457,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -470,7 +486,8 @@
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>edu.ucsb.nceas.mdqengine.Controller</Main-Class>
<Build-Number>1</Build-Number>
Expand Down Expand Up @@ -503,15 +520,28 @@
<configuration>
<!-- Copy files needed by the local environments of the Docker containers -->
<target name="copy files">
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar" tofile="${project.basedir}/Docker/metadig-worker/metadig-engine.jar"/>
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar" tofile="${project.basedir}/Docker/metadig-scheduler/metadig-engine.jar"/>
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar" tofile="${project.basedir}/Docker/metadig-scorer/metadig-engine.jar"/>
<copy file="${project.build.directory}/classes/solr/application-context-mdq.xml" tofile="${project.basedir}/Docker/metadig-worker/solr/application-context-mdq.xml"/>
<copy file="${project.build.directory}/classes/solr/application-context-systemmeta-200.xml" tofile="${project.basedir}/Docker/metadig-worker/solr/application-context-systemmeta-200.xml"/>
<copy file="${project.build.directory}/classes/solr/metadig-index-processor-context.xml" tofile="${project.basedir}/Docker/metadig-worker/solr/metadig-index-processor-context.xml"/>
<copy file="${project.build.directory}/classes/solr/application-context-mdq.xml" tofile="${project.basedir}/Docker/metadig-scorer/solr/application-context-mdq.xml"/>
<copy file="${project.build.directory}/classes/solr/application-context-systemmeta-200.xml" tofile="${project.basedir}/Docker/metadig-scorer/solr/application-context-systemmeta-200.xml"/>
<copy file="${project.build.directory}/classes/solr/metadig-index-processor-context.xml" tofile="${project.basedir}/Docker/metadig-scorer/solr/metadig-index-processor-context.xml"/>
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar"
tofile="${project.basedir}/Docker/metadig-worker/metadig-engine.jar" />
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar"
tofile="${project.basedir}/Docker/metadig-scheduler/metadig-engine.jar" />
<copy file="${project.build.directory}/metadig-engine-${project.version}.jar"
tofile="${project.basedir}/Docker/metadig-scorer/metadig-engine.jar" />
<copy file="${project.build.directory}/classes/solr/application-context-mdq.xml"
tofile="${project.basedir}/Docker/metadig-worker/solr/application-context-mdq.xml" />
<copy
file="${project.build.directory}/classes/solr/application-context-systemmeta-200.xml"
tofile="${project.basedir}/Docker/metadig-worker/solr/application-context-systemmeta-200.xml" />
<copy
file="${project.build.directory}/classes/solr/metadig-index-processor-context.xml"
tofile="${project.basedir}/Docker/metadig-worker/solr/metadig-index-processor-context.xml" />
<copy file="${project.build.directory}/classes/solr/application-context-mdq.xml"
tofile="${project.basedir}/Docker/metadig-scorer/solr/application-context-mdq.xml" />
<copy
file="${project.build.directory}/classes/solr/application-context-systemmeta-200.xml"
tofile="${project.basedir}/Docker/metadig-scorer/solr/application-context-systemmeta-200.xml" />
<copy
file="${project.build.directory}/classes/solr/metadig-index-processor-context.xml"
tofile="${project.basedir}/Docker/metadig-scorer/solr/metadig-index-processor-context.xml" />
</target>
</configuration>
</execution>
Expand Down Expand Up @@ -550,20 +580,20 @@
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>${maven.wagon.version}</version>
</extension>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>${maven.wagon.version}</version>
</extension>
</extensions>
</build>
<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>maven.dataone.org</id>
<name>DataONE</name>
<url>scp://maven.dataone.org/var/www/maven</url>
<layout>default</layout>
</repository>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>maven.dataone.org</id>
<name>DataONE</name>
<url>scp://maven.dataone.org/var/www/maven</url>
<layout>default</layout>
</repository>
</distributionManagement>
</project>
</project>
Loading