Upgraded all libraries, switched to npm, upgraded angular and jdk21
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
This commit is contained in:
iparenteau committed
1 parent
c2f8e20fad
commit
a6df549919
335 files changed
+10923
-12700
No files matched your search
@@ -17,24 +17,69 @@
|
||||
</organization>
|
||||
|
||||
<scm>
|
||||
<connection>scm://git@bitbucket.org:locus2k/portal-webapp.git</connection>
|
||||
<connection>ssh://gitea@gitea.locusworks.net:7999/locusworks/portal-webapp.git</connection>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>nexus-snapshot</id>
|
||||
<url>${nexus.repo}/repository/locusworks-snapshot/</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>nexus-release</id>
|
||||
<url>${nexus.repo}/repository/locusworks-release/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>locusworks-public</id>
|
||||
<name>locusworks-public</name>
|
||||
<url>${nexus.repo}/repository/locusworks-public/</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>locusworks-public</id>
|
||||
<url>${nexus.repo}/repository/locusworks-public/</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
|
||||
<properties>
|
||||
<java.version>1.8</java.version>
|
||||
<spring.version>5.0.7.RELEASE</spring.version>
|
||||
<spring.security.version>5.0.6.RELEASE</spring.security.version>
|
||||
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
|
||||
<java.version>21</java.version>
|
||||
<maven.compiler.release>${java.version}</maven.compiler.release>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<spring-boot.version>4.1.1</spring-boot.version>
|
||||
<tomcat.version>11.0.25</tomcat.version>
|
||||
<mysql-connector.version>26.7.0</mysql-connector.version>
|
||||
<!-- Enable with -Dportal.ossIndexEnabled=true and a Maven server named oss-index. -->
|
||||
<portal.ossIndexEnabled>false</portal.ossIndexEnabled>
|
||||
<main.basedir>${project.basedir}</main.basedir>
|
||||
<hibernate.version>5.2.16.Final</hibernate.version>
|
||||
<flyway.version>5.1.4</flyway.version>
|
||||
<leak-prevention.version>2.6.1</leak-prevention.version>
|
||||
<h2.version>2.4.240</h2.version>
|
||||
<flyway.version>13.5.0</flyway.version>
|
||||
<leak-prevention.version>2.7.0</leak-prevention.version>
|
||||
<current.version>1.0.0-RELEASE</current.version>
|
||||
<slf4j.version>1.7.25</slf4j.version>
|
||||
<findbugs.version>3.0.5</findbugs.version>
|
||||
<junit.version>4.12</junit.version>
|
||||
<war.name>portal</war.name>
|
||||
<tomcat.deploy.url>${tomcat-deploy-url}/manager/text </tomcat.deploy.url>
|
||||
<tomcat.deploy.server> tomcat-localhost </tomcat.deploy.server>
|
||||
<junit.version>4.13.2</junit.version>
|
||||
<frontend-maven-plugin.version>2.0.2</frontend-maven-plugin.version>
|
||||
<node.version>v24.20.0</node.version>
|
||||
<npm.version>12.0.2</npm.version>
|
||||
<flyway_deploy.url> jdbc:mysql://localhost:3306 </flyway_deploy.url>
|
||||
<flyway_deploy.server> flyway-localhost </flyway_deploy.server>
|
||||
</properties>
|
||||
@@ -53,37 +98,37 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.12.0</version>
|
||||
<configuration>
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
<failOnError>false</failOnError>
|
||||
<additionalDependencies>
|
||||
<additionalDependency>
|
||||
<groupId>javax.interceptor</groupId>
|
||||
<artifactId>javax.interceptor-api</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<groupId>jakarta.interceptor</groupId>
|
||||
<artifactId>jakarta.interceptor-api</artifactId>
|
||||
<version>2.2.0</version>
|
||||
</additionalDependency>
|
||||
<additionalDependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
<version>1.3.1</version>
|
||||
<groupId>jakarta.annotation</groupId>
|
||||
<artifactId>jakarta.annotation-api</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</additionalDependency>
|
||||
</additionalDependencies>
|
||||
<groups>
|
||||
<group>
|
||||
<title>NGAS Portal Common Library</title>
|
||||
<title>Locusworks Portal Common Library</title>
|
||||
<packages>net.locusworks.portal.common*</packages>
|
||||
</group>
|
||||
<group>
|
||||
<title>NGAS Portal Database Library</title>
|
||||
<title>Locusworks Portal Database Library</title>
|
||||
<packages>net.locusworks.portal.database*</packages>
|
||||
</group>
|
||||
<group>
|
||||
<title>NGAS Portal Migration Library</title>
|
||||
<title>Locusworks Portal Migration Library</title>
|
||||
<packages>net.locusworks.portal.migration*</packages>
|
||||
</group>
|
||||
<group>
|
||||
<title>NGAS Portal WebApp Library</title>
|
||||
<title>Locusworks Portal WebApp Library</title>
|
||||
<packages>
|
||||
net.locusworks.portal.config
|
||||
:net.locusworks.portal.controllers
|
||||
@@ -130,7 +175,7 @@
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>versions-maven-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
<version>2.21.0</version>
|
||||
<configuration>
|
||||
<generateBackupPoms>false</generateBackupPoms>
|
||||
</configuration>
|
||||
@@ -141,14 +186,19 @@
|
||||
<plugin>
|
||||
<groupId>org.owasp</groupId>
|
||||
<artifactId>dependency-check-maven</artifactId>
|
||||
<version>3.1.2</version>
|
||||
<version>13.0.0</version>
|
||||
<configuration>
|
||||
<mavenSettingsProxyId>ngas-proxy2</mavenSettingsProxyId>
|
||||
<skipProvidedScope>true</skipProvidedScope>
|
||||
<skipTestScope>true</skipTestScope>
|
||||
<skipTestScope>true</skipTestScope>
|
||||
<!-- OSS Index cannot run anonymously; NVD and other analyzers remain enabled. -->
|
||||
<ossIndexAnalyzerEnabled>${portal.ossIndexEnabled}</ossIndexAnalyzerEnabled>
|
||||
<!-- Native dev-tool binaries for other platforms are not deployed.
|
||||
Keep the lockfile audit of ALL npm dependencies, including dev tools. -->
|
||||
<nodePackageSkipDevDependencies>true</nodePackageSkipDevDependencies>
|
||||
<nodeAuditSkipDevDependencies>false</nodeAuditSkipDevDependencies>
|
||||
<failOnError>false</failOnError>
|
||||
<versionCheckEnabled>true</versionCheckEnabled>
|
||||
</configuration>
|
||||
<nvdApiKey>e2eb1036-9b5b-4df9-95e7-0888be947011</nvdApiKey> </configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@@ -159,38 +209,23 @@
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<version>3.16.0</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<release>${maven.compiler.release}</release>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.5</version>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.5.6</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.tomcat.maven</groupId>
|
||||
<artifactId>tomcat7-maven-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-nop</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<url>${tomcat.deploy.url}</url>
|
||||
<server>${tomcat.deploy.server}</server>
|
||||
<warFile>target/portal.war</warFile>
|
||||
<path>/portal</path>
|
||||
</configuration>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>3.1.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-scm-plugin</artifactId>
|
||||
<version>1.9.4</version>
|
||||
<version>2.2.1</version>
|
||||
<configuration>
|
||||
<tag>portal-${project.version}</tag>
|
||||
</configuration>
|
||||
@@ -198,22 +233,50 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<!-- Security fixes newer than the Spring Boot 4.1.1 BOM. -->
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat.embed</groupId>
|
||||
<artifactId>tomcat-embed-core</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat.embed</groupId>
|
||||
<artifactId>tomcat-embed-el</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat.embed</groupId>
|
||||
<artifactId>tomcat-embed-websocket</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<version>${mysql-connector.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-dependencies</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils</artifactId>
|
||||
<version>1.9.3</version>
|
||||
<version>1.11.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.11</version>
|
||||
<version>1.22.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.6</version>
|
||||
<version>2.22.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
@@ -228,74 +291,47 @@
|
||||
<version>${junit.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<version>${h2.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi</artifactId>
|
||||
<version>3.17</version>
|
||||
<version>5.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-ooxml</artifactId>
|
||||
<version>3.17</version>
|
||||
<version>5.5.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.7</version>
|
||||
<version>3.20.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
<version>1.3.3</version>
|
||||
<version>1.6.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-math3</artifactId>
|
||||
<version>3.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jdbc</artifactId>
|
||||
<version>${tomcat-version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-validator</groupId>
|
||||
<artifactId>commons-validator</artifactId>
|
||||
<version>1.6</version>
|
||||
<version>1.11.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring Framework jars to be shared across projects -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-core</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-aop</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jdbc</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-tx</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-jpa</artifactId>
|
||||
<version>2.0.8.RELEASE</version>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -304,6 +340,11 @@
|
||||
<version>${flyway.version}</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-mysql</artifactId>
|
||||
<version>${flyway.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/se.jiderhamn.classloader-leak-prevention/classloader-leak-prevention-core -->
|
||||
<dependency>
|
||||
@@ -320,13 +361,42 @@
|
||||
<dependency>
|
||||
<groupId>net.locusworks</groupId>
|
||||
<artifactId>locusworks-commons</artifactId>
|
||||
<version>1.1.0-RELEASE</version>
|
||||
<version>3.0.1-RELEASE</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.locusworks</groupId>
|
||||
<artifactId>applogger</artifactId>
|
||||
<version>2.0.2-RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<modules>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>oss-index</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>portal.ossIndexEnabled</name>
|
||||
<value>true</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.owasp</groupId>
|
||||
<artifactId>dependency-check-maven</artifactId>
|
||||
<configuration>
|
||||
<ossIndexServerId>oss-index</ossIndexServerId>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<modules>
|
||||
<module>portal_client</module>
|
||||
<module>portal_database</module>
|
||||
<module>portal_migration</module>
|
||||
@@ -334,4 +404,4 @@
|
||||
<module>portal_webapp</module>
|
||||
<module>portal_json</module>
|
||||
</modules>
|
||||
</project>
|
||||
</project>
|
||||
Reference in new issue
Block a user