[Git][java-team/commons-jci][master] 6 commits: Raising d/watch version to 4
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Wed Feb 5 19:29:47 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / commons-jci
Commits:
aca519ec by Pierre Gruet at 2025-02-03T23:19:01+01:00
Raising d/watch version to 4
- - - - -
02cc3169 by Pierre Gruet at 2025-02-03T23:25:18+01:00
R-R-R: no
- - - - -
4aa10537 by Pierre Gruet at 2025-02-03T23:25:52+01:00
Building against janino/3.1.12
- - - - -
8b851ce2 by Pierre Gruet at 2025-02-03T23:38:18+01:00
Installing the Apache-2.0 NOTICE.txt file in the binary packages
- - - - -
73ba3807 by Pierre Gruet at 2025-02-03T23:40:05+01:00
Updating changelog
- - - - -
bd15f6f4 by Pierre Gruet at 2025-02-03T23:40:16+01:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- debian/control
- + debian/libcommons-jci-eclipse-java.docs
- + debian/libcommons-jci-groovy-java.docs
- + debian/libcommons-jci-janino-java.docs
- + debian/libcommons-jci-java.docs
- + debian/libcommons-jci-rhino-java.docs
- + debian/patches/janino_3.1.12.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+commons-jci (1.1-9) unstable; urgency=medium
+
+ * Team upload
+ * Providing the new package names from janino 3.1.12
+ * Raising d/watch version to 4
+ * Setting Rules-Requires-Root: no
+ * Building against janino/3.1.12 (Closes: #1095119)
+ * Installing the Apache-2.0 NOTICE.txt file in the binary packages
+
+ -- Pierre Gruet <pgt at debian.org> Mon, 03 Feb 2025 23:40:09 +0100
+
commons-jci (1.1-8) unstable; urgency=medium
* Fixed the build failure with eclipse-jdt 4.29 (Closes: #1078412)
=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
libcommons-lang3-java,
libcommons-logging-java,
libeclipse-jdt-core-java,
- libjanino-java (>= 2.6.0),
+ libjanino-java (>= 3.1.12+dfsg),
libmaven-antrun-plugin-java,
libmaven-javadoc-plugin-java,
librhino-java,
@@ -23,6 +23,7 @@ Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/commons-jci.git
Vcs-Browser: https://salsa.debian.org/java-team/commons-jci
Homepage: http://commons.apache.org/jci/
+Rules-Requires-Root: no
Package: libcommons-jci-java
Architecture: all
=====================================
debian/libcommons-jci-eclipse-java.docs
=====================================
@@ -0,0 +1,2 @@
+NOTICE.txt
+README.txt
=====================================
debian/libcommons-jci-groovy-java.docs
=====================================
@@ -0,0 +1,2 @@
+NOTICE.txt
+README.txt
=====================================
debian/libcommons-jci-janino-java.docs
=====================================
@@ -0,0 +1,2 @@
+NOTICE.txt
+README.txt
=====================================
debian/libcommons-jci-java.docs
=====================================
@@ -0,0 +1,2 @@
+NOTICE.txt
+README.txt
=====================================
debian/libcommons-jci-rhino-java.docs
=====================================
@@ -0,0 +1,2 @@
+NOTICE.txt
+README.txt
=====================================
debian/patches/janino_3.1.12.patch
=====================================
@@ -0,0 +1,83 @@
+Description: building against janino 3.1.12, in which some packages have
+ changed, as well as the creation of Compiler
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2025-02-03
+
+--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
++++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
+@@ -36,12 +36,12 @@
+ import org.codehaus.janino.ClassLoaderIClassLoader;
+ import org.codehaus.janino.Compiler;
+ import org.codehaus.janino.FilterWarningHandler;
+-import org.codehaus.janino.UnitCompiler.ErrorHandler;
+-import org.codehaus.janino.WarningHandler;
+-import org.codehaus.janino.util.StringPattern;
+-import org.codehaus.janino.util.resource.Resource;
+-import org.codehaus.janino.util.resource.ResourceCreator;
+-import org.codehaus.janino.util.resource.ResourceFinder;
++import org.codehaus.commons.compiler.ErrorHandler;
++import org.codehaus.commons.compiler.WarningHandler;
++import org.codehaus.commons.compiler.util.StringPattern;
++import org.codehaus.commons.compiler.util.resource.Resource;
++import org.codehaus.commons.compiler.util.resource.ResourceCreator;
++import org.codehaus.commons.compiler.util.resource.ResourceFinder;
+
+ /**
+ * @author tcurdt
+@@ -109,8 +109,8 @@
+
+ final StringPattern[] pattern = StringPattern.PATTERNS_NONE;
+
+- final Compiler compiler = new Compiler(
+- new ResourceFinder() {
++ Compiler compiler = new Compiler();
++ compiler.setSourceFinder(new ResourceFinder() {
+ @Override
+ public Resource findResource( final String pSourceName ) {
+ final byte[] bytes = pResourceReader.getBytes(pSourceName);
+@@ -124,9 +124,9 @@
+
+ return new JciResource(pSourceName, bytes);
+ }
+- },
+- new ClassLoaderIClassLoader(pClassLoader),
+- new ResourceFinder() {
++ });
++ compiler.setIClassLoader(new ClassLoaderIClassLoader(pClassLoader));
++ compiler.setClassFileFinder(new ResourceFinder() {
+ @Override
+ public Resource findResource( final String pResourceName ) {
+ final byte[] bytes = pStore.read(pResourceName);
+@@ -140,8 +140,8 @@
+
+ return new JciResource(pResourceName, bytes);
+ }
+- },
+- new ResourceCreator() {
++ });
++ compiler.setClassFileCreator(new ResourceCreator() {
+ public OutputStream createResource( final String pResourceName ) throws IOException {
+ return new JciOutputStream(pResourceName, pStore);
+ }
+@@ -152,13 +152,13 @@
+ pStore.remove(pResourceName);
+ return true;
+ }
+- },
+- pSettings.getSourceEncoding(),
+- false,
+- pSettings.isDebug(),
+- pSettings.isDebug(),
+- pSettings.isDebug(),
+- new FilterWarningHandler(pattern, new WarningHandler() {
++ });
++ compiler.setCharacterEncoding(pSettings.getSourceEncoding());
++ compiler.setVerbose(false);
++ compiler.setDebugSource(pSettings.isDebug());
++ compiler.setDebugLines(pSettings.isDebug());
++ compiler.setDebugVars(pSettings.isDebug());
++ compiler.setWarningHandler(new FilterWarningHandler(pattern, new WarningHandler() {
+ public void handleWarning( final String pHandle, final String pMessage, final Location pLocation ) {
+ final CompilationProblem problem = new JaninoCompilationProblem(pLocation.getFileName(), pLocation, pMessage, false);
+ if (problemHandler != null) {
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
01-eclipse-jdt-dependency.patch
+janino_3.1.12.patch
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
https://www.apache.org/dist/commons/jci/source/commons-jci-(.*)-src\.tar\.gz debian uupdate
View it on GitLab: https://salsa.debian.org/java-team/commons-jci/-/compare/705fcb32bc4bd4f115813d634c4f240f6e5ff318...bd15f6f4da937796c7476f087de412840eff1b12
--
View it on GitLab: https://salsa.debian.org/java-team/commons-jci/-/compare/705fcb32bc4bd4f115813d634c4f240f6e5ff318...bd15f6f4da937796c7476f087de412840eff1b12
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/20250205/7f4ac40f/attachment.htm>
More information about the pkg-java-commits
mailing list