[snappy-java] 04/06: New upstream release (1.1.1.6)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Nov 26 08:58:25 GMT 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository snappy-java.
commit 487eb3b5ff4951a5adb65ce616beaeff2674c64e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 26 01:17:49 2014 +0100
New upstream release (1.1.1.6)
---
debian/changelog | 3 +-
debian/libsnappy-java.poms | 2 +-
debian/maven.ignoreRules | 2 +
debian/patches/01-load-library.patch | 19 +-
debian/pom.xml | 341 +++++++++++++++++++++++++++++++++++
debian/rules | 12 +-
6 files changed, 364 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f2175d0..afd9846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-snappy-java (1.0.4.1~dfsg-2) UNRELEASED; urgency=low
+snappy-java (1.1.1.6-1) UNRELEASED; urgency=low
* Team upload.
+ * New upstream release
* Build and install the JNI bindings in libsnappy-jni (Closes: #734599)
- Removed the patches modifying the unused Makefile
- Removed the unused build dependency on xml-twig-tools
diff --git a/debian/libsnappy-java.poms b/debian/libsnappy-java.poms
index 1d885c3..64b1188 100644
--- a/debian/libsnappy-java.poms
+++ b/debian/libsnappy-java.poms
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --has-package-version --java-lib
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index d75bacf..757cba9 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,6 +16,8 @@
junit junit * * * *
org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-gpg-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
diff --git a/debian/patches/01-load-library.patch b/debian/patches/01-load-library.patch
index 6829bde..3dd06d5 100644
--- a/debian/patches/01-load-library.patch
+++ b/debian/patches/01-load-library.patch
@@ -3,17 +3,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/src/main/java/org/xerial/snappy/SnappyLoader.java
+++ b/src/main/java/org/xerial/snappy/SnappyLoader.java
-@@ -212,12 +212,7 @@
- return api;
+@@ -259,7 +259,7 @@
- try {
-- if (!hasInjectedNativeLoader()) {
-- // Inject SnappyNativeLoader (src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode) to the root class loader
-- Class< ? > nativeLoader = injectSnappyNativeLoader();
-- // Load the JNI code using the injected loader
-- loadNativeLibrary(nativeLoader);
-- }
-+ System.loadLibrary("snappyjava");
+ static File findNativeLibrary() {
- isLoaded = true;
- // Look up SnappyNative, injected to the root classloder, using reflection in order to avoid the initialization of SnappyNative class in this context class loader.
+- boolean useSystemLib = Boolean.parseBoolean(System.getProperty(KEY_SNAPPY_USE_SYSTEMLIB, "false"));
++ boolean useSystemLib = Boolean.parseBoolean(System.getProperty(KEY_SNAPPY_USE_SYSTEMLIB, "true"));
+ boolean disabledBundledLibs = Boolean
+ .parseBoolean(System.getProperty(KEY_SNAPPY_DISABLE_BUNDLED_LIBS, "false"));
+ if (useSystemLib || disabledBundledLibs)
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..d15a652
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,341 @@
+<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>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>%VERSION%</version>
+ <name>Snappy for Java</name>
+ <description>snappy-java: A fast compression/decompression library</description>
+ <packaging>bundle</packaging>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>leo</id>
+ <name>Taro L. Saito</name>
+ <email>leo at xerial.org</email>
+ <organization>Xerial Project</organization>
+ <roles>
+ <role>Architect</role>
+ <role>Project Manager</role>
+ <role>Chief Developer</role>
+ </roles>
+ <timezone>+9</timezone>
+ </developer>
+ </developers>
+
+ <organization>
+ <name>xerial.org</name>
+ <url>http://www.xerial.org/</url>
+ </organization>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>org/xerial/snappy/VERSION</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>org/xerial/snappy/*.bytecode</include>
+ <include>org/xerial/snappy/native/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF/maven/${project.groupId}/${project.artifactId}</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <!-- do not run site-deploy goal, included in the default settings -->
+ <goals>deploy</goals>
+ <pushChanges>false</pushChanges>
+ <localCheckout>true</localCheckout>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <useAgent>true</useAgent>
+ </configuration>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <charset>UTF-8</charset>
+ <locale>en_US</locale>
+ <show>public</show>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <configuration>
+ <excludeResources>true</excludeResources>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-Activator>org.xerial.snappy.SnappyBundleActivator</Bundle-Activator>
+ <Export-Package>org.xerial.snappy</Export-Package>
+ <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <!--
+ <Bundle-NativeCode>
+ org/xerial/snappy/native/Windows/amd64/snappyjava.dll;selection-filter="(&(osgi.arch=x86_64)(osgi.os=win32))",
+ org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&(osgi.arch=x86)(osgi.os=win32))",
+ org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;selection-filter="(&(osgi.arch=x86)(osgi.os=macosx))",
+ org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&(osgi.arch=x86_64)(osgi.os=macosx))",
+ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;selection-filter="(&(osgi.arch=x86_64)(osgi.os=linux))",
+ org/xerial/snappy/native/Linux/i386/libsnappyjava.so;selection-filter="(&(osgi.arch=x86)(osgi.os=linux))",
+ org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&(osgi.arch=arm)(osgi.os=linux))"
+ </Bundle-NativeCode>
+ -->
+ <!-- TODO: unsure about ARMHF -->
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifestFile>${project.build.directory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <followSymLinks>false</followSymLinks>
+ <filesets>
+ <fileset>
+ <directory>META-INF</directory>
+ <includes>
+ <include>MANIFEST.MF</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/project.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-7</version>
+ </extension>
+ </extensions>
+
+ </build>
+
+
+ <url>http://github.com/xerial/snappy-java/</url>
+ <issueManagement>
+ <system>GitHub</system>
+ <url>http://github.com/xerial/snappy-java/issues/list</url>
+ </issueManagement>
+ <inceptionYear>2011</inceptionYear>
+ <scm>
+ <connection>scm:git at github.com:xerial/snappy-java.git</connection>
+ <developerConnection>scm:git:git at github.com:xerial/snappy-java.git</developerConnection>
+ <url>git at github.com:xerial/snappy-java.git</url>
+ </scm>
+
+ <profiles>
+ <!-- for local updates -->
+ <profile>
+ <id>xerial.local</id>
+ <distributionManagement>
+ <repository>
+ <id>xerial.local</id>
+ <name>Xerial Maven Repository</name>
+ <url>file:///home/web/maven.xerial.org/repository/artifact</url>
+ </repository>
+ <snapshotRepository>
+ <id>xerial.local</id>
+ <name>Xerial Maven Snapshot Repository</name>
+ <url>file:///home/web/maven.xerial.org/repository/snapshot</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ <site>
+ <id>xerial.local</id>
+ <url>file:///home/web/maven.xerial.org/repository/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>core</artifactId>
+ <version>4.3.0</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>xerial-core</artifactId>
+ <version>1.0.21</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/debian/rules b/debian/rules
index 064f190..720c900 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
export JAVA_HOME := /usr/lib/jvm/default-java
-DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -9,6 +10,11 @@ include /usr/share/dpkg/buildflags.mk
%:
dh $@ --buildsystem=maven
+override_dh_auto_configure:
+ cp debian/pom.xml .
+ sed -i 's/%VERSION%/$(DEB_UPSTREAM_VERSION)/g' pom.xml
+ dh_auto_configure
+
override_dh_auto_build:
dh_auto_build
@@ -24,5 +30,9 @@ override_dh_auto_install:
dh_auto_install
dh_install -plibsnappy-jni target/*.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
+override_dh_auto_clean:
+ -dh_auto_clean
+ rm -f pom.xml
+
get-orig-source:
uscan --download-current-version --rename --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/snappy-java.git
More information about the pkg-java-commits
mailing list