This is an automated email from the ASF dual-hosted git repository.
wpaetzold pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3d93c27 Fixed: Builds fail due to unauthorized access to
repo.spring.io/plugins-release (OFBIZ-12351) (#334)
3d93c27 is described below
commit 3d93c2709e643e0631af30e081b9a17c00832aac
Author: wpaetzold <12893353+wpaetz...@users.noreply.github.com>
AuthorDate: Tue Nov 9 14:34:44 2021 +0100
Fixed: Builds fail due to unauthorized access to
repo.spring.io/plugins-release (OFBIZ-12351) (#334)
Replaces repository syndication by rometools
Thanks Mart Naum for report
---
.../java/org/apache/ofbiz/content/blog/BlogRssServices.java | 12 ++++++------
build.gradle | 7 +------
framework/common/servicedef/services.xml | 2 +-
.../java/org/apache/ofbiz/webapp/event/RomeEventHandler.java | 7 ++++---
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
b/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
index af908ed..587a2cc 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
@@ -39,12 +39,12 @@ import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ServiceUtil;
-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;
/**
* BlogRssServices
diff --git a/build.gradle b/build.gradle
index 2cdf265..d5336c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,7 +142,6 @@ defaultTasks 'jar', 'test'
allprojects {
repositories{
- jcenter() // temporary fix as we need it for GH actions and Buildbot
(no fail) see OFBIZ-12351
mavenCentral()
// the switch from jCenter to mavenCentral needs some additional
repositories to be configured here
// this should be checked frequently to remove obsolete configurations
if the artifacts are available
@@ -164,10 +163,6 @@ allprojects {
}
}
maven {
- // com.springsource.com.sun.syndication
- url "https://repo.spring.io/plugins-release";
- }
- maven {
url "https://clojars.org/repo";
}
}
@@ -204,7 +199,7 @@ dependencies {
implementation 'com.ibm.icu:icu4j:69.1'
implementation 'com.lowagie:itext:2.1.7' // Don't update due to license
change in newer versions, see OFBIZ-10455
implementation 'com.sun.mail:javax.mail:1.6.2'
- implementation
'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0'
+ implementation 'com.rometools:rome:1.16.0'
implementation 'com.thoughtworks.xstream:xstream:1.4.18'
implementation 'commons-fileupload:commons-fileupload:1.4'
implementation 'commons-net:commons-net:3.8.0'
diff --git a/framework/common/servicedef/services.xml
b/framework/common/servicedef/services.xml
index b654afb..1c87d3d 100644
--- a/framework/common/servicedef/services.xml
+++ b/framework/common/servicedef/services.xml
@@ -458,7 +458,7 @@ under the License.
<attribute name="feedType" type="String" mode="IN" optional="false"/>
<attribute name="mainLink" type="String" mode="IN" optional="false"/>
<attribute name="entryLink" type="String" mode="IN" optional="false"/>
- <attribute name="wireFeed" type="com.sun.syndication.feed.WireFeed"
mode="OUT" optional="false"/>
+ <attribute name="wireFeed" type="com.rometools.rome.feed.WireFeed"
mode="OUT" optional="false"/>
</service>
<!-- User preferences services -->
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
index d7ddc95..49083e0 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
@@ -29,9 +29,10 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
import org.apache.ofbiz.webapp.control.RequestHandler;
-import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.WireFeedOutput;
+import com.rometools.rome.feed.WireFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.WireFeedOutput;
+
/**
* RomeEventHandler
