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 Maven plugins #669

Merged
merged 4 commits into from
Oct 7, 2023
Merged

Update Maven plugins #669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52c50f4
[dicoogle][sdk] Update maven plugins
Enet4 Sep 30, 2023
07bdea1
Update formatter-maven-plugin
Enet4 Sep 30, 2023
cdb0c07
Format Java code
Enet4 Sep 30, 2023
c846c09
Reorganize .gitignore
Enet4 Sep 30, 2023
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
Next Next commit
[dicoogle][sdk] Update maven plugins 
- maven-compiler-plugin 3.11.0
- maven-shade-plugin 3.5.1
- maven-resources-plugin 3.3.1
- frontend-maven-plugin 1.14.0
   - update nodeVersion to 18.17.1 and npmVersion to 9.6.7
- license-maven-plugin 4.3
- formatter-maven-plugin 2.12.2
  • Loading branch information
@Enet4
Enet4 committed Sep 30, 2023
commit 52c50f41acbe7e711b82850243520c04d0a7f541
38 changes: 22 additions & 16 deletions dicoogle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -146,7 +146,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>1.8</source>
Expand All @@ -158,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
Expand Down Expand Up @@ -209,16 +209,22 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.4</version>
<version>4.3</version>
<configuration>
<header>../short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>

<mapping>
<java>JAVADOC_STYLE</java>
</mapping>
<licenseSets>
<licenseSet>
<header>../short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
<executions>
<execution>
Expand All @@ -232,7 +238,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.11.0</version>
<version>2.12.2</version>
<configuration>
<encoding>UTF-8</encoding>
<includes>
Expand All @@ -257,7 +263,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.0</version>
<version>1.14.0</version>
<executions>
<!-- Install Node and NPM -->
<execution>
Expand Down Expand Up @@ -296,8 +302,8 @@

</executions>
<configuration>
<nodeVersion>v14.17.3</nodeVersion>
<npmVersion>6.14.13</npmVersion>
<nodeVersion>v18.17.1</nodeVersion>
<npmVersion>9.6.7</npmVersion>
<installDirectory>target</installDirectory>
<!-- Defining webapp directory -->
<workingDirectory>src/main/resources/webapp</workingDirectory>
Expand Down
27 changes: 17 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -28,15 +28,22 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.4</version>
<version>4.3</version>
<configuration>
<header>short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>
<mapping>
<java>JAVADOC_STYLE</java>
</mapping>
<licenseSets>
<licenseSet>
<header>short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>

<executions>
Expand All @@ -51,7 +58,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.11.0</version>
<version>2.12.2</version>
<configuration>
<encoding>UTF-8</encoding>
<includes>
Expand Down
56 changes: 31 additions & 25 deletions sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,33 +56,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/*.SF</exclude>
<exclude>**/*.DSA</exclude>
<exclude>**/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/*.SF</exclude>
<exclude>**/*.DSA</exclude>
<exclude>**/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>1.8</source>
Expand All @@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<version>3.3.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
Expand All @@ -102,17 +102,23 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.4</version>
<version>4.3</version>
<configuration>
<header>../short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>
<mapping>
<java>JAVADOC_STYLE</java>
</mapping>
<licenseSets>
<licenseSet>
<header>../short-license.txt</header>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/package-info.java</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>

<executions>
<execution>
<goals>
Expand All @@ -125,7 +131,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.11.0</version>
<version>2.12.2</version>
<configuration>
<encoding>UTF-8</encoding>
<includes>
Expand Down