[Git][java-team/livetribe-jsr223][master] 13 commits: Point Homepage to Github
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Feb 11 18:07:12 GMT 2025
Andreas Tille pushed to branch master at Debian Java Maintainers / livetribe-jsr223
Commits:
ef2f914f by Andreas Tille at 2025-02-11T18:19:33+01:00
Point Homepage to Github
- - - - -
6688c72e by Andreas Tille at 2025-02-11T18:20:58+01:00
Point watch file to Github
- - - - -
e8e836c4 by Andreas Tille at 2025-02-11T18:30:36+01:00
Build-Depends: s/default-jdk/default-jdk-headless/
- - - - -
d679f7b8 by Andreas Tille at 2025-02-11T18:30:57+01:00
New upstream version
- - - - -
06970e5f by Andreas Tille at 2025-02-11T18:30:58+01:00
New upstream version 2.0.7
- - - - -
88e0ef4b by Andreas Tille at 2025-02-11T18:30:58+01:00
Update upstream source from tag 'upstream/2.0.7'
Update to upstream version '2.0.7'
with Debian dir d83de68155002868e96666f8f0f05b375d92bea1
- - - - -
1405b9be by Andreas Tille at 2025-02-11T18:30:58+01:00
Standards-Version: 4.7.0 (routine-update)
- - - - -
7f08ba5f by Andreas Tille at 2025-02-11T18:30:58+01:00
debhelper-compat 13 (routine-update)
- - - - -
be7e7f6d by Andreas Tille at 2025-02-11T18:35:34+01:00
Reorder sequence of d/control fields by cme (routine-update)
- - - - -
71e3f162 by Andreas Tille at 2025-02-11T18:35:34+01:00
Drop useless get-orig-source target (routine-update)
- - - - -
1ed8da85 by Andreas Tille at 2025-02-11T18:40:40+01:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
98d7c4c0 by Andreas Tille at 2025-02-11T18:48:14+01:00
Build-Depends: libmaven-bundle-plugin-java
- - - - -
8f24370f by Andreas Tille at 2025-02-11T18:49:52+01:00
Upload to unstable
- - - - -
23 changed files:
- + .gitignore
- − debian/README.source
- debian/changelog
- − debian/compat
- debian/control
- − debian/orig-tar.sh
- debian/rules
- debian/watch
- pom.xml
- src/main/java/javax/script/AbstractScriptEngine.java
- src/main/java/javax/script/Bindings.java
- src/main/java/javax/script/Compilable.java
- src/main/java/javax/script/CompiledScript.java
- src/main/java/javax/script/Invocable.java
- src/main/java/javax/script/ScriptContext.java
- src/main/java/javax/script/ScriptEngine.java
- src/main/java/javax/script/ScriptEngineFactory.java
- src/main/java/javax/script/ScriptEngineInfo.java
- src/main/java/javax/script/ScriptEngineManager.java
- src/main/java/javax/script/ScriptException.java
- src/main/java/javax/script/SimpleBindings.java
- src/main/java/javax/script/SimpleScriptContext.java
- src/test/java/javax/script/ScriptExceptionTest.java
Changes:
=====================================
.gitignore
=====================================
@@ -0,0 +1,8 @@
+# intellij project files
+*.ipr
+*.iml
+*.iws
+.idea
+# all target dirs
+target/
+output/
=====================================
debian/README.source deleted
=====================================
@@ -1,5 +0,0 @@
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Torsten Werner <twerner at debian.org> Mon, 02 Aug 2010 05:26:46 +0200
=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+livetribe-jsr223 (2.0.7-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Point Homepage to Github
+ * Point watch file to Github
+ * Build-Depends:
+ - s/default-jdk/default-jdk-headless/
+ - libmaven-bundle-plugin-java
+ * Standards-Version: 4.7.0 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Reorder sequence of d/control fields by cme (routine-update)
+ * Drop useless get-orig-source target (routine-update)
+ * Trim trailing whitespace.
+
+ -- Andreas Tille <tille at debian.org> Tue, 11 Feb 2025 18:48:31 +0100
+
livetribe-jsr223 (2.0.6-2) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -1,24 +1,22 @@
Source: livetribe-jsr223
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>
Section: java
Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Torsten Werner <twerner at debian.org>
-Build-Depends:
- debhelper (>= 11),
- default-jdk,
- junit4,
- maven-debian-helper
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/livetribe-jsr223.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/livetribe-jsr223.git
-Homepage: http://www.livetribe.org/
+Build-Depends: debhelper-compat (= 13),
+ default-jdk-headless,
+ junit4,
+ libmaven-bundle-plugin-java,
+ maven-debian-helper
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/livetribe-jsr223
+Vcs-Git: https://salsa.debian.org/java-team/livetribe-jsr223.git
+Homepage: https://github.com/livetribe/livetribe-jsr223
Package: liblivetribe-jsr223-java
Architecture: all
-Depends:
- ${maven:Depends},
- ${misc:Depends}
+Depends: ${maven:Depends},
+ ${misc:Depends}
Description: Implementation of JSR 223: Scripting for Java
This library allows bundling scripting pages into a WAR file, either
stand-alone, or as part of an EAR. The full specification can be found at
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-
-DIR=livetribe-jsr223-$2
-TAG=v$2
-
-svn export http://svn.codehaus.org/livetribe/garden/livetribe-jsr223/tags/$TAG $DIR
-
-tar cfz livetribe-jsr223_$2.orig.tar.gz $DIR
-
-rm -rf $DIR ../$TAG
=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
%:
dh $@
-
-get-orig-source:
- uscan --download-current-version --force-download --rename
=====================================
debian/watch
=====================================
@@ -1 +1,4 @@
-#Upstream project is inactive/dead.
+version=4
+
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+ https://github.com/livetribe/livetribe-jsr223/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
=====================================
pom.xml
=====================================
@@ -4,15 +4,15 @@
<parent>
<groupId>org.livetribe</groupId>
<artifactId>livetribe</artifactId>
- <version>1.2</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.livetribe</groupId>
<artifactId>livetribe-jsr223</artifactId>
- <version>2.0.6</version>
+ <version>2.0.7</version>
<name>LiveTribe :: JSR 223</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<defaultGoal>install</defaultGoal>
@@ -20,11 +20,39 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}_1.0_spec</Bundle-SymbolicName>
+ <Bundle-Description>LiveTribe :: JSR 223</Bundle-Description>
+ <Export-Package>!META-INF*,javax.script.*;version=1.0</Export-Package>
+ <Import-Package></Import-Package>
+ <Private-Package></Private-Package>
+ <Implementation-Title>LiveTribe :: JSR 223</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
=====================================
src/main/java/javax/script/AbstractScriptEngine.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public abstract class AbstractScriptEngine implements ScriptEngine
{
=====================================
src/main/java/javax/script/Bindings.java
=====================================
@@ -20,7 +20,7 @@ import java.util.Map;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Bindings extends Map<String, Object>
{
=====================================
src/main/java/javax/script/Compilable.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Compilable
{
=====================================
src/main/java/javax/script/CompiledScript.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public abstract class CompiledScript
{
=====================================
src/main/java/javax/script/Invocable.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Invocable
{
=====================================
src/main/java/javax/script/ScriptContext.java
=====================================
@@ -22,7 +22,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptContext
{
=====================================
src/main/java/javax/script/ScriptEngine.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngine
{
=====================================
src/main/java/javax/script/ScriptEngineFactory.java
=====================================
@@ -21,7 +21,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngineFactory
{
=====================================
src/main/java/javax/script/ScriptEngineInfo.java
=====================================
@@ -20,7 +20,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngineInfo
{
=====================================
src/main/java/javax/script/ScriptEngineManager.java
=====================================
@@ -32,7 +32,7 @@ import java.util.Stack;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class ScriptEngineManager
{
@@ -190,22 +190,35 @@ public class ScriptEngineManager
{
Stack<String> stack = new Stack<String>();
+ BufferedReader r = null;
try
{
- BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()));
+ r = new BufferedReader(new InputStreamReader(url.openStream()));
String line;
while ((line = r.readLine()) != null)
{
int comment = line.indexOf('#');
if (comment != -1) line = line.substring(0, comment);
-
- stack.push(line.trim());
+ line = line.trim();
+ if (line.length() > 0)
+ stack.push(line);
}
}
catch (IOException doNothing)
{
}
+ finally
+ {
+ try
+ {
+ if (r != null)
+ r.close();
+ }
+ catch (IOException doNothing)
+ {
+ }
+ }
return stack;
}
=====================================
src/main/java/javax/script/ScriptException.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 557 $ $Date: 2009-08-28 19:39:19 +0200 (Fr, 28. Aug 2009) $
+ * @version $Revision$ $Date$
*/
public class ScriptException extends Exception
{
=====================================
src/main/java/javax/script/SimpleBindings.java
=====================================
@@ -23,7 +23,7 @@ import java.util.Set;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class SimpleBindings implements Bindings
{
=====================================
src/main/java/javax/script/SimpleScriptContext.java
=====================================
@@ -21,15 +21,16 @@ import java.io.Reader;
import java.io.Writer;
import java.io.PrintWriter;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class SimpleScriptContext implements ScriptContext
{
- private static final Integer[] SCOPES = {ENGINE_SCOPE, GLOBAL_SCOPE};
+ private static final List<Integer> SCOPES = Collections.unmodifiableList(Arrays.asList(ENGINE_SCOPE, GLOBAL_SCOPE));
protected Bindings globalScope;
protected Bindings engineScope;
@@ -58,7 +59,7 @@ public class SimpleScriptContext implements ScriptContext
globalScope = bindings;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
}
@@ -71,7 +72,7 @@ public class SimpleScriptContext implements ScriptContext
case GLOBAL_SCOPE:
return globalScope;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
}
@@ -89,7 +90,7 @@ public class SimpleScriptContext implements ScriptContext
bindings = globalScope;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
if (bindings != null) {
bindings.put(name, value);
@@ -110,7 +111,7 @@ public class SimpleScriptContext implements ScriptContext
bindings = globalScope;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
return (bindings != null) ? bindings.get(name) : null;
@@ -162,7 +163,7 @@ public class SimpleScriptContext implements ScriptContext
public List<Integer> getScopes()
{
- return Arrays.asList(SCOPES);
+ return SCOPES;
}
public Writer getWriter()
=====================================
src/test/java/javax/script/ScriptExceptionTest.java
=====================================
@@ -20,7 +20,7 @@ import org.junit.Test;
/**
- * @version $Revision: 557 $ $Date: 2009-08-28 19:39:19 +0200 (Fr, 28. Aug 2009) $
+ * @version $Revision$ $Date: $
*/
public class ScriptExceptionTest
{
View it on GitLab: https://salsa.debian.org/java-team/livetribe-jsr223/-/compare/197cf48b57a7df6214b5d9035d4e3904a3084e17...8f24370f09327e6f67550ff03a10ce46b8e95f5f
--
View it on GitLab: https://salsa.debian.org/java-team/livetribe-jsr223/-/compare/197cf48b57a7df6214b5d9035d4e3904a3084e17...8f24370f09327e6f67550ff03a10ce46b8e95f5f
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/20250211/418ed867/attachment.htm>
More information about the pkg-java-commits
mailing list