Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sisu for openSUSE:Factory checked in
at 2024-04-15 20:17:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sisu (Old)
and /work/SRC/openSUSE:Factory/.sisu.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sisu"
Mon Apr 15 20:17:26 2024 rev:8 rq:1167654 version:0.9.0.M2
Changes:
--------
--- /work/SRC/openSUSE:Factory/sisu/sisu.changes 2024-04-03
17:21:05.959008278 +0200
+++ /work/SRC/openSUSE:Factory/.sisu.new.26366/sisu.changes 2024-04-15
20:23:45.764338147 +0200
@@ -1,0 +2,60 @@
+Sun Apr 14 09:36:52 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Update to upstream milestone 0.9.0.M2
+ * Changes of sisu.inject 0.9.0.M2
+ + Fix SpaceScanner to use latest ASM API version
+ + 3.7 is not an officially supported version therefore specify
+ 3.8 instead
+ + Provide script to help upgrade embedded copy of ASM
+ + ASM_9_4
+ + Require Java 8
+ + Sisu specific PreConstruct/PreDestroy annotations
+ + Update build plugins
+ + ASM 9.5
+ + Align to latest Maven plugins
+ + Move release elements from oss-parent to local project
+ + Create a 'no_asm' jar at release time which doesn't embed ASM
+ * Changes of sisu.inject 9.0.M1
+ + Fix CDI related issues
+ + Build with Eclipse/Tycho 2.5.0 and Java 11
+ + Raise problem reporting logs to DEBUG, fixes #36
+ + Upgrade internal copy of ASM to 9.2
+ + Implement PathTypeConverter
+ + Add JUnit 5 annotations to InjectedTest setUp/tearDown
+ + Fix static parameters binding lookup
+ + Run injection tests against multiple versions of Guice
+ + Support using @priority on Providers
+ + Use read lock when subscribing to publishersâ¦
+ + Cache binding lookups for single bean providers
+ + Use AtomicReferenceFieldUpdater as it works better for large
+ numbers of instances
+ + Enable Java CI workflow
+ + Enable CodeQL analysis
+ + Replace potentially-expensive regex with simple tokenizer
+ + Allow Main to boot with extra bindings
+ + Re-enable various resource-related unit tests
+ + Rework globber pattern strategy to avoid use of regex
+ + Use GlobberStrategy.PATTERN instead of regex for
+ ServiceBindings filtering
+ * Changes of sisu.plexus 0.9.0.M2
+ + Make build work with Java17
+ + Align to latest Maven plugins
+ + Move release elements from oss-parent to local project
+ * Changes of sisu.plexus 0.9.0.M1
+ + Align logback with sisu.inject
+ + Build with Eclipse/Tycho 2.5.0 and Java 11
+ + Support configuration of collections with complex generic
+ types
+ + Enable Java CI workflow
+ + Enable CodeQL analysis
+- Removed patches:
+ * sisu-OSGi-import-guava.patch
+ * sisu-ignored-tests.patch
+ + not needed with this version any more
+- Modified patches:
+ * sisu-no-dependency-on-glassfish-servlet-api.patch
+ * sisu-osgi-api.patch
+ * sisu-reproducible-index.patch
+ + rediff to changed context
+
+-------------------------------------------------------------------
Old:
----
sisu-OSGi-import-guava.patch
sisu-ignored-tests.patch
sisu-inject-0.3.5.tar.gz
sisu-inject.pom
sisu-plexus-0.3.5.tar.gz
sisu-plexus.pom
New:
----
sisu-inject-0.9.0.M2.tar.gz
sisu-plexus-0.9.0.M2.tar.gz
BETA DEBUG BEGIN:
Old:- Removed patches:
* sisu-OSGi-import-guava.patch
* sisu-ignored-tests.patch
Old: * sisu-OSGi-import-guava.patch
* sisu-ignored-tests.patch
+ not needed with this version any more
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sisu.spec ++++++
--- /var/tmp/diff_new_pack.hy07Dq/_old 2024-04-15 20:23:46.328358912 +0200
+++ /var/tmp/diff_new_pack.hy07Dq/_new 2024-04-15 20:23:46.336359207 +0200
@@ -16,23 +16,19 @@
#
-%global reltype release
+%global reltype milestones
Name: sisu
-Version: 0.3.5
+Version: 0.9.0.M2
Release: 0
Summary: Eclipse dependency injection framework
# sisu is EPL-1.0, bundled asm is BSD
License: BSD-3-Clause AND EPL-1.0
Group: Development/Libraries/Java
URL: https://www.eclipse.org/sisu/
-Source0:
https://github.com/eclipse/sisu.inject/archive/refs/tags/releases/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz
-Source1:
https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz
+Source0:
https://github.com/eclipse/sisu.inject/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz
+Source1:
https://github.com/eclipse/sisu.plexus/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz
Source2: %{name}-build.tar.xz
-Source100: %{name}-inject.pom
-Source101: %{name}-plexus.pom
-Patch0: %{name}-OSGi-import-guava.patch
Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch
-Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-osgi-api.patch
Patch4: %{name}-reproducible-index.patch
BuildRequires: ant
@@ -44,6 +40,7 @@
BuildRequires: guice-servlet
BuildRequires: javapackages-local >= 6
BuildRequires: junit
+BuildRequires: junit5-minimal
BuildRequires: osgi-core
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-component-annotations
@@ -63,7 +60,6 @@
%package inject
Summary: Sisu inject
Group: Development/Libraries/Java
-Requires: mvn(javax.enterprise:cdi-api)
%description inject
This package contains %{summary}.
@@ -71,10 +67,7 @@
%package plexus
Summary: Sisu Plexus
Group: Development/Libraries/Java
-Requires: mvn(org.codehaus.plexus:plexus-classworlds)
-Requires: mvn(org.codehaus.plexus:plexus-component-annotations)
-Requires: mvn(org.codehaus.plexus:plexus-utils)
-Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) = %{version}
+Requires: %{name}-inject = %{version}
%description plexus
This package contains %{summary}.
@@ -88,37 +81,23 @@
%prep
%setup -q -c -T
-tar xf %{SOURCE0} && mv sisu.inject-releases-%{version} sisu-inject
-tar xf %{SOURCE1} && mv sisu.plexus-releases-%{version} sisu-plexus
+tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject
+tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus
tar xf %{SOURCE2}
-cp %{SOURCE100} sisu-inject/pom.xml
-cp %{SOURCE101} sisu-plexus/pom.xml
-
-%patch -P 0
%patch -P 1
-%patch -P 2
%patch -P 3
%patch -P 4 -p1
-%pom_remove_dep :servlet-api sisu-inject
-
-for i in inject plexus; do
- %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i}
-done
-%pom_change_dep :org.eclipse.sisu.inject
org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus
-
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 %{name}-plexus
-
%build
mkdir -p lib
build-jar-repository -s lib \
glassfish-annotation-api \
google-guice-no_aop \
- guice/guice-servlet \
javax.enterprise.inject/cdi-api \
javax.inject/atinject \
junit \
+ junit5 \
osgi-core/osgi.core \
plexus/utils \
plexus/xml \
@@ -131,20 +110,22 @@
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}
-install -pm 0644 %{name}-inject/target/org.eclipse.sisu.inject-%{version}.jar
%{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar
-install -pm 0644 %{name}-plexus/target/org.eclipse.sisu.plexus-%{version}.jar
%{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar
+install -pm 0644
%{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar
\
+ %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar
+install -pm 0644
%{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar
\
+ %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} %{name}-inject/pom.xml
%{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
+%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml
%{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
%add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f
inject
-%{mvn_install_pom} %{name}-plexus/pom.xml
%{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom
+%{mvn_install_pom} %{name}-plexus/org.eclipse.sisu.plexus/pom.xml
%{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom
%add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f
plexus -a org.sonatype.sisu:sisu-inject-plexus
# javadoc
for i in inject plexus; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
- cp -pr %{name}-${i}/target/site/apidocs/*
%{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
+ cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/*
%{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
%fdupes -s %{buildroot}%{_javadocdir}
++++++ sisu-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/build.xml new/build.xml
--- old/build.xml 2019-03-19 09:00:35.448094213 +0100
+++ new/build.xml 2024-04-09 17:46:50.654367287 +0200
@@ -1,21 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 3/12/19, 7:23 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="aggregator-project-from-maven" default="package" basedir=".">
+<project name="aggregator-project" default="package" basedir=".">
<!-- ======================================================================
-->
<!-- Cleaning up target
-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2022-03-20 20:44:25.449752866 +0100
+++ new/common.xml 2024-04-09 17:34:54.783027925 +0200
@@ -3,10 +3,11 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="0.3.5"/>
+ <property name="project.version" value="0.9.0.M2"/>
<property name="project.groupId" value="org.eclipse.sisu"/>
- <property name="compiler.source" value="1.8"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sisu-inject/build.xml new/sisu-inject/build.xml
--- old/sisu-inject/build.xml 2019-03-19 09:00:41.552123169 +0100
+++ new/sisu-inject/build.xml 2024-04-09 20:20:18.358159676 +0200
@@ -1,63 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.sisu.inject" default="package" basedir=".">
+<project name="sisu-inject" default="package" basedir=".">
<!-- ======================================================================
-->
- <!-- Build environment properties
-->
+ <!-- Cleaning up target
-->
<!-- ======================================================================
-->
- <include file="../common.xml"/>
- <property file="build.properties"/>
-
- <property name="project.artifactId" value="org.eclipse.sisu.inject"/>
-
- <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
- <property name="build.dir" value="target"/>
- <property name="build.outputDir" value="${build.dir}/classes"/>
- <property name="build.srcDir" value="${project.artifactId}/src"/>
- <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+ <target name="clean" description="Clean the output directory">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="clean"/>
+ </target>
<!-- ======================================================================
-->
- <!-- Defining classpaths
-->
+ <!-- Compilation target
-->
<!-- ======================================================================
-->
- <path id="build.classpath">
- <fileset dir="../lib">
- <!-- guice-4.0-no_aop javax.inject-1 cdi-api-1.1 javax.annotation-api-1.2
- guice-servlet-4.0 servlet-api-2.5 slf4j-api-1.7.13 osgi.core-6.0.0
- junit-4.12 testng-6.9.10 -->
- <include name="**/*.jar"/>
- </fileset>
- </path>
+ <target name="compile" description="Compile the code">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile"/>
+ </target>
<!-- ======================================================================
-->
- <!-- Cleaning up target
-->
+ <!-- Test-compilation target
-->
<!-- ======================================================================
-->
- <target name="clean" description="Clean the output directory">
- <delete dir="${build.dir}"/>
+ <target name="compile-tests" description="Compile the test code">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject"
target="compile-tests"/>
</target>
<!-- ======================================================================
-->
- <!-- Compilation target
-->
+ <!-- Run all tests
-->
<!-- ======================================================================
-->
- <target name="compile" description="Compile the code">
- <mkdir dir="${build.outputDir}"/>
- <javac destdir="${build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="${compiler.target}"
- verbose="false"
- fork="false"
- source="${compiler.source}">
- <src>
- <pathelement location="${build.srcDir}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
+ <target name="test" description="Run the test cases">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="test"/>
</target>
<!-- ======================================================================
-->
@@ -65,40 +39,15 @@
<!-- ======================================================================
-->
<target name="javadoc" description="Generates the Javadoc of the
application">
- <javadoc sourcepath="${build.srcDir}"
- packagenames="*"
- destdir="${reporting.outputDirectory}/apidocs"
- access="protected"
- source="${compiler.source}"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- encoding="UTF-8"
- linksource="false"
- breakiterator="false">
- <classpath refid="build.classpath"/>
- </javadoc>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="javadoc"/>
</target>
<!-- ======================================================================
-->
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="compile" description="Package the
application">
- <jar jarfile="${build.dir}/${build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${build.outputDir}"
- excludes="**/package.html"/>
+ <target name="package" description="Package the application">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="package"/>
</target>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sisu-inject/org.eclipse.sisu.inject/build.xml
new/sisu-inject/org.eclipse.sisu.inject/build.xml
--- old/sisu-inject/org.eclipse.sisu.inject/build.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/sisu-inject/org.eclipse.sisu.inject/build.xml 2024-04-09
18:15:02.218485182 +0200
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="org.eclipse.sisu.inject" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <include file="../../common.xml"/>
+ <property file="build.properties"/>
+
+ <property name="project.artifactId" value="org.eclipse.sisu.inject"/>
+
+ <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
+ <property name="build.dir" value="target"/>
+ <property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.srcDir" value="src/main/java"/>
+ <property name="build.resourceDir" value="."/>
+
+ <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
+
+ <path id="build.classpath">
+ <fileset dir="../../lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+ <path id="build.test.classpath">
+ <fileset dir="../../lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.outputDir}"/>
+ <javac destdir="${build.outputDir}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ release="${compiler.release}"
+ target="${compiler.target}"
+ verbose="false"
+ fork="false"
+ source="${compiler.source}">
+ <src>
+ <pathelement location="${build.srcDir}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${build.outputDir}">
+ <fileset dir="${build.resourceDir}">
+ <include name="META-INF/**"/>
+ <include name="about.html"/>
+ <include name="overview.html"/>
+ <include name="plugin.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application">
+ <javadoc sourcepath="${build.srcDir}"
+ packagenames="*"
+ destdir="${reporting.outputDirectory}/apidocs"
+ overview="overview.html"
+ access="protected"
+ source="${compiler.source}"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false">
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile" description="Package the
application">
+ <jar jarfile="${build.dir}/${build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Bundle-Description" value="JSR330-based container;
supports classpath scanning, auto-binding, and dynamic auto-wiring"/>
+ <attribute name="Bundle-License" value=""Eclipse Public License,
Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Sisu-Inject (Incubation)"/>
+ <attribute name="Bundle-SymbolicName"
value="${project.artifactId};singleton:=true"/>
+ <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/>
+ <attribute name="Bundle-Version" value="${project.version}"/>
+ <attribute name="Export-Package"
value="org.eclipse.sisu.bean;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu.inject;uses:="com.google.inject,com.google.inject.spi,javax.inject,org.eclipse.sisu,org.sonatype.inject",org.eclipse.sisu.launch;uses:="com.google.inject,junit.framework,org.eclipse.sisu.inject,org.eclipse.sisu.space,org.eclipse.sisu.wire,org.junit,org.junit.jupiter.api,org.osgi.framework,org.osgi.util.tracker,org.testng.annotations",org.eclipse.sisu.osgi;uses:="org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.space;uses:="com.google.inject,javax.annotation.processing,javax.lang.model,javax.lang.model.element,org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.wire;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu;uses:="javax.inject",org.sonatype.inject;x-internal:=true;uses:="javax.inject,org.eclipse.sisu""/>
+ <attribute name="Import-Package"
value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.servlet;resolution:=optional,com.google.inject.spi;version="1.3",com.google.inject;version="1.3",javax.annotation.processing;resolution:=optional,javax.annotation;resolution:=optional,javax.enterprise.inject;resolution:=optional,javax.inject,javax.lang.model.element;resolution:=optional,javax.lang.model.type;resolution:=optional,javax.lang.model.util;resolution:=optional,javax.lang.model;resolution:=optional,javax.servlet.http;resolution:=optional,javax.servlet;resolution:=optional,javax.tools;resolution:=optional,junit.framework;resolution:=optional,org.eclipse.sisu.inject;resolution:=optional,org.eclipse.sisu.osgi;resolution:=optional,org.eclipse.sisu;resolution:=optional,org.junit.jupiter.api;resolution:=optional,org.junit;resolution:=optional,org.osgi
.framework;version="1.5",org.osgi.util.tracker;version="1.4",org.slf4j;resolution:=optional,org.sonatype.inject;resolution:=optional,org.testng.annotations;resolution:=optional"/>
+ <attribute name="Main-Class" value="org.eclipse.sisu.launch.Main"/>
+ <attribute name="Private-Package" value="org.eclipse.sisu.space.asm"/>
+ <attribute name="Require-Capability"
value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sisu-inject/org.eclipse.sisu.inject.extender/build.xml
new/sisu-inject/org.eclipse.sisu.inject.extender/build.xml
--- old/sisu-inject/org.eclipse.sisu.inject.extender/build.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/sisu-inject/org.eclipse.sisu.inject.extender/build.xml 2024-04-09
17:45:14.000000000 +0200
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="org.eclipse.sisu.inject.extender" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <include file="../../common.xml"/>
+ <property file="build.properties"/>
+
+ <property name="project.artifactId"
value="org.eclipse.sisu.inject.extender"/>
+
+ <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
+ <property name="build.dir" value="target"/>
+ <property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.srcDir" value="src/main/java"/>
+ <property name="build.resourceDir" value="."/>
+
+ <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath"/>
+
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.outputDir}"/>
+ <javac destdir="${build.outputDir}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ release="${compiler.release}"
+ target="${compiler.target}"
+ verbose="false"
+ fork="false"
+ source="${compiler.source}">
+ <src>
+ <pathelement location="${build.srcDir}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${build.outputDir}">
+ <fileset dir="${build.resourceDir}">
+ <include name="META-INF/**"/>
+ <include name="about.html"/>
+ <include name="overview.html"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application">
+ <javadoc sourcepath="${build.srcDir}"
+ packagenames="*"
+ destdir="${reporting.outputDirectory}/apidocs"
+ overview="overview.html"
+ access="protected"
+ source="${compiler.source}"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false">
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile" description="Package the
application">
+ <jar jarfile="${build.dir}/${build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Bundle-Activator"
value="org.eclipse.sisu.launch.SisuExtender"/>
+ <attribute name="Bundle-Description" value="JSR330-based container;
supports classpath scanning, auto-binding, and dynamic auto-wiring"/>
+ <attribute name="Bundle-License" value=""Eclipse Public License,
Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Sisu-Inject Extender
(Incubation)"/>
+ <attribute name="Bundle-SymbolicName"
value="${project.artifactId};singleton:=true"/>
+ <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/>
+ <attribute name="Bundle-Version" value="${project.version}"/>
+ <attribute name="Import-Package" value="org.eclipse.sisu.launch"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sisu-plexus/build.xml new/sisu-plexus/build.xml
--- old/sisu-plexus/build.xml 2019-03-19 09:00:47.400150911 +0100
+++ new/sisu-plexus/build.xml 2024-04-09 20:24:44.799928892 +0200
@@ -1,71 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.sisu.plexus" default="package" basedir=".">
+<project name="sisu-plexus" default="package" basedir=".">
<!-- ======================================================================
-->
- <!-- Build environment properties
-->
+ <!-- Cleaning up target
-->
<!-- ======================================================================
-->
- <include file="../common.xml"/>
- <property file="build.properties"/>
-
- <property name="project.artifactId" value="org.eclipse.sisu.plexus"/>
-
- <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
- <property name="build.dir" value="target"/>
- <property name="build.outputDir" value="${build.dir}/classes"/>
- <property name="build.srcDir" value="${project.artifactId}/src"/>
- <property name="build.resourceDir"
value="${project.artifactId}/META-INF/plexus"/>
- <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+ <target name="clean" description="Clean the output directory">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="clean"/>
+ </target>
<!-- ======================================================================
-->
- <!-- Defining classpaths
-->
+ <!-- Compilation target
-->
<!-- ======================================================================
-->
- <path id="build.classpath">
- <pathelement location="../sisu-inject/target/classes"/>
- <fileset dir="../lib">
- <!-- plexus-classworlds-2.5.2 plexus-component-annotations-1.6
- plexus-utils-3.0.22 guice-4.0-no_aop slf4j-api-1.7.13
- osgi.core-6.0.0 junit-4.12 -->
- <include name="**/*.jar"/>
- </fileset>
- </path>
+ <target name="compile" description="Compile the code">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile"/>
+ </target>
<!-- ======================================================================
-->
- <!-- Cleaning up target
-->
+ <!-- Test-compilation target
-->
<!-- ======================================================================
-->
- <target name="clean" description="Clean the output directory">
- <delete dir="${build.dir}"/>
+ <target name="compile-tests" description="Compile the test code">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus"
target="compile-tests"/>
</target>
<!-- ======================================================================
-->
- <!-- Compilation target
-->
+ <!-- Run all tests
-->
<!-- ======================================================================
-->
- <target name="compile" description="Compile the code">
- <mkdir dir="${build.outputDir}"/>
- <javac destdir="${build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="${compiler.target}"
- verbose="false"
- fork="false"
- source="${compiler.source}">
- <src>
- <pathelement location="${build.srcDir}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <copy todir="${build.outputDir}/META-INF/plexus">
- <fileset dir="${build.resourceDir}">
- <include name="components.xml"/>
- </fileset>
- </copy>
+ <target name="test" description="Run the test cases">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="test"/>
</target>
<!-- ======================================================================
-->
@@ -73,40 +39,15 @@
<!-- ======================================================================
-->
<target name="javadoc" description="Generates the Javadoc of the
application">
- <javadoc sourcepath="${build.srcDir}"
- packagenames="*"
- destdir="${reporting.outputDirectory}/apidocs"
- access="protected"
- source="${compiler.source}"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- encoding="UTF-8"
- linksource="false"
- breakiterator="false">
- <classpath refid="build.classpath"/>
- </javadoc>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="javadoc"/>
</target>
<!-- ======================================================================
-->
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="compile" description="Package the
application">
- <jar jarfile="${build.dir}/${build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${build.outputDir}"
- excludes="**/package.html"/>
+ <target name="package" description="Package the application">
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="package"/>
</target>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sisu-plexus/org.eclipse.sisu.plexus/build.xml
new/sisu-plexus/org.eclipse.sisu.plexus/build.xml
--- old/sisu-plexus/org.eclipse.sisu.plexus/build.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/sisu-plexus/org.eclipse.sisu.plexus/build.xml 2024-04-09
20:04:19.261791554 +0200
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="org.eclipse.sisu.plexus" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <include file="../../common.xml"/>
+ <property file="build.properties"/>
+
+ <property name="project.artifactId" value="org.eclipse.sisu.plexus"/>
+
+ <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
+ <property name="build.dir" value="target"/>
+ <property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.srcDir" value="src/main/java"/>
+ <property name="build.resourceDir" value="."/>
+
+ <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
+
+ <path id="build.classpath">
+ <pathelement
location="../../sisu-inject/org.eclipse.sisu.inject/target/classes"/>
+ <fileset dir="../../lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.outputDir}"/>
+ <javac destdir="${build.outputDir}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ release="${compiler.release}"
+ target="${compiler.target}"
+ verbose="false"
+ fork="false"
+ source="${compiler.source}">
+ <src>
+ <pathelement location="${build.srcDir}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${build.outputDir}">
+ <fileset dir="${build.resourceDir}">
+ <include name="META-INF/**"/>
+ <include name="about.html"/>
+ <include name="overview.html"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application">
+ <javadoc sourcepath="${build.srcDir}"
+ packagenames="*"
+ destdir="${reporting.outputDirectory}/apidocs"
+ overview="overview.html"
+ access="protected"
+ source="${compiler.source}"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false">
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile" description="Package the
application">
+ <jar jarfile="${build.dir}/${build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Bundle-Description" value="Plexus-JSR330
adapter; adds Plexus support to the Sisu-Inject container"/>
+ <attribute name="Bundle-License" value=""Eclipse Public
License, Version
1.0";link="http://www.eclipse.org/legal/epl-v10.html""/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Sisu-Plexus (Incubation)"/>
+ <attribute name="Bundle-SymbolicName"
value="${project.artifactId};singleton:=true"/>
+ <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/>
+ <attribute name="Bundle-Version" value="${project.version}"/>
+ <attribute name="Export-Package"
value="org.codehaus.plexus.component.composition,org.codehaus.plexus.component.configurator.converters.basic;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.composite;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.lookup;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters",org.codehaus.plexus.component.configurator.converters.special;uses:="org.codehau
s.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.configurator;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.factory;uses:="org.codehaus.classworlds,org.codehaus.plexus,org.codehaus.plexus.classworlds.
realm,org.codehaus.plexus.component.repository",org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.component.repository;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.configuration",org.codehaus.plexus.component;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.repository",org.codehaus.plexus.configuration.xml;uses:="org.codehaus.plexus.configuration,org.codehaus.plexus.util.xml",org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging.console;uses:="org.codehaus.plexus.logging",org.codehaus.plexus.logging;uses:="org.codehaus.plexus.personality.plexus.lifecycle.phase,org.eclipse.sisu.bean",org.codehaus.plexus.personality.plexus.lifecycle.phase;uses:="org.codehaus.plexus,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context",org.codehaus.plexus;uses:="com.go
ogle.inject,junit.framework,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.composition,org.codehaus.plexus.component.repository,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.plexus",org.eclipse.sisu.plexus;uses:="com.google.inject,com.google.inject.matcher,com.google.inject.spi,javax.inject,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.annotations,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.repository,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.bean,org.eclipse.sisu.inject,org.eclipse.sisu.launch,org.eclipse.sisu.space,org.osgi.framework""/>
+ <attribute name="Import-Package"
value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.spi;version="1.3",com.google.inject.util;version="1.3",com.google.inject;version="1.3",javax.inject,junit.framework;resolution:=optional,org.codehaus.classworlds;version="[2.6,3)",org.codehaus.plexus.classworlds.realm;version="[2.6,3)",org.codehaus.plexus.classworlds;version="[2.6,3)",org.codehaus.plexus.component.annotations;resolution:=optional,org.codehaus.plexus.component.composition;resolution:=optional,org.codehaus.plexus.component.configurator.converters.basic;resolution:=optional,org.codehaus.plexus.component.configurator.converters.composite;resolution:=optional,org.codehaus.plexus.component.configurator.converters.lookup;resolution:=optional,org.codehaus.plexus.component.configurator.converters.special;resolutio
n:=optional,org.codehaus.plexus.component.configurator.converters;resolution:=optional,org.codehaus.plexus.component.configurator.expression;resolution:=optional,org.codehaus.plexus.component.configurator;resolution:=optional,org.codehaus.plexus.component.factory;resolution:=optional,org.codehaus.plexus.component.repository.exception;resolution:=optional,org.codehaus.plexus.component.repository;resolution:=optional,org.codehaus.plexus.component;resolution:=optional,org.codehaus.plexus.configuration.xml;resolution:=optional,org.codehaus.plexus.configuration;resolution:=optional,org.codehaus.plexus.context;resolution:=optional,org.codehaus.plexus.logging.console;resolution:=optional,org.codehaus.plexus.logging;resolution:=optional,org.codehaus.plexus.personality.plexus.lifecycle.phase;resolution:=optional,org.codehaus.plexus.util,org.codehaus.plexus.util.xml,org.codehaus.plexus.util.xml.pull,org.codehaus.plexus;resolution:=optional,org.eclipse.sisu.bean;version="[0.9,1)",org
.eclipse.sisu.inject;version="[0.9,1)",org.eclipse.sisu.launch;version="[0.9,1)",org.eclipse.sisu.plexus;version="[0.9,1)",org.eclipse.sisu.space;version="[0.9,1)",org.eclipse.sisu.wire;version="[0.9,1)",org.eclipse.sisu;version="[0.9,1)",org.osgi.framework;version="1.5",org.slf4j;resolution:=optional"/>
+ <attribute name="Require-Capability"
value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml
new/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml
--- old/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml 2024-04-09
18:08:00.000000000 +0200
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="org.eclipse.sisu.plexus.extender" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <include file="../../common.xml"/>
+ <property file="build.properties"/>
+
+ <property name="project.artifactId" value="org.eclipse.sisu.plexus"/>
+
+ <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
+ <property name="build.dir" value="target"/>
+ <property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.srcDir" value="src/main/java"/>
+ <property name="build.resourceDir" value="."/>
+
+ <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
+
+ <path id="build.classpath"/>
+
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.outputDir}"/>
+ <javac destdir="${build.outputDir}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ release="${compiler.release}"
+ target="${compiler.target}"
+ verbose="false"
+ fork="false"
+ source="${compiler.source}">
+ <src>
+ <pathelement location="${build.srcDir}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${build.outputDir}">
+ <fileset dir="${build.resourceDir}">
+ <include name="META-INF/**"/>
+ <include name="about.html"/>
+ <include name="overview.html"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application">
+ <javadoc sourcepath="${build.srcDir}"
+ packagenames="*"
+ destdir="${reporting.outputDirectory}/apidocs"
+ overview="overview.html"
+ access="protected"
+ source="${compiler.source}"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false">
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile" description="Package the
application">
+ <jar jarfile="${build.dir}/${build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Bundle-Description" value="Plexus-JSR330
adapter; adds Plexus support to the Sisu-Inject container"/>
+ <attribute name="Bundle-License" value=""Eclipse Public
License, Version
1.0";link="http://www.eclipse.org/legal/epl-v10.html""/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Sisu-Plexus Extender
(Incubation)"/>
+ <attribute name="Bundle-SymbolicName"
value="${project.artifactId};singleton:=true"/>
+ <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/>
+ <attribute name="Bundle-Version" value="${project.version}"/>
+ <attribute name="Fragment-Host"
value="org.eclipse.sisu.inject.extender"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+</project>
++++++ sisu-no-dependency-on-glassfish-servlet-api.patch ++++++
--- /var/tmp/diff_new_pack.hy07Dq/_old 2024-04-15 20:23:46.440363036 +0200
+++ /var/tmp/diff_new_pack.hy07Dq/_new 2024-04-15 20:23:46.444363183 +0200
@@ -1,6 +1,6 @@
----
sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
-+++
sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
-@@ -38,17 +38,6 @@ final class Implementations
+---
sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java
2024-04-09 19:53:29.797479006 +0200
++++
sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java
2024-04-09 19:59:23.506494426 +0200
+@@ -39,17 +39,6 @@
static
{
@@ -18,7 +18,7 @@
boolean hasJsr250Priority;
try
{
-@@ -65,8 +54,6 @@ final class Implementations
+@@ -66,8 +55,6 @@
// Constants
// ----------------------------------------------------------------------
@@ -27,25 +27,26 @@
private static final boolean HAS_JSR250_PRIORITY;
// ----------------------------------------------------------------------
-@@ -106,7 +93,7 @@ final class Implementations
+@@ -107,8 +94,7 @@
- // peek behind servlet/filter extension bindings when checking
priority, so we can order them by rank
- final Class<?> implementation =
-- binding.acceptTargetVisitor( HAS_GUICE_SERVLET && isPriority ?
ServletFinder.THIS : ClassFinder.THIS );
-+ binding.acceptTargetVisitor( ClassFinder.THIS );
+ final Class<?> annotationSource =
+ // when looking for @Priority also consider annotations on
providers (and servlets/filters if available)
+- binding.acceptTargetVisitor( isPriority ? ( HAS_GUICE_SERVLET ?
ServletFinder.THIS : ProviderFinder.THIS )
+- : ClassFinder.THIS );
++ binding.acceptTargetVisitor( isPriority ? ProviderFinder.THIS :
ClassFinder.THIS );
T annotation = null;
- if ( null != implementation )
-@@ -215,45 +202,4 @@ final class Implementations
- return binding.getPrivateElements().getInjector().getBinding(
binding.getKey() ).acceptTargetVisitor( this );
+ if ( null != annotationSource )
+@@ -253,45 +239,4 @@
+ return binding.getProviderKey().getTypeLiteral().getRawType();
}
}
-
- /**
-- * {@link ClassFinder} that can also peek behind servlet/filter bindings.
+- * {@link ProviderFinder} that also returns servlet/filter
implementations.
- */
- static final class ServletFinder
-- extends ClassFinder
+- extends ProviderFinder
- implements
com.google.inject.servlet.ServletModuleTargetVisitor<Object, Class<?>>
- {
- //
----------------------------------------------------------------------
++++++ sisu-osgi-api.patch ++++++
--- /var/tmp/diff_new_pack.hy07Dq/_old 2024-04-15 20:23:46.456363625 +0200
+++ /var/tmp/diff_new_pack.hy07Dq/_new 2024-04-15 20:23:46.460363772 +0200
@@ -1,5 +1,5 @@
----
sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java~
2015-09-13 20:15:37.000000000 +0200
-+++
sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
2017-01-29 19:56:51.608151337 +0100
+---
sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java~
2015-09-13 20:15:37.000000000 +0200
++++
sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java
2017-01-29 19:56:51.608151337 +0100
@@ -80,7 +80,7 @@
protected static boolean hasPlexusAnnotations( final Bundle bundle )
++++++ sisu-reproducible-index.patch ++++++
--- /var/tmp/diff_new_pack.hy07Dq/_old 2024-04-15 20:23:46.480364509 +0200
+++ /var/tmp/diff_new_pack.hy07Dq/_new 2024-04-15 20:23:46.488364803 +0200
@@ -1,11 +1,11 @@
----
sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java
2023-09-05 15:00:59.314655718 +0200
-+++
sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java
2023-09-05 15:04:15.889547023 +0200
+---
sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java
2023-09-05 15:00:59.314655718 +0200
++++
sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java
2023-09-05 15:04:15.889547023 +0200
@@ -158,7 +158,7 @@
final BufferedWriter writer = new BufferedWriter( getWriter(
INDEX_FOLDER + name ) );
try
{
- for ( final String line : table )
-+ for ( final String line : new java.util.TreeSet<String>(
table ) )
++ for ( final String line : new TreeSet<String>( table ) )
{
writer.write( line );
writer.newLine();
