[Git][java-team/plexus-languages][master] 3 commits: Removed the backward compatibility patch

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-languages


Commits:
4166f3eb by Emmanuel Bourg at 2022-12-26T12:18:22+01:00
Removed the backward compatibility patch

- - - - -
a7974544 by Emmanuel Bourg at 2022-12-26T12:18:40+01:00
Standards-Version updated to 4.6.2

- - - - -
83b2e612 by Emmanuel Bourg at 2022-12-26T12:18:54+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- − debian/patches/03-backward-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+plexus-languages (1.1.1-2) unstable; urgency=medium
+
+  * Removed the backward compatibility patch
+  * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 Dec 2022 12:18:48 +0100
+
 plexus-languages (1.1.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
  libmockito-java,
  libqdox2-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/plexus-languages.git
 Vcs-Browser: https://salsa.debian.org/java-team/plexus-languages
 Homepage: https://github.com/codehaus-plexus/plexus-languages


=====================================
debian/patches/03-backward-compatibility.patch deleted
=====================================
@@ -1,105 +0,0 @@
-Description: Restores the binary compatibility with the version 0.9.10
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ModuleNameSource.java
-+++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ModuleNameSource.java
-@@ -19,7 +19,9 @@
-  * under the License.
-  */
- 
--public enum ModuleNameSource
-+public interface ModuleNameSource
- {
--    FILENAME, MANIFEST, MODULEDESCRIPTOR
-+    ResolvePathsResult.ModuleNameSource FILENAME = ResolvePathsResult.ModuleNameSource.FILENAME;
-+    ResolvePathsResult.ModuleNameSource MANIFEST = ResolvePathsResult.ModuleNameSource.MANIFEST;
-+    ResolvePathsResult.ModuleNameSource MODULEDESCRIPTOR = ResolvePathsResult.ModuleNameSource.MODULEDESCRIPTOR;
- }
---- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathsResult.java
-+++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathsResult.java
-@@ -33,6 +33,11 @@
-  */
- public class ResolvePathsResult<T>
- {
-+    public enum ModuleNameSource
-+    {
-+        FILENAME, MANIFEST, MODULEDESCRIPTOR
-+    }
-+
-     private JavaModuleDescriptor mainModuleDescriptor;
-     
-     /**
-@@ -40,7 +45,7 @@
-      */
-     private Map<T, JavaModuleDescriptor> pathElements;
-     
--    private Map<T, ModuleNameSource> modulepathElements = new LinkedHashMap<>();
-+    private Map<T, org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource> modulepathElements = new LinkedHashMap<>();
-     
-     private Collection<T> classpathElements = new ArrayList<>();
-     
-@@ -91,7 +96,7 @@
-         return classpathElements;
-     }
-     
--    void setModulepathElements( Map<T, ModuleNameSource> modulepathElements )
-+    void setModulepathElements( Map<T, org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource> modulepathElements )
-     {
-         this.modulepathElements = modulepathElements;
-     }
-@@ -103,7 +108,7 @@
-      * @return all modulepath elements, never {@code null} 
-      * @see #getPathElements()
-      */
--    public Map<T, ModuleNameSource> getModulepathElements()
-+    public Map<T, org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource> getModulepathElements()
-     {
-         return modulepathElements;
-     }
---- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java
-+++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java
-@@ -166,7 +166,7 @@
- 
-         Map<String, JavaModuleDescriptor> availableNamedModules = new HashMap<>();
-         
--        Map<String, ModuleNameSource> moduleNameSources = new HashMap<>();
-+        Map<String, ResolvePathsResult.ModuleNameSource> moduleNameSources = new HashMap<>();
-         
-         final Map<T, Path> filenameAutoModules = new HashMap<>();
-         
-@@ -174,7 +174,7 @@
-         for ( final T t : request.getPathElements() )
-         {
-             JavaModuleDescriptor moduleDescriptor;
--            ModuleNameSource source;
-+            ResolvePathsResult.ModuleNameSource source;
-             
-             ModuleNameExtractor nameExtractor = new ModuleNameExtractor()
-             {
---- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathResult.java
-+++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathResult.java
-@@ -29,7 +29,7 @@
- {
-     private JavaModuleDescriptor moduleDescriptor;
-     
--    private ModuleNameSource moduleNameSource;
-+    private ResolvePathsResult.ModuleNameSource moduleNameSource;
-     
-     ResolvePathResult()
-     {
-@@ -46,13 +46,13 @@
-         return moduleDescriptor;
-     }
-     
--    ResolvePathResult setModuleNameSource( ModuleNameSource moduleNameSource )
-+    ResolvePathResult setModuleNameSource( ResolvePathsResult.ModuleNameSource moduleNameSource )
-     {
-         this.moduleNameSource = moduleNameSource;
-         return this;
-     }
-     
--    public ModuleNameSource getModuleNameSource()
-+    public ResolvePathsResult.ModuleNameSource getModuleNameSource()
-     {
-         return moduleNameSource;
-     }


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 02-mockito-compatibility.patch
-03-backward-compatibility.patch
 04-module-info.patch



View it on GitLab: https://salsa.debian.org/java-team/plexus-languages/-/compare/ad4405233025a12153f90a27486bf8faed10b986...83b2e612947c641f72dd20dfe3376e13b6ec80ec

-- 
View it on GitLab: https://salsa.debian.org/java-team/plexus-languages/-/compare/ad4405233025a12153f90a27486bf8faed10b986...83b2e612947c641f72dd20dfe3376e13b6ec80ec
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230103/9696ae2e/attachment.htm>