This is an automated email from the ASF dual-hosted git repository.
wpaetzold pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new c5d262a Fixed: Builds fail due to unauthorized access to
repo.spring.io/plugins-release (OFBIZ-12351)
c5d262a is described below
commit c5d262aeab8af408be8c25649524f7a3e8d63d5c
Author: Wiebke Pätzold <wiebke.paetz...@ecomify.de>
AuthorDate: Mon Dec 6 11:35:03 2021 +0100
Fixed: Builds fail due to unauthorized access to
repo.spring.io/plugins-release (OFBIZ-12351)
Replaces repository syndication by rometools
---
.../java/org/apache/ofbiz/content/blog/BlogRssServices.java | 12 ++++++------
build.gradle | 8 ++------
framework/common/servicedef/services.xml | 2 +-
.../java/org/apache/ofbiz/webapp/event/RomeEventHandler.java | 6 +++---
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 81065d6..c110223 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 24bd897..0597876 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,6 @@ import org.asciidoctor.gradle.AsciidoctorTask
* ======================================================== */
buildscript {
repositories {
- jcenter() // temporary fix
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/";
@@ -107,10 +106,6 @@ allprojects {
artifact()
}
}
- maven {
- // com.springsource.com.sun.syndication
- url "https://repo.spring.io/plugins-release";
- }
}
}
@@ -146,7 +141,8 @@ dependencies {
compile 'com.ibm.icu:icu4j:60.2'
compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in
newer versions, see OFBIZ-10455
compile 'com.sun.mail:javax.mail:1.6.0'
- compile 'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0'
+ compile 'com.rometools:rome:1.16.0'
+ compile 'org.jdom:jdom:1.1.3' // don't upgrade above 1.1.3, makes a lot of
not obvious and useless complications, see last commits of OFBIZ-12092 for more
compile 'com.thoughtworks.xstream:xstream:1.4.10'
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
diff --git a/framework/common/servicedef/services.xml
b/framework/common/servicedef/services.xml
index 53ce51b..22da729 100644
--- a/framework/common/servicedef/services.xml
+++ b/framework/common/servicedef/services.xml
@@ -437,7 +437,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 66a9802..440580d 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
@@ -30,9 +30,9 @@ 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
