Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for JDK 11 dependencies

This commit is contained in:
Martin Stockhammer 2020-07-05 00:46:37 +02:00
parent 15691a2c8a
commit 427f6d33a3
7 changed files with 99 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
View File

@ -86,6 +86,10 @@
<groupId>jakarta.inject</groupId> <groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId> <artifactId>jakarta.inject-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>

4
archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml
View File

@ -143,6 +143,10 @@
<groupId>jakarta.inject</groupId> <groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId> <artifactId>jakarta.inject-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- TEST Scope --> <!-- TEST Scope -->

2
archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
View File

@ -251,8 +251,6 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

6
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
View File

@ -77,6 +77,10 @@
<groupId>jakarta.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies> </dependencies>
@ -111,8 +115,6 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

4
archiva-modules/archiva-web/archiva-security/pom.xml
View File

@ -48,6 +48,10 @@
<groupId>jakarta.inject</groupId> <groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId> <artifactId>jakarta.inject-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jakarta.servlet-api</artifactId>

2
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -612,8 +612,6 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

184
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -43,6 +43,19 @@
<cassandra.host>localhost</cassandra.host> <cassandra.host>localhost</cassandra.host>
<cassandra.port>9160</cassandra.port> <cassandra.port>9160</cassandra.port>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
<webjars.bootstrap.version>4.5.0</webjars.bootstrap.version>
<webjars.jquery.version>3.5.1</webjars.jquery.version>
<webjars.jquery-ui.version>1.12.1</webjars.jquery-ui.version>
<webjars.requirejs.version>2.3.6</webjars.requirejs.version>
<webjars.font-awesome.version>5.13.0</webjars.font-awesome.version>
<webjars.d3js.version>5.16.0</webjars.d3js.version>
<webjars.locator.version>0.40</webjars.locator.version>
<webjars.sammy.version>0.7.4</webjars.sammy.version>
<webjars.jquery.typeahead.version>2.10.4</webjars.jquery.typeahead.version>
<webjars.jquery.fileupload.version>9.10.1</webjars.jquery.fileupload.version>
<webjars.jquery.i18nproperties.version>1.2.7</webjars.jquery.i18nproperties.version>
</properties> </properties>
<dependencies> <dependencies>
@ -581,28 +594,66 @@
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId> <artifactId>bootstrap</artifactId>
<version>4.5.0</version> <version>${webjars.bootstrap.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>${webjars.jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
<version>${webjars.jquery-ui.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId>
<version>${webjars.requirejs.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<version>5.13.0</version> <version>${webjars.font-awesome.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>d3js</artifactId> <artifactId>d3js</artifactId>
<version>5.16.0</version> <version>${webjars.d3js.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId> <artifactId>webjars-locator</artifactId>
<version>0.40</version> <version>${webjars.locator.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>sammy</artifactId>
<version>${webjars.sammy.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-file-upload</artifactId>
<version>${webjars.jquery.fileupload.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-i18n-properties</artifactId>
<version>${webjars.jquery.i18nproperties.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -640,79 +691,35 @@
<plugins> <plugins>
<!-- commented as not needed now
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-minify-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>1.3.5</version> <configuration>
<executions> <archive>
<execution> <manifest>
<id>startup-minify</id> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<phase>generate-resources</phase> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<configuration> </manifest>
<webappSourceDir>${basedir}/src/main/webapp</webappSourceDir> </archive>
<cssSourceDir>css</cssSourceDir> <webResources>
<cssSourceFiles> <webResource>
<cssSourceFile>jquery-ui-1.8.16.custom.css</cssSourceFile> <directory>.</directory>
<cssSourceFile>jquery.ui.1.8.16.ie.css</cssSourceFile> <includes>
<cssSourceFile>bootstrap.2.0.2.css</cssSourceFile> <include>LICENSE</include>
<cssSourceFile>archiva.css</cssSourceFile> </includes>
</cssSourceFiles> </webResource>
<cssFinalFile>apache-archiva-${project.version}.css</cssFinalFile> <webResource>
<jsSourceDir>js</jsSourceDir> <directory>${project.build.directory}/maven-shared-archive-resources/META-INF/</directory>
<jsSourceFiles> <includes>
<jsSourceFile>jquery-1.7.2.js</jsSourceFile> <include>NOTICE</include>
<jsSourceFile>lab.js</jsSourceFile> </includes>
<jsSourceFile>require.1.0.1.js</jsSourceFile> </webResource>
</jsSourceFiles> </webResources>
<jsFinalFile>apache-archiva-startup-${project.version}.js</jsFinalFile>
</configuration> </configuration>
<goals>
<goal>minify</goal>
</goals>
</execution>
<execution>
<id>main-minify</id>
<phase>generate-resources</phase>
<configuration>
<webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
<jsSourceDir>js</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>jquery.tmpl.js</jsSourceFile>
<jsSourceFile>archiva/utils.js</jsSourceFile>
<jsSourceFile>jquery.i18n.properties-1.0.9.js</jsSourceFile>
<jsSourceFile>archiva/i18nload.js</jsSourceFile>
<jsSourceFile>jquery.cookie.1.0.0.js</jsSourceFile>
<jsSourceFile>knockout-debug.js</jsSourceFile>
<jsSourceFile>jquery-ui-1.8.16.custom.min.js</jsSourceFile>
<jsSourceFile>jquery.validate.js</jsSourceFile>
<jsSourceFile>jquery.json-2.3.min.js</jsSourceFile>
<jsSourceFile>archiva/main-tmpl.js</jsSourceFile>
<jsSourceFile>archiva/repositories.js</jsSourceFile>
<jsSourceFile>archiva/network-proxies.js</jsSourceFile>
<jsSourceFile>archiva/proxy-connectors.js</jsSourceFile>
<jsSourceFile>redback/operation.js</jsSourceFile>
<jsSourceFile>redback/redback-tmpl.js</jsSourceFile>
<jsSourceFile>bootstrap.2.0.2.js</jsSourceFile>
<jsSourceFile>knockout.simpleGrid.js</jsSourceFile>
<jsSourceFile>redback/user.js</jsSourceFile>
<jsSourceFile>redback/users.js</jsSourceFile>
<jsSourceFile>redback/redback.js</jsSourceFile>
<jsSourceFile>redback/register.js</jsSourceFile>
<jsSourceFile>redback/permission.js</jsSourceFile>
<jsSourceFile>redback/resource.js</jsSourceFile>
<jsSourceFile>redback/roles.js</jsSourceFile>
<jsSourceFile>archiva/main.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>apache-archiva-main-${project.version}.js</jsFinalFile>
</configuration>
<goals>
<goal>minify</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
-->
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
@ -911,32 +918,7 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
<webResources>
<webResource>
<directory>.</directory>
<includes>
<include>LICENSE</include>
</includes>
</webResource>
<webResource>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF/</directory>
<includes>
<include>NOTICE</include>
</includes>
</webResource>
</webResources>
</configuration>
</plugin>
<plugin> <plugin>