Skip to content

Commit 95080cf

Browse files
TVoldenTVolden
committed
Fixed POMS for deployment
1 parent f27fe5b commit 95080cf

File tree

9 files changed

+136
-192
lines changed

9 files changed

+136
-192
lines changed

‎ocpp-common/pom.xml‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
8-
<artifactId>ocpp-common</artifactId>
9-
<version>2.0.0</version>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
1012

13+
<artifactId>ocpp-common</artifactId>
1114
<name>Java-OCA-OCPP OCPP Common Package</name>
1215
<description>Java-OCA-OCPP common dependency package</description>
1316
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -34,17 +37,6 @@
3437
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3538
</scm>
3639

37-
<distributionManagement>
38-
<snapshotRepository>
39-
<id>ossrh</id>
40-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
41-
</snapshotRepository>
42-
<repository>
43-
<id>ossrh</id>
44-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
45-
</repository>
46-
</distributionManagement>
47-
4840
<dependencies>
4941
<dependency>
5042
<groupId>javax.xml.bind</groupId>
@@ -138,17 +130,6 @@
138130
</execution>
139131
</executions>
140132
</plugin>
141-
<plugin>
142-
<groupId>org.sonatype.plugins</groupId>
143-
<artifactId>nexus-staging-maven-plugin</artifactId>
144-
<version>1.7.0</version>
145-
<extensions>true</extensions>
146-
<configuration>
147-
<serverId>ossrh</serverId>
148-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
149-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
150-
</configuration>
151-
</plugin>
152133
</plugins>
153134
</build>
154135

‎ocpp-json/pom.xml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
12+
813
<artifactId>ocpp-json</artifactId>
9-
<version>2.0.0</version>
1014
<packaging>jar</packaging>
11-
1215
<name>Java-OCA-OCPP OCPP JSON Transport</name>
1316
<description>JSON transport dependency package</description>
1417
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -35,22 +38,11 @@
3538
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3639
</scm>
3740

38-
<distributionManagement>
39-
<snapshotRepository>
40-
<id>ossrh</id>
41-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
42-
</snapshotRepository>
43-
<repository>
44-
<id>ossrh</id>
45-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
46-
</repository>
47-
</distributionManagement>
48-
4941
<dependencies>
5042
<dependency>
5143
<groupId>eu.chargetime.ocpp</groupId>
5244
<artifactId>ocpp-common</artifactId>
53-
<version>2.0.0</version>
45+
<version>${project.version}</version>
5446
</dependency>
5547
<dependency>
5648
<groupId>com.google.code.gson</groupId>
@@ -135,17 +127,6 @@
135127
</execution>
136128
</executions>
137129
</plugin>
138-
<plugin>
139-
<groupId>org.sonatype.plugins</groupId>
140-
<artifactId>nexus-staging-maven-plugin</artifactId>
141-
<version>1.7.0</version>
142-
<extensions>true</extensions>
143-
<configuration>
144-
<serverId>ossrh</serverId>
145-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
146-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
147-
</configuration>
148-
</plugin>
149130
</plugins>
150131
</build>
151132

‎ocpp-v1_6-json/pom.xml‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
12+
813
<artifactId>ocpp16j</artifactId>
9-
<version>2.0.0</version>
1014
<packaging>jar</packaging>
11-
1215
<name>Java-OCA-OCPP OCPP 1.6J</name>
1316
<description>OCPP 1.6 with JSON transport</description>
1417
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -35,27 +38,16 @@
3538
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3639
</scm>
3740

38-
<distributionManagement>
39-
<snapshotRepository>
40-
<id>ossrh</id>
41-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
42-
</snapshotRepository>
43-
<repository>
44-
<id>ossrh</id>
45-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
46-
</repository>
47-
</distributionManagement>
48-
4941
<dependencies>
5042
<dependency>
5143
<groupId>eu.chargetime.ocpp</groupId>
5244
<artifactId>ocpp16</artifactId>
53-
<version>2.0.0</version>
45+
<version>${project.version}</version>
5446
</dependency>
5547
<dependency>
5648
<groupId>eu.chargetime.ocpp</groupId>
5749
<artifactId>ocpp-json</artifactId>
58-
<version>2.0.0</version>
50+
<version>${project.version}</version>
5951
</dependency>
6052
<dependency>
6153
<groupId>junit</groupId>
@@ -129,17 +121,6 @@
129121
</execution>
130122
</executions>
131123
</plugin>
132-
<plugin>
133-
<groupId>org.sonatype.plugins</groupId>
134-
<artifactId>nexus-staging-maven-plugin</artifactId>
135-
<version>1.7.0</version>
136-
<extensions>true</extensions>
137-
<configuration>
138-
<serverId>ossrh</serverId>
139-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
140-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
141-
</configuration>
142-
</plugin>
143124
</plugins>
144125
</build>
145126

‎ocpp-v1_6-soap/pom.xml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
12+
813
<artifactId>ocpp16s</artifactId>
9-
<version>2.0.0</version>
1014
<packaging>jar</packaging>
11-
1215
<name>Java-OCA-OCPP OCPP 1.6S</name>
1316
<description>OCPP 1.6 with SOAP transport</description>
1417
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -35,22 +38,11 @@
3538
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3639
</scm>
3740

38-
<distributionManagement>
39-
<snapshotRepository>
40-
<id>ossrh</id>
41-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
42-
</snapshotRepository>
43-
<repository>
44-
<id>ossrh</id>
45-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
46-
</repository>
47-
</distributionManagement>
48-
4941
<dependencies>
5042
<dependency>
5143
<groupId>eu.chargetime.ocpp</groupId>
5244
<artifactId>ocpp16</artifactId>
53-
<version>2.0.0</version>
45+
<version>${project.version}</version>
5446
</dependency>
5547
<dependency>
5648
<groupId>javax.xml.soap</groupId>
@@ -129,17 +121,6 @@
129121
</execution>
130122
</executions>
131123
</plugin>
132-
<plugin>
133-
<groupId>org.sonatype.plugins</groupId>
134-
<artifactId>nexus-staging-maven-plugin</artifactId>
135-
<version>1.7.0</version>
136-
<extensions>true</extensions>
137-
<configuration>
138-
<serverId>ossrh</serverId>
139-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
140-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
141-
</configuration>
142-
</plugin>
143124
</plugins>
144125
</build>
145126

‎ocpp-v1_6-test/pom.xml‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
8-
<artifactId>ocpp16-test</artifactId>
9-
<version>2.0.0</version>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
1012

13+
<artifactId>ocpp16-test</artifactId>
1114
<name>Java-OCA-OCPP OCPP 1.6 Integration Tests</name>
1215
<description>OCPP 1.6 integration tests</description>
1316
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -34,40 +37,35 @@
3437
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3538
</scm>
3639

37-
<distributionManagement>
38-
<snapshotRepository>
39-
<id>ossrh</id>
40-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
41-
</snapshotRepository>
42-
<repository>
43-
<id>ossrh</id>
44-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
45-
</repository>
46-
</distributionManagement>
47-
4840
<dependencies>
4941
<dependency>
5042
<groupId>eu.chargetime.ocpp</groupId>
5143
<artifactId>ocpp16j</artifactId>
52-
<version>2.0.0</version>
44+
<version>${project.version}</version>
5345
</dependency>
5446
<dependency>
5547
<groupId>eu.chargetime.ocpp</groupId>
5648
<artifactId>ocpp16s</artifactId>
57-
<version>2.0.0</version>
49+
<version>${project.version}</version>
5850
</dependency>
5951
<dependency>
6052
<groupId>junit</groupId>
6153
<artifactId>junit</artifactId>
6254
<version>4.13.2</version>
6355
<scope>test</scope>
6456
</dependency>
65-
<dependency>
57+
<dependency>
6658
<groupId>org.spockframework</groupId>
6759
<artifactId>spock-core</artifactId>
6860
<version>2.3-groovy-4.0</version>
6961
<scope>test</scope>
7062
</dependency>
63+
<dependency>
64+
<groupId>org.apache.groovy</groupId>
65+
<artifactId>groovy</artifactId>
66+
<version>4.0.24</version>
67+
<scope>test</scope>
68+
</dependency>
7169
<dependency>
7270
<groupId>org.hamcrest</groupId>
7371
<artifactId>hamcrest-core</artifactId>
@@ -118,6 +116,21 @@
118116
<target>1.8</target>
119117
</configuration>
120118
</plugin>
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-deploy-plugin</artifactId>
122+
<configuration>
123+
<skip>true</skip>
124+
</configuration>
125+
</plugin>
126+
<plugin>
127+
<groupId>org.sonatype.central</groupId>
128+
<artifactId>central-publishing-maven-plugin</artifactId>
129+
<configuration>
130+
<publish>false</publish>
131+
<skip>true</skip>
132+
</configuration>
133+
</plugin>
121134
<plugin>
122135
<groupId>org.apache.maven.plugins</groupId>
123136
<artifactId>maven-surefire-plugin</artifactId>

‎ocpp-v1_6/pom.xml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>eu.chargetime.ocpp</groupId>
7+
<parent>
8+
<groupId>eu.chargetime.ocpp</groupId>
9+
<artifactId>java-oca-ocpp</artifactId>
10+
<version>2.0</version>
11+
</parent>
12+
813
<artifactId>ocpp16</artifactId>
9-
<version>2.0.0</version>
1014
<packaging>jar</packaging>
11-
1215
<name>Java-OCA-OCPP OCPP 1.6 (no transport)</name>
1316
<description>OCPP 1.6 base dependency package</description>
1417
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
@@ -35,22 +38,11 @@
3538
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
3639
</scm>
3740

38-
<distributionManagement>
39-
<snapshotRepository>
40-
<id>ossrh</id>
41-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
42-
</snapshotRepository>
43-
<repository>
44-
<id>ossrh</id>
45-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
46-
</repository>
47-
</distributionManagement>
48-
4941
<dependencies>
5042
<dependency>
5143
<groupId>eu.chargetime.ocpp</groupId>
5244
<artifactId>ocpp-common</artifactId>
53-
<version>2.0.0</version>
45+
<version>${project.version}</version>
5446
</dependency>
5547
<dependency>
5648
<groupId>junit</groupId>
@@ -124,17 +116,6 @@
124116
</execution>
125117
</executions>
126118
</plugin>
127-
<plugin>
128-
<groupId>org.sonatype.plugins</groupId>
129-
<artifactId>nexus-staging-maven-plugin</artifactId>
130-
<version>1.7.0</version>
131-
<extensions>true</extensions>
132-
<configuration>
133-
<serverId>ossrh</serverId>
134-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
135-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
136-
</configuration>
137-
</plugin>
138119
</plugins>
139120
</build>
140121

0 commit comments

Comments
 (0)