Skip to content

Commit 0240d3b

Browse files
robert-s-ubirobert-s-ubi
committed
Separate ocpp-v1_6-json from ocpp-v1_6 subproject
1 parent 763858e commit 0240d3b

10 files changed

Lines changed: 179 additions & 14 deletions

File tree

‎ocpp-v1_6-json/build.gradle‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Java-OCA-OCPP ocpp-v1_6-json gradle build configuration
3+
*/
4+
5+
dependencies {
6+
compile project(':v1_6')
7+
compile project(':OCPP-J')
8+
9+
testCompile 'junit:junit:4.13.2'
10+
testCompile 'org.mockito:mockito-core:4.11.0'
11+
testCompile 'org.hamcrest:hamcrest-core:3.0'
12+
}
13+
14+
task javadocJar(type: Jar) {
15+
classifier = 'javadoc'
16+
from(javadoc.destinationDir)
17+
}
18+
19+
description = 'Java-OCA-OCPP OCPP 1.6J'
20+
publishing.publications.maven.artifact(javadocJar)

‎ocpp-v1_6-json/pom.xml‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
<?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/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>eu.chargetime.ocpp</groupId>
8+
<artifactId>v1_6j</artifactId>
9+
<version>1.2.0</version>
10+
<packaging>jar</packaging>
11+
12+
<name>Java-OCA-OCPP OCPP 1.6J</name>
13+
<description>OCPP 1.6 with JSON transport</description>
14+
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
15+
16+
<licenses>
17+
<license>
18+
<name>MIT License</name>
19+
<url>http://www.opensource.org/licenses/mit-license.php</url>
20+
</license>
21+
</licenses>
22+
23+
<developers>
24+
<developer>
25+
<name>Thomas Volden</name>
26+
<email>tv@chargetime.eu</email>
27+
<organization>chargetime.eu</organization>
28+
<organizationUrl>http://www.chargetime.eu</organizationUrl>
29+
</developer>
30+
</developers>
31+
32+
<scm>
33+
<connection>scm:git:git://github.com/ChargeTimeEU/Java-OCA-OCPP.git</connection>
34+
<developerConnection>scm:git:ssh://github.com:ChargeTimeEU/Java-OCA-OCPP.git</developerConnection>
35+
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
36+
</scm>
37+
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+
49+
<dependencies>
50+
<dependency>
51+
<groupId>eu.chargetime.ocpp</groupId>
52+
<artifactId>v1_6</artifactId>
53+
<version>1.2.0</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>eu.chargetime.ocpp</groupId>
57+
<artifactId>OCPP-J</artifactId>
58+
<version>1.2.0</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>junit</groupId>
62+
<artifactId>junit</artifactId>
63+
<version>4.13.2</version>
64+
<scope>test</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.mockito</groupId>
68+
<artifactId>mockito-core</artifactId>
69+
<version>4.11.0</version>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.hamcrest</groupId>
74+
<artifactId>hamcrest-core</artifactId>
75+
<version>3.0</version>
76+
<scope>test</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>ch.qos.logback</groupId>
80+
<artifactId>logback-classic</artifactId>
81+
<version>1.3.16</version>
82+
<scope>test</scope>
83+
</dependency>
84+
</dependencies>
85+
86+
<build>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-compiler-plugin</artifactId>
91+
<configuration>
92+
<source>1.8</source>
93+
<target>1.8</target>
94+
</configuration>
95+
<version>3.14.1</version>
96+
</plugin>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-source-plugin</artifactId>
100+
<version>3.4.0</version>
101+
<executions>
102+
<execution>
103+
<id>attach-sources</id>
104+
<phase>verify</phase>
105+
<goals>
106+
<goal>jar-no-fork</goal>
107+
</goals>
108+
</execution>
109+
</executions>
110+
</plugin>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-javadoc-plugin</artifactId>
114+
<version>3.12.0</version>
115+
<executions>
116+
<execution>
117+
<id>attach-javadocs</id>
118+
<goals>
119+
<goal>jar</goal>
120+
</goals>
121+
</execution>
122+
</executions>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-gpg-plugin</artifactId>
127+
<version>3.2.8</version>
128+
<executions>
129+
<execution>
130+
<id>sign-artifacts</id>
131+
<phase>verify</phase>
132+
<goals>
133+
<goal>sign</goal>
134+
</goals>
135+
</execution>
136+
</executions>
137+
</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>
149+
</plugins>
150+
</build>
151+
152+
</project>

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java renamed to ocpp-v1_6-json/src/main/java/eu/chargetime/ocpp/JSONClient.java

File renamed without changes.

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java renamed to ocpp-v1_6-json/src/main/java/eu/chargetime/ocpp/JSONServer.java

File renamed without changes.

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/test/JSONCommunicatorTest.java renamed to ocpp-v1_6-json/src/test/java/eu/chargetime/ocpp/test/JSONCommunicatorTest.java

File renamed without changes.

‎ocpp-v1_6-test/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins {
88

99
dependencies {
1010
compile project(':common')
11+
compile project(':v1_6j')
1112
compile project(':v1_6s')
1213
testCompile 'junit:junit:4.13.2'
1314
testCompile 'org.codehaus.groovy:groovy-all:2.4.11'

‎ocpp-v1_6/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
dependencies {
66
compile project(':common')
7-
compile project(':OCPP-J')
87

98
testCompile 'junit:junit:4.13.2'
109
testCompile 'org.mockito:mockito-core:4.11.0'
@@ -16,5 +15,5 @@ task javadocJar(type: Jar) {
1615
from(javadoc.destinationDir)
1716
}
1817

19-
description = 'Java-OCA-OCPP v1.6'
18+
description = 'Java-OCA-OCPP OCPP 1.6 (no transport)'
2019
publishing.publications.maven.artifact(javadocJar)

‎ocpp-v1_6/pom.xml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<version>1.2.0</version>
1010
<packaging>jar</packaging>
1111

12-
<name>Java-OCA-OCPP v1.6</name>
13-
<description>Implementation of Open Charge-Point Protocol version 1.6.</description>
12+
<name>Java-OCA-OCPP OCPP 1.6 (no transport)</name>
13+
<description>OCPP 1.6 base dependency package</description>
1414
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
1515

1616
<licenses>
@@ -52,16 +52,6 @@
5252
<artifactId>common</artifactId>
5353
<version>1.2.0</version>
5454
</dependency>
55-
<dependency>
56-
<groupId>eu.chargetime.ocpp</groupId>
57-
<artifactId>OCPP-J</artifactId>
58-
<version>1.2.0</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.java-websocket</groupId>
62-
<artifactId>Java-WebSocket</artifactId>
63-
<version>1.6.0</version>
64-
</dependency>
6555
<dependency>
6656
<groupId>junit</groupId>
6757
<artifactId>junit</artifactId>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<module>ocpp-common</module>
4040
<module>OCPP-J</module>
4141
<module>ocpp-v1_6</module>
42+
<module>ocpp-v1_6-json</module>
4243
<module>ocpp-v1_6-soap</module>
4344
<module>ocpp-v1_6-test</module>
4445
<module>ocpp-v2</module>

‎settings.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ include(':OCPP-J')
99
include(':ocpp-v2')
1010
include(':ocpp-v2-test')
1111
include(':v1_6')
12+
include(':v1_6j')
1213
include(':v1_6s')
1314
include(':v1_6-test')
1415
project(':v1_6').projectDir = file('ocpp-v1_6')
16+
project(':v1_6j').projectDir = file('ocpp-v1_6-json')
1517
project(':v1_6s').projectDir = file('ocpp-v1_6-soap')
1618
project(':v1_6-test').projectDir = file('ocpp-v1_6-test')

0 commit comments

Comments
 (0)