Merge branch 'release/1.0.5-M4' into develop
This commit is contained in:
commit
bd9d84b92f
10
pom.xml
10
pom.xml
|
@ -4,7 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.xerial.snappy</groupId>
|
<groupId>org.xerial.snappy</groupId>
|
||||||
<artifactId>snappy-java</artifactId>
|
<artifactId>snappy-java</artifactId>
|
||||||
<version>1.0.5-M4-SNAPSHOT</version>
|
<version>1.0.5-M4</version>
|
||||||
<name>Snappy for Java</name>
|
<name>Snappy for Java</name>
|
||||||
<description>snappy-java: A fast compression/decompression library</description>
|
<description>snappy-java: A fast compression/decompression library</description>
|
||||||
<packaging>bundle</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
@ -145,7 +145,6 @@
|
||||||
<charset>UTF-8</charset>
|
<charset>UTF-8</charset>
|
||||||
<locale>en_US</locale>
|
<locale>en_US</locale>
|
||||||
<show>public</show>
|
<show>public</show>
|
||||||
<stylesheetfile>stylesheet.css</stylesheetfile>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
@ -173,10 +172,10 @@
|
||||||
<version>2.3.7</version>
|
<version>2.3.7</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<manifestLocation>META-INF</manifestLocation>
|
<manifestLocation>${project.build.directory}/META-INF</manifestLocation>
|
||||||
<instructions>
|
<instructions>
|
||||||
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
||||||
<Bundle-Name>${pproject.name}</Bundle-Name>
|
<Bundle-Name>${project.name}</Bundle-Name>
|
||||||
<Bundle-Version>${project.version}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Activator>org.xerial.snappy.SnappyBundleActivator</Bundle-Activator>
|
<Bundle-Activator>org.xerial.snappy.SnappyBundleActivator</Bundle-Activator>
|
||||||
<Export-Package>org.xerial.snappy</Export-Package>
|
<Export-Package>org.xerial.snappy</Export-Package>
|
||||||
|
@ -208,10 +207,11 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>2.4</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<index>true</index>
|
<index>true</index>
|
||||||
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.directory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
Loading…
Reference in New Issue