Skip to content

Commit

Permalink
Upgrade dependencies and plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
arkanovicz committed Jun 11, 2022
1 parent 1874e67 commit 976066a
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 31 deletions.
4 changes: 2 additions & 2 deletions modality-api-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-api-client</artifactId>
Expand Down Expand Up @@ -50,7 +50,7 @@ under the License.
<dependency>
<groupId>com.republicate</groupId>
<artifactId>essential-json</artifactId>
<version>2.6.3</version>
<version>2.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modality-api-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>
<artifactId>modality-api-server</artifactId>
<packaging>jar</packaging>
Expand Down
12 changes: 6 additions & 6 deletions modality-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-core</artifactId>
Expand All @@ -38,7 +38,7 @@
<plugin>
<groupId>fr.jcgay.maven.plugins</groupId>
<artifactId>buildplan-maven-plugin</artifactId>
<version>1.3</version>
<version>1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.10-RC2</version>
<version>0.10.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -90,7 +90,7 @@
<dependency>
<groupId>com.republicate</groupId>
<artifactId>essential-json</artifactId>
<version>2.6.3</version>
<version>2.6.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -113,7 +113,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.0</version>
<version>2.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -125,7 +125,7 @@
<dependency>
<groupId>com.diogonunes</groupId>
<artifactId>JColor</artifactId>
<version>5.2.0</version>
<version>5.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions modality-examples/modality-example-bookshelf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality-examples</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-example-bookshelf</artifactId>
Expand Down Expand Up @@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.0</version>
<version>2.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -95,7 +95,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0-M7</version>
<executions>
<execution>
<id>integration-test</id>
Expand All @@ -114,7 +114,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.7.9</version>
<version>1.9.0</version>
<configuration>
<skip>${maven.test.skip}</skip>
<container>
Expand Down
2 changes: 1 addition & 1 deletion modality-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-examples</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions modality-webapp-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-webapp-auth</artifactId>
Expand Down Expand Up @@ -69,7 +69,7 @@ under the License.
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.0</version>
<version>2.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -125,7 +125,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<systemProperties>
<property>
Expand Down
5 changes: 2 additions & 3 deletions modality-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>modality-webapp</artifactId>
Expand Down Expand Up @@ -85,7 +85,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>shade</id>
Expand Down Expand Up @@ -116,7 +116,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<systemProperties>
<property>
Expand Down
66 changes: 58 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.

<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>

<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -76,7 +76,7 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junit.version>4.13.2</junit.version>
<slf4j.version>1.7.32</slf4j.version>
<slf4j.version>1.7.36</slf4j.version>
<servlet.version>3.1.0</servlet.version>
<velocity-tools.version>3.1</velocity-tools.version>
<jetty.version>9.4.9.v20180320</jetty.version>
Expand Down Expand Up @@ -111,7 +111,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.10.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
<source>1.8</source>
Expand All @@ -134,7 +134,7 @@ under the License.
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -145,7 +145,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.2.1</version>
<configuration>
<includePom>false</includePom>
</configuration>
Expand All @@ -161,7 +161,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0-M7</version>
<configuration>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
<systemProperties>
Expand All @@ -179,7 +179,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.0</version>
<configuration>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
<doclint>none</doclint>
Expand All @@ -193,14 +193,64 @@ under the License.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -215,7 +265,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
2 changes: 1 addition & 1 deletion velocity-tools-apiclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>velocity-tools-apiclient</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions velocity-tools-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<groupId>com.republicate.modality</groupId>
<artifactId>modality</artifactId>

<version>2.1-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>velocity-tools-model</artifactId>
Expand Down Expand Up @@ -75,7 +75,7 @@ under the License.
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.0</version>
<version>2.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 976066a

Please sign in to comment.