You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/02/13 06:49:14 UTC
[archiva-redback-core] branch master updated (c5ef6ed -> 414c0f1)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git.
from c5ef6ed Trying to fix JDK11 build on CI
new 9e0f15c Adding profile for JDK11
new 414c0f1 Fixing dependencies in new projects
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 5 +++++
.../redback-common-configuration-acc2/pom.xml | 5 +++++
.../config/acc2/CommonsConfigurationRegistry.java | 25 +++-------------------
.../redback-rest/redback-rest-api/pom.xml | 22 +++++++++++++++++++
.../redback-rest/redback-rest-services/pom.xml | 21 ++++++++++++++++++
5 files changed, 56 insertions(+), 22 deletions(-)
[archiva-redback-core] 02/02: Fixing dependencies in new projects
Posted by ma...@apache.org.
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-redback-core.git
commit 414c0f1970189226916e3ee5be9f386c69faa07c
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Feb 13 07:48:58 2019 +0100
Fixing dependencies in new projects
---
.../redback-common-configuration-acc2/pom.xml | 5 +++++
.../config/acc2/CommonsConfigurationRegistry.java | 25 +++-------------------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
index 0783bc9..e74b825 100644
--- a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
+++ b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
@@ -102,6 +102,11 @@
<artifactId>spring-test</artifactId>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/main/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistry.java b/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/main/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistry.java
index 8fe30d9..869a11e 100644
--- a/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/main/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistry.java
+++ b/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/main/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistry.java
@@ -22,13 +22,7 @@ package org.apache.archiva.redback.common.config.acc2;
import org.apache.archiva.redback.common.config.api.ConfigRegistry;
import org.apache.archiva.redback.common.config.api.RegistryException;
import org.apache.archiva.redback.common.config.api.RegistryListener;
-import org.apache.commons.configuration2.CombinedConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.FileBasedConfiguration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.SystemConfiguration;
-import org.apache.commons.configuration2.XMLConfiguration;
-import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.*;
import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
import org.apache.commons.configuration2.builder.fluent.Parameters;
@@ -51,25 +45,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
import java.util.regex.Pattern;
-import java.util.stream.Collector;
import java.util.stream.Collectors;
/**
[archiva-redback-core] 01/02: Adding profile for JDK11
Posted by ma...@apache.org.
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-redback-core.git
commit 9e0f15c0374bfed224a03fb91a424b68a0a3df50
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Feb 13 07:48:32 2019 +0100
Adding profile for JDK11
---
pom.xml | 5 +++++
.../redback-rest/redback-rest-api/pom.xml | 22 ++++++++++++++++++++++
.../redback-rest/redback-rest-services/pom.xml | 21 +++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/pom.xml b/pom.xml
index 68ec204..de7b288 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,6 +405,11 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8.1</version>
diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml
index 281793c..2d58167 100644
--- a/redback-integrations/redback-rest/redback-rest-api/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml
@@ -59,4 +59,26 @@
</dependency>
</dependencies>
+ <!--
+ The jaxb dependency is needed by the enunciate plugin starting with JDK9.
+ Adding to the plugin dependency is not sufficient, so I have to add it as project dependency.
+ Using provided scope to avoid adding it to packaging.
+-->
+ <profiles>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 29b7688..4baa6b8 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -274,4 +274,25 @@
</plugins>
</build>
+ <!--
+ The jaxb dependency is needed by the enunciate plugin starting with JDK9.
+ Adding to the plugin dependency is not sufficient, so I have to add it as project dependency.
+ Using provided scope to avoid adding it to packaging.
+-->
+ <profiles>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>