Skip to content

Commit 34ca5b8

Browse files
hypfviehhypfvieh
committed
Merged changes from master; Version bump
2 parents dbcc9f5 + 2e83f91 commit 34ca5b8

3 files changed

Lines changed: 499 additions & 487 deletions

File tree

‎dbus-java-utils/pom.xml‎

Lines changed: 125 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,142 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<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">
53

6-
<modelVersion>4.0.0</modelVersion>
7-
<packaging>jar</packaging>
4+
<modelVersion>4.0.0</modelVersion>
5+
<packaging>jar</packaging>
86

9-
<artifactId>dbus-java-utils</artifactId>
7+
<artifactId>dbus-java-utils</artifactId>
108

11-
<name>${project.artifactId}</name>
9+
<name>${project.artifactId}</name>
1210

13-
<description>
11+
<description>
1412
Utilities for the dbus-java library.
1513
</description>
1614

17-
<parent>
18-
<groupId>com.github.hypfvieh</groupId>
19-
<artifactId>dbus-java-parent</artifactId>
20-
<version>3.0.2-SNAPSHOT</version>
21-
</parent>
15+
<parent>
16+
<groupId>com.github.hypfvieh</groupId>
17+
<artifactId>dbus-java-parent</artifactId>
18+
<version>3.0.3-SNAPSHOT</version>
19+
</parent>
2220

23-
<properties>
24-
</properties>
21+
<properties>
22+
</properties>
2523

26-
<build>
27-
<plugins>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-enforcer-plugin</artifactId>
31-
<version>3.0.0-M2</version>
32-
<executions>
33-
<execution>
34-
<id>enforce-maven</id>
35-
<goals>
36-
<goal>enforce</goal>
37-
</goals>
38-
<configuration>
39-
<rules>
40-
<requireMavenVersion>
41-
<version>3.5.0</version>
42-
</requireMavenVersion>
43-
<requireJavaVersion>
44-
<version>${maven.compiler.source}</version>
45-
</requireJavaVersion>
46-
<requireOS>
47-
<family>unix</family>
48-
</requireOS>
49-
</rules>
50-
</configuration>
51-
</execution>
52-
</executions>
53-
</plugin>
54-
<plugin>
55-
<groupId>org.codehaus.mojo</groupId>
56-
<artifactId>animal-sniffer-maven-plugin</artifactId>
57-
<version>1.17</version>
58-
<configuration>
59-
<signature>
60-
<groupId>org.codehaus.mojo.signature</groupId>
61-
<artifactId>java18</artifactId>
62-
<version>1.0</version>
63-
</signature>
64-
</configuration>
65-
<executions>
66-
<execution>
67-
<id>sniffer_check</id>
68-
<phase>test</phase>
69-
<goals>
70-
<goal>check</goal>
71-
</goals>
72-
</execution>
73-
</executions>
74-
</plugin>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-jar-plugin</artifactId>
78-
<version>3.0.2</version>
79-
<executions>
80-
<execution>
81-
<goals>
82-
<goal>test-jar</goal>
83-
</goals>
84-
</execution>
85-
</executions>
86-
<configuration>
87-
<archive>
88-
<manifest>
89-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
90-
</manifest>
91-
</archive>
92-
</configuration>
93-
</plugin>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-surefire-plugin</artifactId>
97-
<version>3.0.0-M3</version>
98-
<configuration>
99-
<systemPropertyVariables>
100-
<logback.configurationFile>${basedir}/src/test/resources/logback.xml</logback.configurationFile>
101-
</systemPropertyVariables>
102-
</configuration>
103-
</plugin>
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-enforcer-plugin</artifactId>
29+
<version>3.0.0-M2</version>
30+
<executions>
31+
<execution>
32+
<id>enforce-maven</id>
33+
<goals>
34+
<goal>enforce</goal>
35+
</goals>
36+
<configuration>
37+
<rules>
38+
<requireMavenVersion>
39+
<version>3.5.0</version>
40+
</requireMavenVersion>
41+
<requireJavaVersion>
42+
<version>${maven.compiler.source}</version>
43+
</requireJavaVersion>
44+
<requireOS>
45+
<family>unix</family>
46+
</requireOS>
47+
</rules>
48+
</configuration>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
<plugin>
53+
<groupId>org.codehaus.mojo</groupId>
54+
<artifactId>animal-sniffer-maven-plugin</artifactId>
55+
<version>1.17</version>
56+
<configuration>
57+
<signature>
58+
<groupId>org.codehaus.mojo.signature</groupId>
59+
<artifactId>java18</artifactId>
60+
<version>1.0</version>
61+
</signature>
62+
</configuration>
63+
<executions>
64+
<execution>
65+
<id>sniffer_check</id>
66+
<phase>test</phase>
67+
<goals>
68+
<goal>check</goal>
69+
</goals>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-jar-plugin</artifactId>
76+
<version>3.0.2</version>
77+
<executions>
78+
<execution>
79+
<goals>
80+
<goal>test-jar</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
<configuration>
85+
<archive>
86+
<manifest>
87+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
88+
</manifest>
89+
</archive>
90+
</configuration>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-surefire-plugin</artifactId>
95+
<version>3.0.0-M3</version>
96+
<configuration>
97+
<systemPropertyVariables>
98+
<logback.configurationFile>${basedir}/src/test/resources/logback.xml</logback.configurationFile>
99+
</systemPropertyVariables>
100+
</configuration>
101+
</plugin>
104102

105-
</plugins>
106-
<pluginManagement>
107-
<plugins>
108-
<plugin>
109-
<groupId>org.codehaus.mojo</groupId>
110-
<artifactId>versions-maven-plugin</artifactId>
111-
<version>2.7</version>
112-
</plugin>
113-
</plugins>
114-
</pluginManagement>
115-
</build>
103+
</plugins>
104+
<pluginManagement>
105+
<plugins>
106+
<plugin>
107+
<groupId>org.codehaus.mojo</groupId>
108+
<artifactId>versions-maven-plugin</artifactId>
109+
<version>2.7</version>
110+
</plugin>
111+
</plugins>
112+
</pluginManagement>
113+
</build>
116114

117-
<dependencies>
118-
<dependency>
119-
<groupId>com.github.hypfvieh</groupId>
120-
<artifactId>dbus-java</artifactId>
121-
<version>${project.version}</version>
122-
</dependency>
115+
<dependencies>
116+
<dependency>
117+
<groupId>com.github.hypfvieh</groupId>
118+
<artifactId>dbus-java</artifactId>
119+
<version>${project.version}</version>
120+
</dependency>
123121

124-
<dependency>
125-
<groupId>ch.qos.logback</groupId>
126-
<artifactId>logback-core</artifactId>
127-
<scope>runtime</scope>
128-
</dependency>
122+
<dependency>
123+
<groupId>ch.qos.logback</groupId>
124+
<artifactId>logback-core</artifactId>
125+
<scope>runtime</scope>
126+
</dependency>
129127

130-
<dependency>
131-
<groupId>ch.qos.logback</groupId>
132-
<artifactId>logback-classic</artifactId>
133-
<scope>runtime</scope>
134-
</dependency>
135-
</dependencies>
128+
<dependency>
129+
<groupId>ch.qos.logback</groupId>
130+
<artifactId>logback-classic</artifactId>
131+
<scope>runtime</scope>
132+
</dependency>
133+
</dependencies>
136134

137-
<scm>
138-
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
139-
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
140-
<url>https://github.com/hypfvieh/dbus-java.git</url>
141-
</scm>
135+
<scm>
136+
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
137+
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
138+
<url>https://github.com/hypfvieh/dbus-java.git</url>
139+
<tag>HEAD</tag>
140+
</scm>
142141

143142
</project>

0 commit comments

Comments
 (0)