Skip to content

Commit 75d34c5

Browse files
neilcsmith-netneilcsmith-net
authored
Merge pull request #71 from neilcsmith-net/master
Updates to POM and fixes for JNA building for first 0.9.0 release
2 parents 58b0e72 + 2a20b60 commit 75d34c5

File tree

3 files changed

+193
-197
lines changed

3 files changed

+193
-197
lines changed

‎pom.xml

+187-193
Original file line numberDiff line numberDiff line change
@@ -1,209 +1,203 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33

4-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<artifactId>oss-parent</artifactId>
8-
<groupId>org.sonatype.oss</groupId>
9-
<version>9</version>
10-
</parent>
6+
<groupId>org.freedesktop.gstreamer</groupId>
7+
<artifactId>gst1-java-core</artifactId>
8+
<version>0.9.0-SNAPSHOT</version>
9+
<packaging>jar</packaging>
1110

12-
<groupId>org.freedesktop.gstreamer</groupId>
13-
<artifactId>gst1-java-core</artifactId>
14-
<version>0.9-SNAPSHOT</version>
15-
<packaging>jar</packaging>
11+
<name>GStreamer 1.x Java Core</name>
12+
<description>Unofficial Java binding for the Gstreamer framework</description>
13+
<url>https://github.com/gstreamer-java/gst1-java-core</url>
1614

17-
<name>GStreamer 1.x Java Core</name>
18-
<description>Unofficial Java binding for the Gstreamer framework</description>
19-
<url>https://github.com/gstreamer-java/gst1-java-core</url>
15+
<organization>
16+
<name>gstreamer-java</name>
17+
<url>http://www.github.com/gstreamer-java</url>
18+
</organization>
2019

21-
<organization>
22-
<name>gstreamer-java</name>
23-
<url>http://www.github.com/gstreamer-java</url>
24-
</organization>
20+
<licenses>
21+
<license>
22+
<name>GNU Lesser General Public License</name>
23+
<url>http://www.gnu.org/licenses/lgpl.html</url>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
2527

26-
<licenses>
27-
<license>
28-
<name>GNU Lesser General Public License</name>
29-
<url>http://www.gnu.org/licenses/lgpl.html</url>
30-
<distribution>repo</distribution>
31-
</license>
32-
</licenses>
28+
<scm>
29+
<url>https://github.com/gstreamer-java/gst1-java-core</url>
30+
<connection>scm:git:https://github.com/gstreamer-java/gst1-java-core.git</connection>
31+
<developerConnection>scm:git:https://github.com/gstreamer-java/gst1-java-core.git</developerConnection>
32+
</scm>
33+
34+
<distributionManagement>
35+
<snapshotRepository>
36+
<id>ossrh</id>
37+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
38+
</snapshotRepository>
39+
<repository>
40+
<id>ossrh</id>
41+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
42+
</repository>
43+
</distributionManagement>
3344

34-
<scm>
35-
<url>[email protected]/gstreamer-java/gst1-java-core</url>
36-
<connection>scm:git:[email protected]/gstreamer-java/gst1-java-core</connection>
37-
<developerConnection>scm:git:[email protected]/gstreamer-java/gst1-java-core</developerConnection>
38-
</scm>
45+
<developers>
46+
<developer>
47+
<id>neilcsmith-net</id>
48+
<name>Neil C Smith</name>
49+
<email>neilcsmith.net[at]googlemail[dot]com</email>
50+
<roles>
51+
<role>lead maintainer</role>
52+
<role>developer</role>
53+
</roles>
54+
<url>http://www.neilcsmith.net</url>
55+
</developer>
56+
<developer>
57+
<id>wmeissner</id>
58+
<name>Wayne Meissner</name>
59+
<email>wmeissner[at]gmail[dot]com</email>
60+
<roles>
61+
<role>founder</role>
62+
<role>developer</role>
63+
</roles>
64+
</developer>
65+
<developer>
66+
<id>lfarkas</id>
67+
<name>Levante Farkas</name>
68+
<email>lfarkas[at]gmail[dot]com</email>
69+
<roles>
70+
<role>developer</role>
71+
</roles>
72+
</developer>
73+
<developer>
74+
<id>andres.colubri</id>
75+
<name>Andres Colubri</name>
76+
<email>andres.colubri[at]gmail[dot]com</email>
77+
<roles>
78+
<role>developer</role>
79+
</roles>
80+
</developer>
81+
<developer>
82+
<id>tshalif</id>
83+
<name>Tal Shalif</name>
84+
<email>tal[at]shalif[dot]com</email>
85+
<roles>
86+
<role>developer</role>
87+
</roles>
88+
</developer>
89+
<developer>
90+
<id>dhoyt</id>
91+
<name>David Hoyt</name>
92+
<email>david.g.hoyt[at]gmail[dot]com</email>
93+
<roles>
94+
<role>developer</role>
95+
</roles>
96+
</developer>
97+
</developers>
3998

40-
<developers>
41-
<developer>
42-
<id>wmeissner</id>
43-
<name>Wayne Meissner</name>
44-
<email>wmeissner[at]gmail[dot]com</email>
45-
<roles>
46-
<role>founder</role>
47-
<role>developer</role>
48-
</roles>
49-
</developer>
50-
<developer>
51-
<id>lfarkas</id>
52-
<name>Levante Farkas</name>
53-
<email>lfarkas[at]gmail[dot]com</email>
54-
<roles>
55-
<role>developer</role>
56-
</roles>
57-
</developer>
58-
<developer>
59-
<id>andres.colubri</id>
60-
<name>Andres Colubri</name>
61-
<email>andres.colubri[at]gmail[dot]com</email>
62-
<roles>
63-
<role>developer</role>
64-
</roles>
65-
</developer>
66-
<developer>
67-
<id>tshalif</id>
68-
<name>Tal Shalif</name>
69-
<email>tal[at]shalif[dot]com</email>
70-
<roles>
71-
<role>developer</role>
72-
</roles>
73-
</developer>
74-
<developer>
75-
<id>dhoyt</id>
76-
<name>David Hoyt</name>
77-
<email>david.g.hoyt[at]gmail[dot]com</email>
78-
<roles>
79-
<role>developer</role>
80-
</roles>
81-
</developer>
82-
<developer>
83-
<id>neilcsmith-net</id>
84-
<name>Neil C Smith</name>
85-
<email>neilcsmith.net[at]googlemail[dot]com</email>
86-
<roles>
87-
<role>developer</role>
88-
</roles>
89-
</developer>
90-
</developers>
99+
<properties>
100+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
101+
<maven.test.jvmargs></maven.test.jvmargs>
102+
</properties>
91103

92-
<properties>
93-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
94-
<maven.test.jvmargs></maven.test.jvmargs>
95-
<jna.version>4.1</jna.version>
96-
</properties>
104+
<dependencies>
105+
<dependency>
106+
<groupId>junit</groupId>
107+
<artifactId>junit</artifactId>
108+
<version>4.8.1</version>
109+
<scope>test</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>net.java.dev.jna</groupId>
113+
<artifactId>jna</artifactId>
114+
<version>4.4.0</version>
115+
</dependency>
116+
</dependencies>
97117

98-
<dependencies>
99-
<dependency>
100-
<groupId>junit</groupId>
101-
<artifactId>junit</artifactId>
102-
<version>4.8.1</version>
103-
<scope>test</scope>
104-
</dependency>
105-
<dependency>
106-
<groupId>net.java.dev.jna</groupId>
107-
<artifactId>jna</artifactId>
108-
<version>4.1.0</version>
109-
</dependency>
110-
</dependencies>
118+
<build>
119+
<sourceDirectory>src</sourceDirectory>
120+
<resources>
121+
<resource>
122+
<directory>src</directory>
123+
<excludes>
124+
<exclude>**/*.java</exclude>
125+
</excludes>
126+
</resource>
127+
</resources>
128+
<testSourceDirectory>test</testSourceDirectory>
129+
<testResources>
130+
<testResource>
131+
<directory>test</directory>
132+
<excludes>
133+
<exclude>**/*.java</exclude>
134+
</excludes>
135+
</testResource>
136+
</testResources>
137+
<plugins>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-surefire-plugin</artifactId>
141+
<version>2.20</version>
142+
<configuration>
143+
<!--<skipTests>true</skipTests>-->
144+
<forkMode>pertest</forkMode>
145+
<argLine>-Djna.nosys=true ${maven.test.jvmargs}</argLine>
146+
<excludes>
147+
<exclude>**/Test*.java</exclude>
148+
</excludes>
149+
</configuration>
150+
</plugin>
151+
</plugins>
152+
</build>
111153

112-
<build>
113-
<sourceDirectory>src</sourceDirectory>
114-
<resources>
115-
<resource>
116-
<directory>src</directory>
117-
<excludes>
118-
<exclude>**/*.java</exclude>
119-
</excludes>
120-
</resource>
121-
</resources>
122-
<testSourceDirectory>test</testSourceDirectory>
123-
<testResources>
124-
<testResource>
125-
<directory>test</directory>
126-
<excludes>
127-
<exclude>**/*.java</exclude>
128-
</excludes>
129-
</testResource>
130-
</testResources>
154+
<profiles>
155+
<profile>
156+
<id>release</id>
157+
<build>
131158
<plugins>
132-
<plugin>
133-
<groupId>org.apache.maven.plugins</groupId>
134-
<artifactId>maven-compiler-plugin</artifactId>
135-
<version>3.3</version>
136-
<configuration>
137-
<source>1.6</source>
138-
<target>1.6</target>
139-
<encoding>UTF-8</encoding>
140-
</configuration>
141-
</plugin>
142-
<plugin>
143-
<groupId>org.apache.maven.plugins</groupId>
144-
<artifactId>maven-release-plugin</artifactId>
145-
</plugin>
146-
<plugin>
147-
<groupId>org.apache.maven.plugins</groupId>
148-
<artifactId>maven-resources-plugin</artifactId>
149-
<version>2.6</version>
150-
<configuration>
151-
<encoding>UTF-8</encoding>
152-
</configuration>
153-
</plugin>
154-
<plugin>
155-
<groupId>org.apache.maven.plugins</groupId>
156-
<artifactId>maven-surefire-plugin</artifactId>
157-
<version>2.13</version>
158-
<configuration>
159-
<!--<skipTests>true</skipTests>-->
160-
<forkMode>pertest</forkMode>
161-
<argLine>-Djna.nosys=true ${maven.test.jvmargs}</argLine>
162-
<excludes>
163-
<exclude>**/Test*.java</exclude>
164-
</excludes>
165-
</configuration>
166-
</plugin>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-source-plugin</artifactId>
162+
<version>2.2.1</version>
163+
<executions>
164+
<execution>
165+
<id>attach-sources</id>
166+
<goals>
167+
<goal>jar-no-fork</goal>
168+
</goals>
169+
</execution>
170+
</executions>
171+
</plugin>
172+
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
174+
<artifactId>maven-javadoc-plugin</artifactId>
175+
<version>2.9.1</version>
176+
<executions>
177+
<execution>
178+
<id>attach-javadocs</id>
179+
<goals>
180+
<goal>jar</goal>
181+
</goals>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
<plugin>
186+
<groupId>org.apache.maven.plugins</groupId>
187+
<artifactId>maven-gpg-plugin</artifactId>
188+
<version>1.5</version>
189+
<executions>
190+
<execution>
191+
<id>sign-artifacts</id>
192+
<phase>verify</phase>
193+
<goals>
194+
<goal>sign</goal>
195+
</goals>
196+
</execution>
197+
</executions>
198+
</plugin>
167199
</plugins>
168-
</build>
169-
<!--<distributionManagement>-->
170-
171-
<!-- maintainer note: Run following to stage on sonatype (replace xxx):
172-
Have the following in your ~/.m2/settings.xml: =====================================
173-
<servers> <server> <id>sonatype-nexus-staging</id> <username>my-sonatype-nexus-username</username>
174-
<password>my-sonatype-nexus-passwd</password> </server> </servers> =====================================
175-
Then from a shell in the gstreamer-java subdir: ============================================================================================
176-
tanaka> LANG=en_GB.UTF-8 mvn [email protected] \ -Dgpg.passphrase=xxxx
177-
\ -Darguments="-Dgpg.passphrase=xxxx" \ -DconnectionUrl=scm:svn:https://gstreamer-java.googlecode.com/svn/branches/maven-release-1.x
178-
\ release:perform ============================================================================================ -->
179-
180-
<profiles>
181-
<profile>
182-
<id>release-sign-artifacts</id>
183-
<activation>
184-
<property>
185-
<name>performRelease</name>
186-
<value>true</value>
187-
</property>
188-
</activation>
189-
<build>
190-
<plugins>
191-
<plugin>
192-
<groupId>org.apache.maven.plugins</groupId>
193-
<artifactId>maven-gpg-plugin</artifactId>
194-
<version>1.4</version>
195-
<executions>
196-
<execution>
197-
<id>sign-artifacts</id>
198-
<phase>verify</phase>
199-
<goals>
200-
<goal>sign</goal>
201-
</goals>
202-
</execution>
203-
</executions>
204-
</plugin>
205-
</plugins>
206-
</build>
207-
</profile>
208-
</profiles>
200+
</build>
201+
</profile>
202+
</profiles>
209203
</project>

0 commit comments

Comments
 (0)