debian/changelog

+sisu-inject (0.3.3-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+  * Updated the watch file
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 15 Feb 2019 23:49:43 +0100
+
 sisu-inject (0.3.2-3) unstable; urgency=medium
 
   * Depend on libgeronimo-annotation-1.3-spec-java instead of libtomcat8-java

debian/control

@@ -3,20 +3,21 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
  junit4,
  libbuild-helper-maven-plugin-java,
  libcdi-api-java,
+ libgeronimo-annotation-1.3-spec-java,
  libguice-java,
  liblogback-java,
  libosgi-core-java (>= 6.0),
  libservlet3.1-java,
  libslf4j-java,
-               libgeronimo-annotation-1.3-spec-java,
  maven-debian-helper (>= 1.5),
  testng
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/sisu-inject.git
 Vcs-Browser: https://salsa.debian.org/java-team/sisu-inject
 Homepage: http://www.eclipse.org/sisu/

debian/orig-tar.sh

@@ -7,5 +7,5 @@ mkdir $DIR
 tar -xf $3 --strip 2 -C $DIR
 rm $3
 
-XZ_OPT=--best tar -cJvf $TAR --exclude '.gitignore' --exclude 'doclava-style' --exclude 'leftovers' --exclude 'bin' $DIR
+XZ_OPT=--best tar -cJvf $TAR --exclude '.gitignore' --exclude 'doclava' --exclude 'leftovers' --exclude 'bin' $DIR
 rm -Rf $DIR

debian/patches/01-drop-maven3-prereq.patch

-Description: Remove the prerequisite on Maven 3 to be able to build with Maven 2
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -58,10 +58,6 @@
-     </mailingList>
-   </mailingLists>
- 
--  <prerequisites>
--    <maven>3.0.4</maven>
--  </prerequisites>
--
-   <modules>
-     <module>org.eclipse.sisu.inject</module>
-     <module>org.eclipse.sisu.inject.extender</module>

debian/patches/series

-01-drop-maven3-prereq.patch
 02-change-packaging-type.patch
 03-add-missing-dependencies.patch
 05-guice-dependency.patch

debian/watch

 version=3
-http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/refs/ .*/(?:milestones|releases)/(.*).tar.gz debian debian/orig-tar.sh
+http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/refs/ .*releases/(.*).tar.gz debian debian/orig-tar.sh

doclava/assets/customizations.css

-#header {
-  background-color: #686884;
-  border-bottom: 3px solid #686884;
-}
-#masthead-title {
-  font-family: courier, monospace;
-  color: #FFFFFF;
-}
-#search_filtered .jd-selected {
-  background-color: #686884;
-}
-#search_filtered_div {
-  border: 1px solid #686884;
-}
-input.gsc-input {
-  border: 1px solid #D8D8E2;
-}
-#resize-packages-nav {
-  height: 225px;
-}
-#packages-nav {
-  height: 225px;
-}
-#side-nav .selected {
-  background-color: #686884;
-}
-#index-links .selected {
-  background-color: #FFFFFF;
-}
-#jd-header {
-  background-color: #D8D8E2;
-}
-th {
-  background-color: #D8D8E2;
-}
-tr.alt-color {
-  background-color: #F0F0F5 !important;
-}
-a, a:link, a code, a:link code {
-  color: #558;
-}
-a:active, a:active code {
-  color: #558;
-} 
-a:visited, a:visited code {
-  color: #558;
-}
-#jd-content h1 {
-  color:#111;
-}
-#jd-content h2 {
-  color:#111;
-}
-#jd-content h3 {
-  color:#111;
-}
-#searchForm {
-  width:210px;
-}

doclava/components/left_nav.cs

-<?cs # The default side navigation for the reference docs ?><?cs 
-def:custom_left_nav() ?>
-  <div class="g-section g-tpl-240" id="body-content">
-    <div class="g-unit g-first side-nav-resizable" id="side-nav">
-      <div id="swapper">
-        <div id="nav-panels">
-          <div id="resize-packages-nav">
-            <div id="packages-nav">
-              <div id="index-links">
-                <a href="<?cs var:toroot ?>packages.html" <?cs if:(page.title == "Package Index") ?>class="selected"<?cs /if ?> >Package Index</a> | 
-                <a href="<?cs var:toroot ?>classes.html" <?cs if:(page.title == "Class Index") ?>class="selected"<?cs /if ?>>Class Index</a>
-              </div>
-              <ul>
-                <?cs call:package_link_list(docs.packages) ?>
-              </ul><br/>
-            </div> <!-- end packages -->
-          </div> <!-- end resize-packages -->
-          <div id="classes-nav"><?cs 
-            if:subcount(class.package) ?>
-            <ul>
-              <?cs call:list("Interfaces", class.package.interfaces) ?>
-              <?cs call:list("Classes", class.package.classes) ?>
-              <?cs call:list("Annotations", class.package.annotations) ?>
-              <?cs call:list("Enums", class.package.enums) ?>
-              <?cs call:list("Exceptions", class.package.exceptions) ?>
-              <?cs call:list("Errors", class.package.errors) ?>
-            </ul><?cs 
-            elif:subcount(package) ?>
-            <ul>
-              <?cs call:class_link_list("Interfaces", package.interfaces) ?>
-              <?cs call:class_link_list("Classes", package.classes) ?>
-              <?cs call:class_link_list("Annotations", package.annotations) ?>
-              <?cs call:class_link_list("Enums", package.enums) ?>
-              <?cs call:class_link_list("Exceptions", package.exceptions) ?>
-              <?cs call:class_link_list("Errors", package.errors) ?>
-            </ul><?cs 
-            else ?>
-              <script>
-                /*addLoadEvent(maxPackageHeight);*/
-              </script>
-              <p style="padding:10px">Select a package to view its members</p><?cs 
-            /if ?><br/>
-          </div><!-- end classes -->
-        </div><!-- end nav-panels -->
-        <div id="nav-tree" style="display:none">
-          <div id="index-links">
-            <a href="<?cs var:toroot ?>packages.html" <?cs if:(page.title == "Package Index") ?>class="selected"<?cs /if ?> >Package Index</a> | 
-            <a href="<?cs var:toroot ?>classes.html" <?cs if:(page.title == "Class Index") ?>class="selected"<?cs /if ?>>Class Index</a>
-          </div>
-        </div><!-- end nav-tree -->
-      </div><!-- end swapper -->
-    </div> <!-- end side-nav -->
-    <script>
-      if (!isMobile) {
-        <!-- $("<a href='#' id='nav-swap' onclick='swapNav();return false;' style='font-size:10px;line-height:9px;margin-left:1em;text-decoration:none;'><span id='tree-link'>Use Tree Navigation</span><span id='panel-link' style='display:none'>Use Panel Navigation</span></a>").appendTo("#side-nav"); -->
-        chooseDefaultNav();
-        if ($("#nav-tree").is(':visible')) {
-          init_default_navtree("<?cs var:toroot ?>");
-        } else {
-          addLoadEvent(function() {
-            scrollIntoView("packages-nav");
-            scrollIntoView("classes-nav");
-          });
-        }
-        $("#swapper").css({borderBottom:"2px solid #aaa"});
-      } else {
-        swapNav(); // tree view should be used on mobile
-      }
-    </script><?cs 
-/def ?>

doclava/head_tag.cs

-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<?cs if:project.name ?>
-  <meta name="description" content="Javadoc API documentation for <?cs var:project.name ?>." />
-<?cs else ?>
-  <meta name="description" content="Javadoc API documentation." />
-<?cs /if ?>
-<!-- <link rel="shortcut icon" type="image/x-icon" href="<?cs var:toroot ?>favicon.ico" /> -->
-<title>
-<?cs if:page.title ?>
-  <?cs var:page.title ?>
-<?cs /if ?>
-<?cs if:project.name ?>
-| <?cs var:project.name ?>
-<?cs /if ?>
-</title>
-<link href="<?cs var:toassets ?>doclava-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="<?cs var:toassets ?>customizations.css" rel="stylesheet" type="text/css" />
-<script src="<?cs var:toassets ?>search_autocomplete.js" type="text/javascript"></script>
-<script src="<?cs var:toassets ?>jquery-resizable.min.js" type="text/javascript"></script>
-<script src="<?cs var:toassets ?>doclava-developer-docs.js" type="text/javascript"></script>
-<script src="<?cs var:toassets ?>prettify.js" type="text/javascript"></script>
-<script type="text/javascript">
-  setToRoot("<?cs var:toroot ?>", "<?cs var:toassets ?>");
-</script><?cs 
-if:reference ?>
-<script src="<?cs var:toassets ?>doclava-developer-reference.js" type="text/javascript"></script>
-<script src="<?cs var:toassets ?>navtree_data.js" type="text/javascript"></script><?cs 
-/if ?>
-<script src="<?cs var:toassets ?>customizations.js" type="text/javascript"></script>
-<noscript>
-  <style type="text/css">
-    html,body{overflow:auto;}
-    #body-content{position:relative; top:0;}
-    #doc-content{overflow:visible;border-left:3px solid #666;}
-    #side-nav{padding:0;}
-    #side-nav .toggle-list ul {display:block;}
-    #resize-packages-nav{border-bottom:3px solid #666;}
-  </style>
-</noscript>
-</head>

doclava/package.cs

-<?cs include:"doctype.cs" ?>
-<?cs include:"macros.cs" ?>
-<html>
-<?cs include:"head_tag.cs" ?>
-<body class="<?cs var:package.since.key ?>">
-<?cs include:"header.cs" ?>
-
-<div class="g-unit" id="doc-content">
-
-<div id="api-info-block">
-<div class="api-level">
-  <?cs call:since_tags(package) ?>
-  <?cs call:federated_refs(package) ?>
-</div>
-</div>
-
-<div id="jd-header">
-  package
-  <h1><?cs var:package.name ?></h1>
-</div><!-- end header -->
-
-<div id="naMessage"></div>
-
-<div id="jd-content" class="api apilevel-<?cs var:package.since.key ?>">
-
-<?cs if:subcount(package.descr) ?>
-  <div class="jd-descr">
-    <?cs call:tag_list(package.descr) ?>
-  </div>
-<?cs /if ?>
-
-<?cs def:class_table(label, classes) ?>
-  <?cs if:subcount(classes) ?>
-    <h2><?cs var:label ?></h2>
-    <div class="jd-sumtable">
-    <?cs call:class_link_table(classes) ?>
-    </div>
-  <?cs /if ?>
-<?cs /def ?>
-
-<?cs call:class_table("Interfaces", package.interfaces) ?>
-<?cs call:class_table("Classes", package.classes) ?>
-<?cs call:class_table("Annotations", package.annotations) ?>
-<?cs call:class_table("Enums", package.enums) ?>
-<?cs call:class_table("Exceptions", package.exceptions) ?>
-<?cs call:class_table("Errors", package.errors) ?>
-
-<?cs include:"footer.cs" ?>
-</div><!-- end jd-content -->
-</div><!-- doc-content -->
-
-<?cs include:"trailer.cs" ?>
-
-</body>
-</html>

doclava/packages.cs

-<?cs include:"doctype.cs" ?>
-<?cs include:"macros.cs" ?>
-<html>
-<?cs include:"head_tag.cs" ?>
-<body class="gc-documentation">
-<?cs include:"header.cs" ?>
-
-<div class="g-unit" id="doc-content">
-
-<div id="jd-header">
-<h1><?cs var:page.title ?></h1>
-</div>
-
-<div id="jd-content">
-
-<div class="jd-descr">
-<?cs call:tag_list(root.descr) ?>
-</div>
-
-<?cs set:count = #1 ?>
-<table class="jd-sumtable">
-<?cs each:pkg = docs.packages ?>
-    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:pkg.since.key ?>" >
-        <td class="jd-linkcol"><?cs call:package_link(pkg) ?></td>
-        <td class="jd-descrcol" width="100%"><?cs call:tag_list(pkg.shortDescr) ?></td>
-    </tr>
-<?cs set:count = count + #1 ?>
-<?cs /each ?>
-</table>
-
-<?cs include:"footer.cs" ?>
-</div><!-- end jd-content -->
-</div> <!-- end doc-content -->
-
-<?cs include:"trailer.cs" ?>
-
-</body>
-</html>

org.eclipse.sisu.inject.extender/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.sisu.inject.extender;singleton:=true
-Bundle-Version: 0.3.2
+Bundle-Version: 0.3.3
 Bundle-Name: Sisu-Inject Extender (Incubation)
 Bundle-Activator: org.eclipse.sisu.launch.SisuExtender
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

org.eclipse.sisu.inject.extender/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.sisu</groupId>
     <artifactId>sisu-inject</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
   </parent>
 
   <artifactId>org.eclipse.sisu.inject.extender</artifactId>

org.eclipse.sisu.inject.site/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.sisu</groupId>
     <artifactId>sisu-inject</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
   </parent>
 
   <artifactId>org.eclipse.sisu.inject.site</artifactId>

org.eclipse.sisu.inject.tests/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.sisu</groupId>
     <artifactId>sisu-inject</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
   </parent>
 
   <artifactId>org.eclipse.sisu.inject.tests</artifactId>

org.eclipse.sisu.inject/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Main-Class: org.eclipse.sisu.launch.Main
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.sisu.inject;singleton:=true
-Bundle-Version: 0.3.2
+Bundle-Version: 0.3.3
 Bundle-Name: Sisu-Inject (Incubation)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Sisu

org.eclipse.sisu.inject/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.sisu</groupId>
     <artifactId>sisu-inject</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
   </parent>
 
   <artifactId>org.eclipse.sisu.inject</artifactId>

org.eclipse.sisu.inject/src/org/eclipse/sisu/bean/BeanLifecycle.java

@@ -87,6 +87,8 @@ final class BeanLifecycle
      */
     public void start( final Object bean )
     {
+        Logs.trace( "PostConstruct: <>", bean, null );
+
         // start superclass before subclass, bail out at the first failure
         int i = startMethods.length - 1;
         try
@@ -119,6 +121,8 @@ final class BeanLifecycle
     @SuppressWarnings( "finally" )
     public void stop( final Object bean )
     {
+        Logs.trace( "PreDestroy: <>", bean, null );
+
         // stop subclass before superclass, log any failures along the way
         for ( int i = 0; i < stopMethods.length; i++ )
         {