[Git][java-team/sisu-inject][upstream] New upstream version 0.3.5
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue Dec 17 22:42:38 GMT 2024
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / sisu-inject
Commits:
e890c6ec by Emmanuel Bourg at 2024-12-17T23:24:37+01:00
New upstream version 0.3.5
- - - - -
13 changed files:
- + .gitignore
- org.eclipse.sisu.inject.extender/META-INF/MANIFEST.MF
- org.eclipse.sisu.inject.extender/pom.xml
- + org.eclipse.sisu.inject.extender/src/.gitignore
- org.eclipse.sisu.inject.site/pom.xml
- org.eclipse.sisu.inject.tests/pom.xml
- org.eclipse.sisu.inject/META-INF/MANIFEST.MF
- org.eclipse.sisu.inject/build.extra/artifacts.xml
- org.eclipse.sisu.inject/build.target
- org.eclipse.sisu.inject/pom.xml
- org.eclipse.sisu.inject/src/org/eclipse/sisu/space/SpaceScanner.java
- org.eclipse.sisu.inject/src/org/eclipse/sisu/space/Streams.java
- pom.xml
Changes:
=====================================
.gitignore
=====================================
@@ -0,0 +1,12 @@
+target/
+.project
+.classpath
+.settings/
+.idea/
+*.iml
+*.ipr
+*.iws
+*.diff
+*.patch
+*.log
+*.swp
=====================================
org.eclipse.sisu.inject.extender/META-INF/MANIFEST.MF
=====================================
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.sisu.inject.extender;singleton:=true
-Bundle-Version: 0.3.4
+Bundle-Version: 0.3.5
Bundle-Name: Sisu-Inject Extender (Incubation)
Bundle-Activator: org.eclipse.sisu.launch.SisuExtender
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
=====================================
org.eclipse.sisu.inject.extender/pom.xml
=====================================
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-inject</artifactId>
- <version>0.3.4</version>
+ <version>0.3.5</version>
</parent>
<artifactId>org.eclipse.sisu.inject.extender</artifactId>
=====================================
org.eclipse.sisu.inject.extender/src/.gitignore
=====================================
@@ -0,0 +1 @@
+# keep src folder around
=====================================
org.eclipse.sisu.inject.site/pom.xml
=====================================
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-inject</artifactId>
- <version>0.3.4</version>
+ <version>0.3.5</version>
</parent>
<artifactId>org.eclipse.sisu.inject.site</artifactId>
=====================================
org.eclipse.sisu.inject.tests/pom.xml
=====================================
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-inject</artifactId>
- <version>0.3.4</version>
+ <version>0.3.5</version>
</parent>
<artifactId>org.eclipse.sisu.inject.tests</artifactId>
@@ -45,19 +45,15 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
+ <artifactId>javax.el-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
+ <groupId>javax.interceptor</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
</exclusion>
</exclusions>
</dependency>
=====================================
org.eclipse.sisu.inject/META-INF/MANIFEST.MF
=====================================
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Main-Class: org.eclipse.sisu.launch.Main
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.sisu.inject;singleton:=true
-Bundle-Version: 0.3.4
+Bundle-Version: 0.3.5
Bundle-Name: Sisu-Inject (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Sisu
=====================================
org.eclipse.sisu.inject/build.extra/artifacts.xml
=====================================
@@ -6,10 +6,10 @@
<property name='p2.compressed' value='false'/>
</properties>
<mappings size='4'>
- <rule filter='(& (id=com.google.guava))' output='http://repo.maven.apache.org/maven2/com/google/guava/guava/16.0/guava-16.0.jar'/>
- <rule filter='(& (id=com.google.inject))' output='http://repo.maven.apache.org/maven2/com/google/inject/guice/4.0-beta5/guice-4.0-beta5.jar'/>
- <rule filter='(& (id=com.google.inject.servlet))' output='http://repo.maven.apache.org/maven2/com/google/inject/extensions/guice-servlet/4.0-beta5/guice-servlet-4.0-beta5.jar'/>
- <rule filter='(& (id=org.testng))' output='http://repo.maven.apache.org/maven2/org/testng/testng/6.7/testng-6.7.jar'/>
+ <rule filter='(& (id=com.google.guava))' output='https://repo.maven.apache.org/maven2/com/google/guava/guava/16.0/guava-16.0.jar'/>
+ <rule filter='(& (id=com.google.inject))' output='https://repo.maven.apache.org/maven2/com/google/inject/guice/4.0-beta5/guice-4.0-beta5.jar'/>
+ <rule filter='(& (id=com.google.inject.servlet))' output='https://repo.maven.apache.org/maven2/com/google/inject/extensions/guice-servlet/4.0-beta5/guice-servlet-4.0-beta5.jar'/>
+ <rule filter='(& (id=org.testng))' output='https://repo.maven.apache.org/maven2/org/testng/testng/6.7/testng-6.7.jar'/>
</mappings>
<artifacts size='4'>
<artifact classifier='osgi.bundle' id='com.google.guava' version='16.0.0'>
=====================================
org.eclipse.sisu.inject/build.target
=====================================
@@ -21,7 +21,7 @@
<unit id="com.google.inject" version="4.0.0.beta5"/>
<unit id="com.google.inject.servlet" version="4.0.0.beta5"/>
<unit id="org.testng" version="6.7.0"/>
-<repository location="http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/plain/org.eclipse.sisu.inject/build.extra?id=8ebc2f9074d5208d9e3fe32d4356093d9dd23ca5"/>
+<repository location="https://github.com/eclipse/sisu.inject/raw/6aab4e3d83a4c8faa254e1085781afe9cb3eb6ec/org.eclipse.sisu.inject/build.extra/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="3.7.2.v20120110-1415"/>
=====================================
org.eclipse.sisu.inject/pom.xml
=====================================
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-inject</artifactId>
- <version>0.3.4</version>
+ <version>0.3.5</version>
</parent>
<artifactId>org.eclipse.sisu.inject</artifactId>
=====================================
org.eclipse.sisu.inject/src/org/eclipse/sisu/space/SpaceScanner.java
=====================================
@@ -96,7 +96,7 @@ public final class SpaceScanner
}
try
{
- final InputStream in = url.openStream();
+ final InputStream in = Streams.open( url );
try
{
new ClassReader( in ).accept( adapt( visitor ), ASM_FLAGS );
=====================================
org.eclipse.sisu.inject/src/org/eclipse/sisu/space/Streams.java
=====================================
@@ -27,23 +27,32 @@ public final class Streams
static
{
- boolean onWindows;
+ boolean useCaches;
try
{
- onWindows = System.getProperty( "os.name" ).toLowerCase( Locale.US ).contains( "windows" );
+ String urlCaches = System.getProperty( "sisu.url.caches" );
+ if ( null != urlCaches && !urlCaches.isEmpty() )
+ {
+ useCaches = Boolean.parseBoolean( urlCaches );
+ }
+ else
+ {
+ String osName = System.getProperty( "os.name" ).toLowerCase( Locale.US );
+ useCaches = !osName.contains( "windows" );
+ }
}
catch ( final RuntimeException e )
{
- onWindows = false;
+ useCaches = true;
}
- ON_WINDOWS = onWindows;
+ USE_CACHES = useCaches;
}
// ----------------------------------------------------------------------
// Constants
// ----------------------------------------------------------------------
- private static final boolean ON_WINDOWS;
+ private static final boolean USE_CACHES;
// ----------------------------------------------------------------------
// Constructors
@@ -59,17 +68,19 @@ public final class Streams
// ----------------------------------------------------------------------
/**
- * Opens an input stream to the given URL; disables JAR caching on Windows.
+ * Opens an input stream to the given URL; disables JAR caching on Windows
+ * or when the 'sisu.url.caches' system property is set to {@code false}.
*/
public static InputStream open( final URL url )
throws IOException
{
- if ( ON_WINDOWS )
+ if ( USE_CACHES )
{
- final URLConnection conn = url.openConnection();
- conn.setUseCaches( false );
- return conn.getInputStream();
+ return url.openStream();
}
- return url.openStream();
+
+ final URLConnection conn = url.openConnection();
+ conn.setUseCaches( false );
+ return conn.getInputStream();
}
}
=====================================
pom.xml
=====================================
@@ -22,7 +22,7 @@
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-inject</artifactId>
- <version>0.3.4</version>
+ <version>0.3.5</version>
<packaging>pom</packaging>
<name>Sisu Inject</name>
View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/commit/e890c6ec9e878ef0a6f2be24c1f32f9c86643efb
--
View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/commit/e890c6ec9e878ef0a6f2be24c1f32f9c86643efb
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/20241217/4e00d4bf/attachment.htm>
More information about the pkg-java-commits
mailing list