This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new 509aad4 Adapting to changes in parent pom and redback
509aad4 is described below
commit 509aad470c1ed42e108ea3294d1db71fdcee8aac
Author: Martin Stockhammer <[email protected]>
AuthorDate: Tue Jun 30 21:20:29 2020 +0200
Adapting to changes in parent pom and redback
---
.../archiva-rest/archiva-rest-api/pom.xml | 131 ---------------------
.../archiva/rest/api/model/ActionStatus.java | 10 +-
.../archiva-rest/archiva-rest-services/pom.xml | 6 +
.../interceptors/JacksonJsonConfigurator.java | 9 +-
.../src/main/resources/META-INF/spring-context.xml | 20 ++--
.../remotedownload/DownloadArtifactsTest.java | 2 +-
.../remotedownload/DownloadSnapshotTest.java | 2 +-
pom.xml | 43 +++++++
8 files changed, 76 insertions(+), 147 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index 5a62d7e..cff0546 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -31,8 +31,6 @@
<properties>
<enunciate.docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</enunciate.docsDir>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
- <swagger-maven-plugin-version>2.1.2</swagger-maven-plugin-version>
- <io.swagger.version>2.1.2</io.swagger.version>
</properties>
<dependencies>
@@ -79,46 +77,6 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-core</artifactId>
- <scope>compile</scope>
- <version>${io.swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-jaxrs2</artifactId>
- <version>${io.swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${io.swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
-
-
</dependencies>
@@ -135,95 +93,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>bind-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-maven-plugin</artifactId>
- <version>${swagger-maven-plugin-version}</version>
- <configuration>
- <outputFileName>openapi</outputFileName>
- <outputPath>${project.build.directory}/generated</outputPath>
- <outputFormat>JSONANDYAML</outputFormat>
- <resourcePackages>
- <package>org.apache.archiva.rest.api</package>
- </resourcePackages>
- <prettyPrint>TRUE</prettyPrint>
-
<configurationFilePath>${project.basedir}/src/main/resources/openapi-configuration.yaml</configurationFilePath>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>resolve</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>io.swagger.codegen.v3</groupId>
- <artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>3.0.20</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
-
<inputSpec>${project.build.directory}/generated/openapi.yaml</inputSpec>
- <language>html</language>
- <output>${project.build.directory}/generated-sources</output>
-
<ignoreFileOverride>${project.basedir}/src/main/resources/openapi-codegen-ignore</ignoreFileOverride>
-
<templateDirectory>${project.basedir}/src/main/resources/templates</templateDirectory>
-
<supportingFilesToGenerate>index.html,index2.html</supportingFilesToGenerate>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/target/site/openapi/</outputDirectory>
- <resources>
- <resource>
- <directory>${project.build.directory}/generated</directory>
<!-- source directory -->
- <filtering>false</filtering>
- <include>openapi.json</include>
- <include>openapi.yaml</include>
- </resource>
- <resource>
-
<directory>${project.build.directory}/generated-sources/</directory>
- <filtering>false</filtering>
- <include>**/*</include>
- <exclude>.swagger-codegen/**</exclude>
- <exclude>.swagger-codegen-ignore</exclude>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ActionStatus.java
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ActionStatus.java
index 5620f4f..b4534b9 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ActionStatus.java
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ActionStatus.java
@@ -18,7 +18,6 @@ package org.apache.archiva.rest.api.model;
* under the License.
*/
-import javax.swing.*;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -32,6 +31,9 @@ public class ActionStatus
public static final ActionStatus SUCCESS = new ActionStatus( true );
public static final ActionStatus FAIL = new ActionStatus( false );
+ public static ActionStatus FROM(boolean status) {
+ return status ? SUCCESS : FAIL;
+ }
public ActionStatus() {
@@ -51,5 +53,9 @@ public class ActionStatus
this.success = success;
}
-
+ @Override
+ public String toString( )
+ {
+ return Boolean.toString( success );
+ }
}
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index d8fed94..6e9f626 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -439,6 +439,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Needed for JDK >= 9 -->
<dependency>
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
index 4137eb7..aaca917 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
@@ -21,11 +21,13 @@ package org.apache.archiva.rest.services.interceptors;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
+import javax.inject.Named;
/**
* class to setup Jackson Json configuration
@@ -39,9 +41,12 @@ public class JacksonJsonConfigurator
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- public JacksonJsonConfigurator( ObjectMapper objectMapper )
+ public JacksonJsonConfigurator( @Named( "redbackJacksonJsonMapper" )
ObjectMapper objectMapper,
+ @Named( "redbackJacksonXMLMapper" )
XmlMapper xmlMapper )
{
+
log.info( "configure jackson ObjectMapper" );
- objectMapper.configure(
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false );
+ objectMapper.disable(
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ xmlMapper.disable( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES );
}
}
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index ede2fe6..a7ace51 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -39,17 +39,23 @@
<context:component-scan
base-package="org.apache.archiva.rest.services,org.apache.archiva.redback.rest.services"/>
+ <bean id="jsonProvider"
class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
+ <property name="mapper" ref="redbackJacksonJsonMapper"/>
+ </bean>
- <bean id="eventSender"
class="org.apache.cxf.ext.logging.slf4j.Slf4jVerboseEventSender">
- <property name="loggingLevel" value="DEBUG" />
+ <bean id="xmlProvider"
class="com.fasterxml.jackson.jaxrs.xml.JacksonJaxbXMLProvider">
+ <property name="mapper" ref="redbackJacksonXMLMapper"/>
</bean>
+ <bean id="redbackJacksonJsonMapper"
class="com.fasterxml.jackson.databind.ObjectMapper" />
+ <bean id="redbackJacksonXMLMapper"
class="com.fasterxml.jackson.dataformat.xml.XmlMapper" />
+
<jaxrs:server id="archivaServices" address="/archivaServices" >
<jaxrs:providers>
- <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider"/>
- <bean class="com.fasterxml.jackson.jaxrs.xml.JacksonJaxbXMLProvider"/>
+ <ref bean="jsonProvider" />
+ <ref bean="xmlProvider" />
<ref bean="authenticationInterceptor#rest"/>
<ref bean="permissionInterceptor#rest"/>
<ref bean="requestValidationInterceptor#rest" />
@@ -78,12 +84,6 @@
<ref bean="redbackRuntimeConfigurationService#rest"/>
</jaxrs:serviceBeans>
- <jaxrs:features>
- <bean class="org.apache.cxf.ext.logging.LoggingFeature">
- <property name="sender" ref="eventSender"/>
- </bean>
- </jaxrs:features>
-
</jaxrs:server>
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
index acd74d0..436ea5d 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
@@ -168,7 +168,7 @@ public class DownloadArtifactsTest
RoleManagementService roleManagementService =
getRoleManagementService( authorizationHeader );
if ( !roleManagementService.templatedRoleExists(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER,
- "internal" ) )
+ "internal"
).isExists() )
{
roleManagementService.createTemplatedRole(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, "internal" );
}
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
index 05a2996..07c2a71 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
@@ -131,7 +131,7 @@ public class DownloadSnapshotTest
RoleManagementService roleManagementService =
getRoleManagementService( authorizationHeader );
if ( !roleManagementService.templatedRoleExists(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER,
- id ) )
+ id ).isExists() )
{
roleManagementService.createTemplatedRole(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, id );
}
diff --git a/pom.xml b/pom.xml
index ca0cbfd..1188a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,12 @@
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax.jaxrs.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${javax.validation.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
@@ -1632,6 +1638,43 @@
<version>${cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-core</artifactId>
+ <scope>compile</scope>
+ <version>${io.swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-jaxrs2</artifactId>
+ <version>${io.swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${io.swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+
</dependencies>
</dependencyManagement>
