Skip to content

Commit dca68d1

Browse files
brodykenrickbrodykenrick
committed
Tidy up warnings.
1 parent 01defc1 commit dca68d1

File tree

13 files changed

+27
-35
lines changed

13 files changed

+27
-35
lines changed

‎.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ script: mvn deploy -Plinux32,juno --settings setings.xml
1111
#CI_NEXUS_USERNAME
1212
#CI_NEXUS_OAUTH2_TOKEN
1313
#CI_GPG_PASSPHRASE
14-
#CI_NEXUS_GROUPID
1514
#CI_GITHUB_REPOUSERNAME
1615
env:
1716
global:
1817
#Make sure Maven doesn't run out of heap memory.
1918
- MAVEN_OPTS="-Xmx1024M"
2019

2120
#These are the Nexus details and GPG signing token for Nexus deployment.
22-
#This Nexus repo is good to use until we want more consistency in naming
23-
- CI_NEXUS_GROUPID=com.github.brodykenrick.arduino-eclipse-plugin
21+
#The Nexus repo is hardcoded as com.github.brodykenrick.arduino-eclipse-plugin in the POM.XML (doing otherwise produces warnings)
22+
#This is good to use until we want more consistency in naming
2423
#Travis encrypted variables names and tokens (need to change for correct repo though for encryption to work).
2524
#Nexus Username, pass and GPG
2625
# These point to the above nexus server/groupid but need to be encrypted against the repo Travis is getting code from (i.e. change it).

‎it.baeyens.arduino.application/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.application</artifactId>
1313
<version>1.0.0-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>

‎it.baeyens.arduino.common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.common</artifactId>
1313
<version>2.1.1-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>

‎it.baeyens.arduino.core.nl1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.core.nl1</artifactId>
1313
<version>1.0.0-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>

‎it.baeyens.arduino.core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.core</artifactId>
1313
<version>2.1.4-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>

‎it.baeyens.arduino.feature/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.feature</artifactId>
1313
<version>2.1.4-SNAPSHOT</version>
1414
<packaging>eclipse-feature</packaging>

‎it.baeyens.arduino.monitor/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.monitor</artifactId>
1313
<version>2.1.8-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>

‎it.baeyens.arduino.packaging.feature/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../it.baeyens.arduino.parent</relativePath>
1010
</parent>
11-
<groupId>${parent.groupId}</groupId>
11+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1212
<artifactId>it.baeyens.arduino.packaging.feature</artifactId>
1313
<version>1.0.0-SNAPSHOT</version>
1414
<packaging>eclipse-feature</packaging>

‎it.baeyens.arduino.parent/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>${parent.groupId}</groupId>
6+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
77
<artifactId>it.baeyens.arduino.parent</artifactId>
88
<version>1.0.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
@@ -21,11 +21,15 @@
2121
<relativePath>org.sonatype.oss:oss-parent</relativePath>
2222
</parent>
2323

24-
<!-- TODO : github.repo.username -->
2524
<scm>
25+
<!--
2626
<connection>scm:git:git://github.com/brodykenrick/arduino-eclipse-plugin.git</connection>
2727
<developerConnection>scm:git:[email protected]:brodykenrick/arduino-eclipse-plugin.git</developerConnection>
2828
<url>http://github.com/brodykenrick/arduino-eclipse-plugin</url>
29+
-->
30+
<connection>scm:git:git://github.com/${github.repo.username}/arduino-eclipse-plugin.git</connection>
31+
<developerConnection>scm:git:[email protected]:${github.repo.username}/arduino-eclipse-plugin.git</developerConnection>
32+
<url>http://github.com/${github.repo.username}/arduino-eclipse-plugin</url>
2933
</scm>
3034

3135
<!-- Sonatype repos -->

‎it.baeyens.arduino.product/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>${parent.groupId}</groupId>
7+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
88
<artifactId>it.baeyens.arduino.parent</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
1010
<relativePath>../it.baeyens.arduino.parent</relativePath>
1111
</parent>
12-
<groupId>${parent.groupId}</groupId>
12+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1313
<artifactId>it.baeyens.arduino.product</artifactId>
1414
<version>1.0.0-SNAPSHOT</version>
1515
<packaging>eclipse-repository</packaging>

‎it.baeyens.arduino.updatesite/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>${parent.groupId}</groupId>
7+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
88
<artifactId>it.baeyens.arduino.parent</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
1010
<relativePath>../it.baeyens.arduino.parent</relativePath>
1111
</parent>
12-
<groupId>${parent.groupId}</groupId>
12+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
1313
<artifactId>it.baeyens.arduino.updatesite</artifactId>
1414
<version>1.0.0-SNAPSHOT</version>
1515
<packaging>eclipse-repository</packaging>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>${parent.groupId}</groupId>
5+
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
66
<artifactId>root</artifactId>
77
<version>0.0.1-SNAPSHOT</version>
88
<packaging>pom</packaging>

‎settings.xml

-11
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@
2323
</properties>
2424
</profile>
2525

26-
<!-- This is the Nexus groupId (target destination). Leave as BK for deployment for now. -->
27-
<profile>
28-
<id>inject-parent.groupId</id>
29-
<activation>
30-
<activeByDefault>true</activeByDefault>
31-
</activation>
32-
<properties>
33-
<parent.groupId>${env.CI_NEXUS_GROUPID}</parent.groupId>
34-
</properties>
35-
</profile>
36-
3726
<profile>
3827
<id>inject-github.repo.username</id>
3928
<activation>

0 commit comments

Comments
 (0)