Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package swingx for openSUSE:Factory checked in at 2022-04-11 23:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swingx (Old) and /work/SRC/openSUSE:Factory/.swingx.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swingx" Mon Apr 11 23:49:19 2022 rev:19 rq:969188 version:1.6.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/swingx/swingx.changes 2022-03-24 22:57:51.216242028 +0100 +++ /work/SRC/openSUSE:Factory/.swingx.new.1900/swingx.changes 2022-04-11 23:50:47.906006111 +0200 @@ -1,0 +2,24 @@ +Mon Apr 11 10:06:56 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 1.6.5.1 +- Removed patches: + * swingx-0.9.4-LoginService.patch + * swingx-0.9.4-project-properties.patch + * swingx-0.9.4-swinglabs-build-impl.patch + * swingx-0.9.4-toArray.patch + + not needed with this version +- Added patches + * jdk17.patch + + solve type resolution ambiguities with JDK 17 + * swingx-java7-swing-painter-compat.patch + + remove use of internal com.sun API for Java 7 compatibility + * swingx-java7-treepath-compat.patch + + accomodate in tests for extra validation performed in Java 7 + * swingx-java8-compat.patch + + handle Java 8 verisons + * swingx-remove-jhlabs-filters.patch + + remove dep that is not needed for successful test run + * swingx-uititlelabel-test-failure.patch + + two tests failing for an unknown reason + +------------------------------------------------------------------- Old: ---- swingx-0.9.4-LoginService.patch swingx-0.9.4-project-properties.patch swingx-0.9.4-src.tar.bz2 swingx-0.9.4-swinglabs-build-impl.patch swingx-0.9.4-toArray.patch New: ---- 1.6.5-1.tar.gz jdk17.patch swingx-java7-swing-painter-compat.patch swingx-java7-treepath-compat.patch swingx-java8-compat.patch swingx-remove-jhlabs-filters.patch swingx-uititlelabel-test-failure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swingx.spec ++++++ --- /var/tmp/diff_new_pack.zKPHqA/_old 2022-04-11 23:50:48.673997349 +0200 +++ /var/tmp/diff_new_pack.zKPHqA/_new 2022-04-11 23:50:48.677997304 +0200 @@ -16,31 +16,29 @@ # +%global real_version 1.6.5-1 Name: swingx -Version: 0.9.4 +Version: 1.6.5.1 Release: 0 Summary: A collection of Swing components License: LGPL-2.0-only Group: Development/Libraries/Java -URL: https://swingx.dev.java.net/ -# The link https://swingx.dev.java.net/files/documents/2981/110622/%{name}-%{version}-src.tar.bz2 is dead -Source0: %{name}-%{version}-src.tar.bz2 -# Remove external dependency that's now included in JDK 1.6 -# See http://forums.java.net/jive/thread.jspa?messageID=318384 -Patch0: swingx-0.9.4-LoginService.patch -# Remove build dependencies on included binary jars and add system jars -# Remove main class from manifest -Patch1: swingx-0.9.4-project-properties.patch -# Don't do the "demo taglet" stuff -Patch2: swingx-0.9.4-swinglabs-build-impl.patch -# Resolve the ambiguity of toArray in jdk11 -Patch3: swingx-0.9.4-toArray.patch -BuildRequires: ant -BuildRequires: batik +URL: https://swingx.java.net/ +Source0: https://github.com/ebourg/swingx/archive/refs/tags/%{real_version}.tar.gz +Patch0: swingx-remove-jhlabs-filters.patch +Patch1: swingx-java7-swing-painter-compat.patch +Patch2: swingx-java7-treepath-compat.patch +Patch3: swingx-uititlelabel-test-failure.patch +Patch4: swingx-java8-compat.patch +Patch5: jdk17.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -Requires: java >= 1.8 +BuildRequires: maven-local +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.kohsuke.metainf-services:metainf-services) BuildArch: noarch %description @@ -54,38 +52,41 @@ Group: Documentation/HTML %description javadoc -Documentation for the SwingX widgets +This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{version}-src +%setup -q -n %{name}-%{real_version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -rm -rf lib/ +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 -p1 + +%pom_disable_module %{name}-testsupport + +%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:source" "1.8" +%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:target" "1.8" + +%{mvn_file} :%{name}-all %{name} %{name}/%{name}-all + +# Remove all binaries +find . -name "*.jar" -print -delete +find . -name "*.class" -print -delete +find . -name "*.so" -print -delete +find . -name "*.dll" -print -delete %build -ant -Djavac.source=1.8 -Djavac.target=1.8 jar javadoc +%{mvn_build} -f -- -Pjvnet-release %install -# jar -mkdir -p %{buildroot}%{_javadir} -cp -p dist/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}/%{_mavenpomdir}/ -install -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -# javadoc -mkdir -p %{buildroot}%{_javadocdir}/ -cp -r dist/javadoc %{buildroot}%{_javadocdir}/%{name} +%mvn_install %fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles %license COPYING -%doc README -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%license COPYING %changelog ++++++ jdk17.patch ++++++ diff -urEbwB swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/error/ErrorSupport.java swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/error/ErrorSupport.java --- swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/error/ErrorSupport.java 2022-04-10 09:44:29.638589866 +0200 +++ swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/error/ErrorSupport.java 2022-04-10 13:16:53.726099179 +0200 @@ -68,7 +68,7 @@ * added. */ public ErrorListener[] getErrorListeners() { - return listeners.toArray(null); + return listeners.toArray(new ErrorListener[0]); } /** diff -urEbwB swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/JXTable.java swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/JXTable.java --- swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/JXTable.java 2022-04-10 09:44:29.630589818 +0200 +++ swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/JXTable.java 2022-04-10 13:14:14.885160147 +0200 @@ -570,7 +570,7 @@ * @param rowData Row data, as a Vector of Objects. * @param columnNames Column names, as a Vector of Strings. */ - public JXTable(Vector<?> rowData, Vector<?> columnNames) { + public JXTable(Vector<? extends Vector> rowData, Vector<?> columnNames) { super(rowData, columnNames); init(); } diff -urEbwB swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/tree/TreeUtilities.java swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/tree/TreeUtilities.java --- swingx-project-1.6.5-1.orig/swingx-core/src/main/java/org/jdesktop/swingx/tree/TreeUtilities.java 2022-04-10 09:44:29.642589889 +0200 +++ swingx-project-1.6.5-1/swingx-core/src/main/java/org/jdesktop/swingx/tree/TreeUtilities.java 2022-04-10 13:23:22.448397272 +0200 @@ -270,7 +270,7 @@ } protected Enumeration<M> getChildren(M node) { - Enumeration<M> children = node.children(); + Enumeration<M> children = (Enumeration<M>) node.children(); return children; } @@ -328,7 +328,7 @@ * @return */ protected Enumeration<M> getChildren(M node) { - return node.children(); + return (Enumeration<M>) node.children(); } @@ -374,7 +374,7 @@ } protected Enumeration<M> getChildren(M node) { - Enumeration<M> children = node.children(); + Enumeration<M> children = (Enumeration<M>) node.children(); return children; } ++++++ swingx-java7-swing-painter-compat.patch ++++++ --- swingx-core/src/test/java/org/jdesktop/swingx/JXPanelVisualCheck.java.orig 2013-02-26 17:37:02.000000000 +0000 +++ swingx-core/src/test/java/org/jdesktop/swingx/JXPanelVisualCheck.java 2013-07-30 15:14:02.892623394 +0100 @@ -50,7 +50,7 @@ import org.jdesktop.swingx.test.XTestUtils; import org.jdesktop.swingx.util.PaintUtils; -import com.sun.java.swing.Painter; +import javax.swing.Painter; /** * Contains methods to visually test JXPanel. ++++++ swingx-java7-treepath-compat.patch ++++++ --- swingx-core/src/test/java/org/jdesktop/swingx/tree/TreeModelSupportTest.java.orig 2009-08-27 14:17:10.000000000 +0100 +++ swingx-core/src/test/java/org/jdesktop/swingx/tree/TreeModelSupportTest.java 2013-07-30 16:20:10.364320524 +0100 @@ -73,12 +73,14 @@ */ @Test public void testPathChangedNotNullPathElements() { - TreePath path = new TreePath(new Object[] {null}); try { + TreePath path = new TreePath(new Object[] {null}); support.firePathChanged(path); fail("must not allow null path elements"); } catch (NullPointerException e) { - // expected + // expected on java 6 + } catch (IllegalArgumentException e) { + // expected on java 7 } // unexpected exception } @@ -125,12 +127,14 @@ */ @Test public void testTreeStructureChangedNotNullPathElements() { - TreePath path = new TreePath(new Object[] {null}); try { + TreePath path = new TreePath(new Object[] {null}); support.fireTreeStructureChanged(path); fail("must not allow null path elements"); } catch (NullPointerException e) { - // expected + // expected on java 6 + } catch (IllegalArgumentException e) { + // expected on java 7 } // unexpected exception } ++++++ swingx-java8-compat.patch ++++++ --- swingx-common/src/main/java/org/jdesktop/swingx/util/JVM.java 2012-08-13 13:32:35.000000000 -0400 +++ swingx-common/src/main/java/org/jdesktop/swingx/util/JVM.java 2014-06-10 11:15:49.128819697 -0400 @@ -38,6 +38,8 @@ public final static int JDK1_6 = 1600; public final static int JDK1_6N = 1610; public final static int JDK1_7 = 1700; + public final static int JDK1_8 = 1800; + public final static int JDK1_9 = 1900; private static JVM current; static { @@ -66,7 +68,11 @@ * Constructor for the OS object */ public JVM(String p_JavaVersion) { - if (p_JavaVersion.startsWith("1.7.")) { + if (p_JavaVersion.startsWith("1.9.")) { + jdkVersion = JDK1_9; + } else if (p_JavaVersion.startsWith("1.8.")) { + jdkVersion = JDK1_8; + } else if (p_JavaVersion.startsWith("1.7.")) { jdkVersion = JDK1_7; } else if (p_JavaVersion.startsWith("1.6.")) { for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) { @@ -137,4 +143,12 @@ return jdkVersion == JDK1_7; } -} \ No newline at end of file + public boolean isOneDotEight() { + return jdkVersion == JDK1_8; + } + + public boolean isOneDotNine() { + return jdkVersion == JDK1_9; + } + +} ++++++ swingx-remove-jhlabs-filters.patch ++++++ --- swingx-project-1.6.5-1/swingx-core/src/test/java/org/jdesktop/swingx/JXLabelVisualCheck.java.orig 2011-03-17 19:14:56.000000000 +0000 +++ swingx-project-1.6.5-1/swingx-core/src/test/java/org/jdesktop/swingx/JXLabelVisualCheck.java 2013-07-30 14:50:55.057313241 +0100 @@ -41,7 +41,7 @@ import org.jdesktop.swingx.painter.MattePainter; import org.jdesktop.swingx.painter.ShapePainter; -import com.jhlabs.image.BlurFilter; +//import com.jhlabs.image.BlurFilter; /** * Base test class for JXLabel related code and issues. @@ -70,7 +70,7 @@ JXLabel label = new JXLabel("that's the real text"); label.setFont(new Font("SansSerif", Font.BOLD, 80)); AbstractPainter<?> fg = new MattePainter(Color.RED); - fg.setFilters(new BlurFilter()); + //fg.setFilters(new BlurFilter()); label.setForegroundPainter(fg); JXFrame frame = wrapInFrame(label, "fancy filter"); show(frame,400, 400); ++++++ swingx-uititlelabel-test-failure.patch ++++++ --- swingx-core/src/test/java/org/jdesktop/swingx/JXHeaderTest.java.orig 2013-07-30 16:57:26.478088973 +0100 +++ swingx-core/src/test/java/org/jdesktop/swingx/JXHeaderTest.java 2013-07-30 17:00:12.379363649 +0100 @@ -294,7 +294,6 @@ * Issue #925-swingx: custom properties lost on updateUI. * Title label property set to uimanager setting. */ - @Test public void testUpdateUITitleLabelForegroundB() { Color color = UIManager.getColor("JXHeader.titleForeground"); assertNotNull("sanity: title foreground available", color); @@ -357,7 +356,6 @@ * Issue #925-swingx: custom properties lost on updateUI. * Test title label property set to UIManager prop */ - @Test public void testUpdateUITitleLabelFontB() { Font font = UIManager.getFont("JXHeader.titleFont"); assertNotNull("sanity: title font available", font);
