META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Built-By: paul
-Build-Jdk: 1.7.0_09
-

debian/changelog

+libpicocontainer-java (2.15+repack-1) unstable; urgency=medium
+
+  * Team upload.
+  * Rebuilt the upstream tarball from the GitHub project
+    instead of the source artifact in Maven Central
+  * Build with maven-debian-helper instead of javahelper
+  * Standards-Version updated to 4.3.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 01 Mar 2019 21:57:56 +0100
+
 libpicocontainer-java (2.15-4) unstable; urgency=medium
 
   * Remove build-dependency on libactivation-java again.

debian/clean

+dependency-reduced-pom.xml
+src/main

debian/control

@@ -8,24 +8,20 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
- javahelper,
  libgeronimo-annotation-1.3-spec-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-shade-plugin-java,
  libparanamer-java,
- maven-repo-helper (>= 1.6~)
-Standards-Version: 4.2.1
+ maven-debian-helper (>= 2.0)
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/libpicocontainer-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libpicocontainer-java
 Homepage: http://picocontainer.com
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libpicocontainer-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libpicocontainer-java.git
 
 Package: libpicocontainer-java
 Architecture: all
-Depends:
- ${java:Depends},
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Suggests:
- libpicocontainer-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: libpicocontainer-java-doc, ${maven:OptionalDepends}
 Description: Java library implementing the Dependency Injection pattern
  PicoContainer is a highly embeddable full service Inversion of Control (IoC)
  container for components that honour the Dependency Injection pattern. It can
@@ -39,11 +35,8 @@ Description: Java library implementing the Dependency Injection pattern
 Package: libpicocontainer-java-doc
 Section: doc
 Architecture: all
-Depends:
- ${misc:Depends}
-Recommends:
- default-jdk-doc,
- ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: default-jdk-doc, ${maven:DocOptionalDepends}
 Description: Java library implementing the Dependency Injection pattern -- docs
  PicoContainer is a highly embeddable full service Inversion of Control (IoC)
  container for components that honour the Dependency Injection pattern.

debian/libpicocontainer-java-doc.doc-base

+Document: libpicocontainer-java-doc
+Title: API Javadoc for picontainer
+Author: picocontainer developers
+Abstract: This is the API Javadoc provided by the picocontainer library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libpicocontainer-java/api/index.html
+Files: /usr/share/doc/libpicocontainer-java/api/*
+

debian/libpicocontainer-java-doc.install

+target/apidocs/* /usr/share/doc/libpicocontainer-java/api/

debian/libpicocontainer-java-doc.javadoc

-internal

debian/libpicocontainer-java.jlibs

-picocontainer-2.15.jar

debian/libpicocontainer-java.poms

-debian/pom.xml --no-parent --usj-name=picocontainer
+pom.xml --no-parent

debian/maven.ignoreRules

+com.thoughtworks.paranamer paranamer-maven-plugin

debian/maven.properties

+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true

debian/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>picocontainer-parent</artifactId>
-    <groupId>org.picocontainer</groupId>
-    <version>2.15</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>picocontainer</artifactId>
-  <name>PicoContainer Core</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.thoughtworks.paranamer</groupId>
-        <artifactId>paranamer-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <executions>
-          <execution>
-            <id>generate</id>
-            <phase>test</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sourceDirectory>src/test</sourceDirectory>
-          <outputDirectory>target/test-classes</outputDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <shadedArtifactId>picocontainer</shadedArtifactId>
-              <artifactSet>
-                <excludes>
-                  <exclude>javax.annotation:jsr250-api</exclude>
-                  <exclude>javax.inject:javax.inject</exclude>
-                </excludes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>com.thoughtworks.paranamer:paranamer</artifact>
-                  <excludes>
-                    <exclude>com/thoughtworks/paranamer/Javadoc*</exclude>
-                    <exclude>com/thoughtworks/paranamer/Null*</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <relocations>
-                <relocation>
-                  <pattern>com.thoughtworks.paranamer</pattern>
-                  <shadedPattern>org.picocontainer.paranamer</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <version>2.5.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>jmock</artifactId>
-          <groupId>org.jmock</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>junit-dep</artifactId>
-          <groupId>junit</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.3</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xmlpull</artifactId>
-          <groupId>xmlpull</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3_min</artifactId>
-      <version>1.1.3.4.O</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
-

debian/rules

 #!/usr/bin/make -f
-# export DH_VERBOSE=1
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/paranamer.jar:/usr/share/java/geronimo-annotation-1.3-spec.jar
 
 %:
-	dh $@ --with javahelper,jh_maven_repo_helper
+	dh $@
 
 override_dh_auto_build:
-	jh_build --javadoc picocontainer-$(VER).jar org
-
-override_dh_auto_clean:
-	dh_auto_clean
-	$(RM) picocontainer-*.jar
+	ln -s -f . src/main
+	dh_auto_build
 
 get-orig-source:
-	uscan --verbose --repack --compression xz --force-download
-
-get-orig-pom:
-	wget -O debian/pom.xml \
-	http://repo1.maven.org/maven2/org/picocontainer/picocontainer/$(VER)/picocontainer-$(VER).pom
+	# todo: build from the GitHub repository (no tag available unfortunately)
+	# https://github.com/picocontainer/PicoContainer2/tree/master/pico/container

debian/watch

 version=3
+# todo: watch the tags on the GitHub repository
 http://repo1.maven.org/maven2/org/picocontainer/picocontainer/(\d.*)/\
  picocontainer-(\d.*)-sources\.jar

pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.picocontainer</groupId>
+        <artifactId>picocontainer-parent</artifactId>
+        <version>2.15.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>picocontainer</artifactId>
+    <name>PicoContainer Core</name>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>com.thoughtworks.paranamer</groupId>
+            <artifactId>paranamer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.thoughtworks.paranamer</groupId>
+                <artifactId>paranamer-maven-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <sourceDirectory>src/test</sourceDirectory>
+                    <outputDirectory>target/test-classes</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <id>generate</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactId>picocontainer</shadedArtifactId>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>javax.annotation:jsr250-api</exclude>
+                                    <exclude>javax.inject:javax.inject</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.thoughtworks.paranamer:paranamer</artifact>
+                                    <excludes>
+                                        <exclude>com/thoughtworks/paranamer/Javadoc*</exclude>
+                                        <exclude>com/thoughtworks/paranamer/Null*</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.thoughtworks.paranamer</pattern>
+                                    <shadedPattern>org.picocontainer.paranamer</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file