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/10/07 20:20:27 UTC
[archiva] branch master updated (a336ce6 -> 7e5e437)
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.git.
from a336ce6 Adding info about third party licenses to README
new bde6350 Removing jpox dependency
new d66ca1e Changing jboss-logging version (new version uses apache license)
new 01666ee Switching to new rome version for rss
new 11fa0a5 Removing velocity dependency
new 7e5e437 Using variables for dependency versions
The 5 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:
.../archiva-repository-admin-default/pom.xml | 4 ---
.../archiva-rest/archiva-rest-services/pom.xml | 5 ---
archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +-
.../org/apache/archiva/rss/RssFeedGenerator.java | 12 +++----
.../processor/NewArtifactsRssFeedProcessor.java | 8 ++---
.../NewVersionsOfArtifactRssFeedProcessor.java | 4 +--
.../archiva/rss/processor/RssFeedProcessor.java | 4 +--
.../apache/archiva/rss/RssFeedGeneratorTest.java | 4 +--
.../NewArtifactsRssFeedProcessorTest.java | 4 +--
.../NewVersionsOfArtifactRssFeedProcessorTest.java | 4 +--
.../org/apache/archiva/web/rss/RssFeedServlet.java | 7 ++--
archiva-modules/archiva-web/archiva-webapp/pom.xml | 42 ----------------------
.../plugins/metadata-store-cassandra/pom.xml | 10 ++++++
pom.xml | 27 +++++++-------
14 files changed, 46 insertions(+), 91 deletions(-)
[archiva] 03/05: Switching to new rome version for rss
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.git
commit 01666eea895dfa06917f13111bb72e391954f9b4
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 5 16:15:17 2019 +0200
Switching to new rome version for rss
---
archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +-
.../main/java/org/apache/archiva/rss/RssFeedGenerator.java | 12 ++++++------
.../archiva/rss/processor/NewArtifactsRssFeedProcessor.java | 8 ++------
.../rss/processor/NewVersionsOfArtifactRssFeedProcessor.java | 4 ++--
.../org/apache/archiva/rss/processor/RssFeedProcessor.java | 4 ++--
.../java/org/apache/archiva/rss/RssFeedGeneratorTest.java | 4 ++--
.../rss/processor/NewArtifactsRssFeedProcessorTest.java | 4 ++--
.../processor/NewVersionsOfArtifactRssFeedProcessorTest.java | 4 ++--
.../main/java/org/apache/archiva/web/rss/RssFeedServlet.java | 7 +++----
pom.xml | 4 ++--
10 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index b93436f..7d830a0 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -46,7 +46,7 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
index 4b7856f..076e5f2 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
@@ -19,12 +19,12 @@ package org.apache.archiva.rss;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
index 2e93e62..718a3fa 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss.processor;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
@@ -32,13 +32,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
index bb58bef..90613c9 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss.processor;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.repository.Repository;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
index 7bf903a..e023a3c 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss.processor;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
import java.util.Map;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
index dee27fd..31bea1b 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
import junit.framework.TestCase;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.Before;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
index 40cccc0..8caccdb 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss.processor;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
import junit.framework.TestCase;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
index 9075e9a..445b968 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
@@ -19,8 +19,8 @@ package org.apache.archiva.rss.processor;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
import junit.framework.TestCase;
import org.apache.archiva.common.filelock.DefaultFileLockManager;
import org.apache.archiva.metadata.model.ArtifactMetadata;
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
index e331b8d..30a15c4 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
@@ -19,10 +19,9 @@ package org.apache.archiva.web.rss;
* under the License.
*/
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedOutput;
-import org.apache.archiva.metadata.repository.RepositorySession;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedOutput;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
diff --git a/pom.xml b/pom.xml
index a748f38..16ddf5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<!-- dependencies of maven modules -->
<jsoup.version>1.12.1</jsoup.version>
- <rome.version>0.9</rome.version>
+ <rome.version>1.12.2</rome.version>
<cronutils.version>9.0.1</cronutils.version>
<spring.version>4.3.10.RELEASE</spring.version>
@@ -1667,7 +1667,7 @@
</dependency>
<dependency>
- <groupId>rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>${rome.version}</version>
</dependency>
[archiva] 04/05: Removing velocity dependency
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.git
commit 11fa0a513a6b22dc6e472a35120023806ff48c9a
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 5 18:38:32 2019 +0200
Removing velocity dependency
---
.../archiva-repository-admin-default/pom.xml | 4 ----
.../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 5 -----
archiva-modules/archiva-web/archiva-webapp/pom.xml | 9 ---------
pom.xml | 7 +------
4 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 0ab00cd..eaaeb1d 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -166,10 +166,6 @@
<artifactId>commons-validator</artifactId>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-quartz</artifactId>
</dependency>
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 3ccb8df..5f5f2fb 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
@@ -194,11 +194,6 @@
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index e82b08f..45ee0ca 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -173,15 +173,6 @@
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.archiva.maven</groupId>
<!-- FIXME: temporary coupling to plugin, should be runtime -->
<artifactId>archiva-maven-repository</artifactId>
diff --git a/pom.xml b/pom.xml
index 16ddf5f..7a6c332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1478,7 +1478,7 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
+ <version>1.6</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -1486,11 +1486,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
<!-- JCR -->
[archiva] 02/05: Changing jboss-logging version (new version uses
apache license)
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.git
commit d66ca1e475a581906b837c5856b42d148953e71f
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 5 16:15:02 2019 +0200
Changing jboss-logging version (new version uses apache license)
---
archiva-modules/plugins/metadata-store-cassandra/pom.xml | 10 ++++++++++
pom.xml | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 8fae8f1..8f4021c 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -103,6 +103,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -142,6 +146,12 @@
</exclusions>
</dependency>
+ <!-- Is a dependency of cassandra -> hibernate-validator and replaced by new version -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
diff --git a/pom.xml b/pom.xml
index 934c4d1..a748f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1635,6 +1635,12 @@
<version>${jsoup.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.2.1.Final</version>
+ </dependency>
+
<!-- Dependencies for JDK >=9 update -->
<dependency>
<groupId>javax.annotation</groupId>
[archiva] 01/05: Removing jpox dependency
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.git
commit bde6350a309395abc0748452e52ff535cd087632
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 5 00:59:42 2019 +0200
Removing jpox dependency
---
archiva-modules/archiva-web/archiva-webapp/pom.xml | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 419cd4b..e82b08f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -514,39 +514,6 @@
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-ehcache</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<exclusions>
[archiva] 05/05: Using variables for dependency versions
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.git
commit 7e5e437bb57d1890242945f22a60713515f85057
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Mon Oct 7 22:20:20 2019 +0200
Using variables for dependency versions
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a6c332..29a3729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -702,7 +702,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.10</version>
+ <version>${commons.configuration.version}</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
@@ -1683,25 +1683,25 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
- <version>1.5.2</version>
+ <version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console-standalone</artifactId>
- <version>1.5.2</version>
+ <version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.5.2</version>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.5.2</version>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>