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-06-06 12:33:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sisu (Old)
and /work/SRC/openSUSE:Factory/.sisu.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sisu"
Thu Jun 6 12:33:11 2024 rev:10 rq:1178808 version:0.9.0.M3
Changes:
--------
New Changes file:
--- /dev/null 2024-04-24 00:57:13.556000000 +0200
+++ /work/SRC/openSUSE:Factory/.sisu.new.24587/sisu-mojos.changes 2024-06-06 12:33:22.814139485 +0200
@@ -0,0 +1,57 @@
+-------------------------------------------------------------------
+Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba
+
+- Upgrade to upstream milestone 0.9.0.M3
+ * Changes
+ + Annotate new method
+ + Update workflow to run on Java 21
+ + Build with final Java 21 on GitHub
+ + Switch to JUnit5
+ + Disable annotation processor by default
+ + Do not silently fail in case of class scanning exceptions
+ + Formatting issues
+ + Update to ASM 9.7
+ + Update CONTRIBUTING.md
+ + Align Plexus ASM version
+ + Rename release profile
+ + Fix Jacoco coverage repots in Sonar
+ + Add a method to allow LifecycleManager to free keys
+ + Licence change: From EPL1 to EPL2
+ + update documentation for exposed core extensions, fix anchors
+ + Trigger Sonarcloud analysis from GHA
+- Build sisu-mojos as a second spec within sisu package, since the
+ sources of sisu-mojos, sisu-inject and sisu-plexus were joined in
+ the same upstream project
+
+-------------------------------------------------------------------
+Tue Sep 19 11:11:52 UTC 2023 - Fridrich Strba
+
+- Do not require maven-javadoc-plugin that we don't use
+
+-------------------------------------------------------------------
+Wed Sep 6 13:38:16 UTC 2023 - Fridrich Strba
+
+- Upgrade to 0.9.0 milestone 2
+ * Changes of 0.9.0.M2
+ + Add m2e support
+ + Convert APT to MD
+ + Update plugin
+ + Align to latest Maven plugins
+ * Changes of 0.9.0.M1
+ + On debug, emit scanned entries
+ + Enable Java CI workflow
+ + Enable CodeQL analysis
+ + Avoid rewriting the index if it has not changed
+ * Changes of 0.3.5
+ + Build against CDI API 1.2
+ * Changes of 0.3.4
+ + Reproducible builds
+ * Changes of 0.3.3
+ + Lifecycle maintenance
+ * Changes of 0.3.2
+ + Java9+Jigsaw support
+
+-------------------------------------------------------------------
+Fri May 5 08:10:40 UTC 2023 - Fridrich Strba
+
+- Initial packaging with version 0.3.1
--- /work/SRC/openSUSE:Factory/sisu/sisu.changes 2024-05-16 18:33:08.839066413 +0200
+++ /work/SRC/openSUSE:Factory/.sisu.new.24587/sisu.changes 2024-06-06 12:33:22.930143713 +0200
@@ -1,0 +2,25 @@
+Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba
+
+- Upgrade to upstream milestone 0.9.0.M3
+ * Changes
+ + Annotate new method
+ + Update workflow to run on Java 21
+ + Build with final Java 21 on GitHub
+ + Switch to JUnit5
+ + Disable annotation processor by default
+ + Do not silently fail in case of class scanning exceptions
+ + Formatting issues
+ + Update to ASM 9.7
+ + Update CONTRIBUTING.md
+ + Align Plexus ASM version
+ + Rename release profile
+ + Fix Jacoco coverage repots in Sonar
+ + Add a method to allow LifecycleManager to free keys
+ + Licence change: From EPL1 to EPL2
+ + update documentation for exposed core extensions, fix anchors
+ + Trigger Sonarcloud analysis from GHA
+- Build sisu-mojos as a second spec within sisu package, since the
+ sources of sisu-mojos, sisu-inject and sisu-plexus were joined in
+ the same upstream project
+
+-------------------------------------------------------------------
Old:
----
sisu-inject-0.9.0.M2.tar.gz
sisu-plexus-0.9.0.M2.tar.gz
New:
----
_multibuild
sisu-mojos.changes
sisu-mojos.spec
sisu-project-0.9.0.M3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sisu-mojos.spec ++++++
#
# spec file for package sisu-mojos
#
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global reltype milestones
Name: sisu-mojos
Version: 0.9.0.M3
Release: 0
Summary: Sisu plugin for Apache Maven
License: EPL-1.0 AND EPL-2.0
Group: Development/Libraries/Java
URL: https://www.eclipse.org/sisu
Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-project-%{version}.tar.gz
Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch
Patch3: sisu-osgi-api.patch
Patch4: sisu-reproducible-index.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) >= %{version}
BuildRequires: mvn(org.slf4j:slf4j-nop)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
#!BuildIgnore: maven-javadoc-plugin
#!BuildIgnore: maven-javadoc-plugin-bootstrap
BuildArch: noarch
%description
The Sisu Plugin for Maven provides mojos to generate
META-INF/sisu/javax.inject.Named index files for the Sisu container.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
This package contains %{summary}.
%prep
%setup -q -n sisu-project-%{reltype}-%{version}
%patch -P 1 -p1
%patch -P 3 -p1
%patch -P 4 -p2
%pom_remove_plugin -r :maven-enforcer-plugin
# it is scope "import" but used only for tests that we don't run
%pom_remove_dep :junit-bom
pushd org.eclipse.sisu.mojos
%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:%{version}
%pom_add_plugin org.apache.maven.plugins:maven-resources-plugin:3.3.1
%{mvn_alias} : org.sonatype.plugins:
popd
%build
pushd org.eclipse.sisu.mojos
%{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
popd
%install
pushd org.eclipse.sisu.mojos
%mvn_install
popd
%fdupes -s %{buildroot}%{_javadocdir}
%files -f org.eclipse.sisu.mojos/.mfiles
%dir %{_javadir}/%{name}
%license LICENSE.txt
%files javadoc -f org.eclipse.sisu.mojos/.mfiles-javadoc
%license LICENSE.txt
%changelog
++++++ sisu.spec ++++++
--- /var/tmp/diff_new_pack.SR24Tf/_old 2024-06-06 12:33:23.910179428 +0200
+++ /var/tmp/diff_new_pack.SR24Tf/_new 2024-06-06 12:33:23.914179573 +0200
@@ -18,19 +18,17 @@
%global reltype milestones
Name: sisu
-Version: 0.9.0.M2
+Version: 0.9.0.M3
Release: 0
Summary: Eclipse dependency injection framework
-# sisu is EPL-1.0, bundled asm is BSD
-License: BSD-3-Clause AND EPL-1.0
+License: BSD-3-Clause AND EPL-1.0 AND EPL-2.0
Group: Development/Libraries/Java
URL: https://www.eclipse.org/sisu/
-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
-Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch
-Patch3: %{name}-osgi-api.patch
-Patch4: %{name}-reproducible-index.patch
+Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-project-%{version}.tar.gz
+Source1: %{name}-build.tar.xz
+Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch
+Patch3: sisu-osgi-api.patch
+Patch4: sisu-reproducible-index.patch
BuildRequires: ant
BuildRequires: atinject
BuildRequires: cdi-api
@@ -82,14 +80,11 @@
This package contains %{summary}.
%prep
-%setup -q -c -T
-tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject
-tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus
-tar xf %{SOURCE2}
-
-%patch -P 1
-%patch -P 3
-%patch -P 4 -p1
+%setup -q -n sisu-project-%{reltype}-%{version} -a1
+
+%patch -P 1 -p1
+%patch -P 3 -p1
+%patch -P 4 -p2
%build
mkdir -p lib
@@ -112,9 +107,9 @@
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}
-install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \
+install -pm 0644 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 \
+install -pm 0644 org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \
%{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar
# Compatibility symlink
install -dm 0755 %{buildroot}%{_javadir}/plexus-containers
@@ -122,25 +117,25 @@
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
+%{mvn_install_pom} 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/org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom
+%{mvn_install_pom} 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,org.codehaus.plexus:plexus-container-default
# javadoc
for i in inject plexus; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
- cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
+ cp -pr org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
%fdupes -s %{buildroot}%{_javadocdir}
%files inject -f .mfiles-inject
-%license sisu-inject/LICENSE.txt
+%license LICENSE.txt
%files plexus -f .mfiles-plexus
%{_javadir}/plexus-containers
%files javadoc
-%license sisu-inject/LICENSE.txt
+%license LICENSE.txt
%{_javadocdir}/%{name}
++++++ _multibuild ++++++
<multibuild>
<package>sisu-mojos</package>
</multibuild>
++++++ sisu-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml
--- old/build.xml 2024-04-09 17:46:50.654367287 +0200
+++ new/build.xml 2024-06-05 15:33:11.697277689 +0200
@@ -7,8 +7,8 @@
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
- <ant antfile="build.xml" dir="sisu-inject" target="clean"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="clean"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="clean"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="clean"/>
</target>
<!-- ====================================================================== -->
@@ -16,8 +16,8 @@
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
- <ant antfile="build.xml" dir="sisu-inject" target="compile"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="compile"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile"/>
</target>
<!-- ====================================================================== -->
@@ -25,8 +25,8 @@
<!-- ====================================================================== -->
<target name="compile-tests" description="Compile the test code">
- <ant antfile="build.xml" dir="sisu-inject" target="compile-tests"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="compile-tests"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile-tests"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile-tests"/>
</target>
<!-- ====================================================================== -->
@@ -34,8 +34,8 @@
<!-- ====================================================================== -->
<target name="test" description="Run the test cases">
- <ant antfile="build.xml" dir="sisu-inject" target="test"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="test"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="test"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="test"/>
</target>
<!-- ====================================================================== -->
@@ -43,8 +43,8 @@
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
- <ant antfile="build.xml" dir="sisu-inject" target="javadoc"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="javadoc"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="javadoc"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="javadoc"/>
</target>
<!-- ====================================================================== -->
@@ -52,8 +52,8 @@
<!-- ====================================================================== -->
<target name="package" description="Package the application">
- <ant antfile="build.xml" dir="sisu-inject" target="package"/>
- <ant antfile="build.xml" dir="sisu-plexus" target="package"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="package"/>
+ <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="package"/>
</target>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2024-04-09 17:34:54.783027925 +0200
+++ new/common.xml 2024-06-05 15:37:08.972511687 +0200
@@ -3,7 +3,7 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="0.9.0.M2"/>
+ <property name="project.version" value="0.9.0.M3"/>
<property name="project.groupId" value="org.eclipse.sisu"/>
<property name="compiler.release" value="8"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.eclipse.sisu.inject/build.xml new/org.eclipse.sisu.inject/build.xml
--- old/org.eclipse.sisu.inject/build.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/org.eclipse.sisu.inject/build.xml 2024-06-05 15:36:13.988737899 +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}"/>
+
+ <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">
+
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile" description="Package the application">
+
+ <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/org.eclipse.sisu.inject.extender/build.xml new/org.eclipse.sisu.inject.extender/build.xml
--- old/org.eclipse.sisu.inject.extender/build.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/org.eclipse.sisu.inject.extender/build.xml 2024-06-05 15:36:04.421994607 +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}"/>
+
+ <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">
+
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile" description="Package the application">
+
+ <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/org.eclipse.sisu.plexus/build.xml new/org.eclipse.sisu.plexus/build.xml
--- old/org.eclipse.sisu.plexus/build.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/org.eclipse.sisu.plexus/build.xml 2024-06-05 17:03:16.527214900 +0200
@@ -0,0 +1,154 @@
+<?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="../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}"/>
+
+ <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>
+
+ <!-- ====================================================================== -->
+ <!-- Sisu javax.inject.Named generation target -->
+ <!-- ====================================================================== -->
+
+
+ <sequential>
+
+ <classpath>
+ <path refid="build.classpath"/>
+ </classpath>
+ <arg value="${build.outputDir}"/>
+ </java>
+ <move todir="${build.outputDir}/META-INF">
+ <fileset dir="META-INF"/>
+ </move>
+ </sequential>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="sisu" description="Package the application">
+
+ <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/org.eclipse.sisu.plexus.extender/build.xml new/org.eclipse.sisu.plexus.extender/build.xml
--- old/org.eclipse.sisu.plexus.extender/build.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/org.eclipse.sisu.plexus.extender/build.xml 2024-06-05 15:52:09.396393495 +0200
@@ -0,0 +1,130 @@
+<?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">
+ <pathelement location="../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}"/>
+
+ <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">
+
+ <classpath refid="build.classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile" description="Package the application">
+
+ <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>
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 2024-04-09 20:20:18.358159676 +0200
+++ new/sisu-inject/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="sisu-inject" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="clean"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests" description="Compile the test code">
- <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile-tests"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test" description="Run the test cases">
- <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="test"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="javadoc"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <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 2024-04-09 18:15:02.218485182 +0200
+++ new/sisu-inject/org.eclipse.sisu.inject/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,139 +0,0 @@
-<?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}"/>
-
- <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">
-
- <classpath refid="build.classpath"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile" description="Package the application">
-
- <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 2024-04-09 17:45:14.000000000 +0200
+++ new/sisu-inject/org.eclipse.sisu.inject.extender/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-<?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}"/>
-
- <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">
-
- <classpath refid="build.classpath"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile" description="Package the application">
-
- <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 2024-04-09 20:24:44.799928892 +0200
+++ new/sisu-plexus/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="sisu-plexus" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="clean"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests" description="Compile the test code">
- <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile-tests"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test" description="Run the test cases">
- <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="test"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="javadoc"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <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 2024-04-09 20:04:19.261791554 +0200
+++ new/sisu-plexus/org.eclipse.sisu.plexus/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-<?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}"/>
-
- <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">
-
- <classpath refid="build.classpath"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile" description="Package the application">
-
- <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 2024-04-09 18:08:00.000000000 +0200
+++ new/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-<?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}"/>
-
- <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">
-
- <classpath refid="build.classpath"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile" description="Package the application">
-
- <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>
