Skip to content

Commit 5c8b719

Browse files
committed
Merge branch 'release/v3.2.0-techno' into release/v3.2.1-techno
2 parents 0b26bed + 95d8d02 commit 5c8b719

File tree

4 files changed

+42
-23
lines changed

4 files changed

+42
-23
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77

88
.idea
99
build
10+
.metadata/

dbus-java-utils/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<packaging>jar</packaging>
66

7-
<artifactId>dbus-java-utils</artifactId>
7+
<artifactId>dbus-java-utils-techno</artifactId>
88

99
<name>${project.artifactId}</name>
1010

@@ -14,8 +14,8 @@
1414

1515
<parent>
1616
<groupId>com.github.hypfvieh</groupId>
17-
<artifactId>dbus-java-parent</artifactId>
18-
<version>3.2.0-SNAPSHOT</version>
17+
<artifactId>dbus-java-parent-techno</artifactId>
18+
<version>3.2.0</version>
1919
</parent>
2020

2121
<properties>
@@ -115,7 +115,7 @@
115115
<dependencies>
116116
<dependency>
117117
<groupId>com.github.hypfvieh</groupId>
118-
<artifactId>dbus-java</artifactId>
118+
<artifactId>dbus-java-techno</artifactId>
119119
<version>${project.version}</version>
120120
</dependency>
121121

@@ -133,9 +133,9 @@
133133
</dependencies>
134134

135135
<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>
136+
<connection>scm:git:https://github.com/Technolution/dbus-java.git</connection>
137+
<developerConnection>scm:git:https://github.com/Technolution/dbus-java.git</developerConnection>
138+
<url>https://github.com/Technolution/dbus-java.git</url>
139139
<tag>HEAD</tag>
140140
</scm>
141141

dbus-java/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<packaging>jar</packaging>
66

7-
<artifactId>dbus-java</artifactId>
7+
<artifactId>dbus-java-techno</artifactId>
88

99
<name>${project.artifactId}</name>
1010

@@ -14,8 +14,8 @@
1414

1515
<parent>
1616
<groupId>com.github.hypfvieh</groupId>
17-
<artifactId>dbus-java-parent</artifactId>
18-
<version>3.2.0-SNAPSHOT</version>
17+
<artifactId>dbus-java-parent-techno</artifactId>
18+
<version>3.2.0</version>
1919
</parent>
2020

2121
<properties>
@@ -132,9 +132,9 @@
132132
</dependencies>
133133

134134
<scm>
135-
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
136-
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
137-
<url>https://github.com/hypfvieh/dbus-java.git</url>
135+
<connection>scm:git:https://github.com/Technolution/dbus-java.git</connection>
136+
<developerConnection>scm:git:https://github.com/Technolution/dbus-java.git</developerConnection>
137+
<url>https://github.com/Technolution/dbus-java.git</url>
138138
<tag>HEAD</tag>
139139
</scm>
140140

pom.xml

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<packaging>pom</packaging>
66

77
<groupId>com.github.hypfvieh</groupId>
8-
<artifactId>dbus-java-parent</artifactId>
9-
<version>3.2.0-SNAPSHOT</version>
8+
<artifactId>dbus-java-parent-techno</artifactId>
9+
<version>3.2.0</version>
1010

1111
<name>${project.artifactId}</name>
1212
<url>https://github.com/hypfvieh/${project.artifactId}</url>
@@ -48,12 +48,12 @@
4848

4949
<distributionManagement>
5050
<snapshotRepository>
51-
<id>ossrh</id>
52-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
51+
<id>nexus</id>
52+
<url>http://nexus/nexus/content/repositories/n3-snapshots/</url>
5353
</snapshotRepository>
5454
<repository>
55-
<id>ossrh</id>
56-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
55+
<id>nexus</id>
56+
<url>http://nexus/nexus/content/repositories/n3-thirdparty/</url>
5757
</repository>
5858
</distributionManagement>
5959

@@ -150,12 +150,22 @@
150150
<artifactId>mockito-core</artifactId>
151151
<scope>test</scope>
152152
</dependency>
153+
<dependency>
154+
<groupId>org.apache.maven.scm</groupId>
155+
<artifactId>maven-scm-api</artifactId>
156+
<version>1.11.1</version>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.apache.maven.scm</groupId>
160+
<artifactId>maven-scm-provider-gitexe</artifactId>
161+
<version>1.11.1</version>
162+
</dependency>
153163
</dependencies>
154164

155165
<scm>
156-
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
157-
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
158-
<url>https://github.com/hypfvieh/dbus-java.git</url>
166+
<connection>scm:git:https://github.com/Technolution/dbus-java.git</connection>
167+
<developerConnection>scm:git:https://github.com/Technolution/dbus-java.git</developerConnection>
168+
<url>https://github.com/Technolution/dbus-java.git</url>
159169
<tag>HEAD</tag>
160170
</scm>
161171

@@ -282,8 +292,16 @@
282292
</goals>
283293
</execution>
284294
</executions>
295+
<configuration>
296+
<skip>true</skip>
297+
</configuration>
285298
</plugin>
286-
</plugins>
299+
<plugin>
300+
<groupId>org.apache.maven.plugins</groupId>
301+
<artifactId>maven-scm-plugin</artifactId>
302+
<version>1.11.1</version>
303+
</plugin>
304+
</plugins>
287305
</build>
288306
</profile>
289307
</profiles>

0 commit comments

Comments
 (0)