Compare commits

...

11 Commits

Author SHA1 Message Date
dependabot[bot] 477c8df913 Bump spring-core from 5.3.19 to 5.3.20
Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.19 to 5.3.20.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20)

---
updated-dependencies:
- dependency-name: org.springframework:spring-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 06:02:42 +00:00
Olivier Lamy f2f155d69e exclude com.sun
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-06 08:22:03 +10:00
Olivier Lamy a475e3a9bf grhhh ehcache is using some version range
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-06 07:54:45 +10:00
Olivier Lamy 0bbafdf71e do not use jakarta package
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-06 07:27:06 +10:00
Olivier Lamy 5d065a8bc4 use maven_3.8.5
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-05 21:56:41 +10:00
Olivier Lamy 47e462892b xml bind version
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-05 21:50:57 +10:00
Olivier Lamy 18760edb88 add upperbounds enforcer rule
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-05 21:36:56 +10:00
Olivier Lamy c59fb99caa move version properties in child or it is complicated to sync and prevent dependabot working
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-06-05 20:38:02 +10:00
dependabot[bot] 4f68ddc373 Bump swagger-ui from 3.51.2 to 4.11.1
Bumps [swagger-ui](https://github.com/webjars/swagger-ui) from 3.51.2 to 4.11.1.
- [Release notes](https://github.com/webjars/swagger-ui/releases)
- [Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-3.51.2...swagger-ui-4.11.1)

---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-31 10:43:06 +00:00
dependabot[bot] 167cf86740 Bump maven-dependency-plugin from 3.2.0 to 3.3.0
Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.2.0...maven-dependency-plugin-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 01:29:00 +00:00
dependabot[bot] f757ae2e90 Bump exec-maven-plugin from 1.6.0 to 3.0.0
Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.6.0 to 3.0.0.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/exec-maven-plugin-1.6.0...exec-maven-plugin-3.0.0)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:exec-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 01:28:42 +00:00
3 changed files with 72 additions and 10 deletions

2
Jenkinsfile vendored
View File

@ -30,7 +30,7 @@
LABEL = 'ubuntu'
buildJdk = 'jdk_1.8_latest'
buildJdk11 = 'jdk_11_latest'
mavenVersion = 'maven_3.6.3'
mavenVersion = 'maven_3.8.5'
def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),
findbugsPublisher(disabled: true), openTasksPublisher(disabled: true),

74
pom.xml
View File

@ -92,7 +92,44 @@
<!-- The git repository, where the site content is placed -->
<siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
<jetty.version>9.4.43.v20210629</jetty.version>
<slf4j.version>1.7.32</slf4j.version>
<log4j.version>2.17.1</log4j.version>
<ehcache.version>3.9.9</ehcache.version>
<spring.version>5.3.20</spring.version>
<cxf.version>3.3.11</cxf.version>
<jackson.version>2.12.1</jackson.version>
<hsqldb.version>2.5.0</hsqldb.version>
<openjpa.version>3.1.1</openjpa.version>
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
<jakarta.mail.version>1.6.5</jakarta.mail.version>
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
<jakarta.transaction.version>1.3.3</jakarta.transaction.version>
<jakarta.ws.rs.version>2.1.6</jakarta.ws.rs.version>
<!-- apache commons -->
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.codec.version>1.15</commons.codec.version>
<commons.configuration.version>2.7</commons.configuration.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.collections.version>4.4</commons.collections.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.collections.3.version>3.2.2</commons.collections.3.version>
<!-- junit -->
<junit.platform.version>1.5.2</junit.platform.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<assertj.version>3.22.0</assertj.version>
<mockito.version>3.4.0</mockito.version>
<rest-assured.version>4.3.1</rest-assured.version>
<io.swagger.version>2.1.10</io.swagger.version>
<jjwt.version>0.11.2</jjwt.version>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
@ -361,6 +398,16 @@
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${ehcache.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>
@ -383,6 +430,16 @@
<version>${archiva.comp.version}</version>
</dependency>
<!-- Other -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -404,7 +461,11 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
@ -691,9 +752,14 @@
</dependency>
<!-- Java EE Dependencies -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
<scope>provided</scope>
</dependency>
@ -884,7 +950,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<ignoredUnusedDeclaredDependencies>org.junit.platform:junit-platform-launcher,org.junit.jupiter:junit-jupiter-engine,org.junit.vintage:junit-vintage-engine</ignoredUnusedDeclaredDependencies>
</configuration>
@ -1231,7 +1297,7 @@ The executor runs a shell script.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>3.0.0</version>
<inherited>false</inherited>
<executions>
<execution>

View File

@ -134,10 +134,6 @@
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@ -223,7 +219,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>3.51.2</version>
<version>4.11.1</version>
</dependency>
<dependency>