Skip to content

Commit e33b758

Browse files
committed
Add new ocpp-v2 sub-project with OCPP 2.0.1 types
Add a new sub-project named "ocpp-v2", intended to support all OCPP 2.x versions in addition to OCPP 1.6, which it has a dependency on. As a first step, add Java classes for all OCPP 2.0.1 messages and types as well as client and server event handler interfaces and function classes corresponding to the OCPP 2.0.1 "functional blocks."
1 parent 89afc40 commit e33b758

File tree

403 files changed

+56724
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+56724
-0
lines changed

ocpp-v2-test/build.gradle

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*/
4+
5+
plugins {
6+
id 'groovy'
7+
}
8+
9+
dependencies {
10+
compile project(':common')
11+
compile project(':ocpp-v2')
12+
testCompile 'junit:junit:4.12'
13+
testCompile 'org.codehaus.groovy:groovy-all:2.4.11'
14+
testCompile 'org.spockframework:spock-core:1.0-groovy-2.4'
15+
testCompile 'org.hamcrest:hamcrest-core:1.3'
16+
testCompile 'ch.qos.logback:logback-core:1.1.2'
17+
testCompile 'ch.qos.logback:logback-classic:1.1.2'
18+
testCompile 'org.slf4j:jul-to-slf4j:1.7.10'
19+
}
20+
21+
description = 'Java-OCA-OCPP v2 - Integration test'

ocpp-v2-test/pom.xml

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
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>ocpp-v2-test</artifactId>
9+
<version>1.1.0</version>
10+
11+
<name>Java-OCA-OCPP v2 - Integration test</name>
12+
<description>Integration test of OCA OCPP version 2.x</description>
13+
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
14+
15+
<licenses>
16+
<license>
17+
<name>MIT License</name>
18+
<url>http://www.opensource.org/licenses/mit-license.php</url>
19+
</license>
20+
</licenses>
21+
22+
<developers>
23+
<developer>
24+
<name>Thomas Volden</name>
25+
<email>[email protected]</email>
26+
<organization>chargetime.eu</organization>
27+
<organizationUrl>http://www.chargetime.eu</organizationUrl>
28+
</developer>
29+
</developers>
30+
31+
<scm>
32+
<connection>scm:git:git://github.com/ChargeTimeEU/Java-OCA-OCPP.git</connection>
33+
<developerConnection>scm:git:ssh://github.com:ChargeTimeEU/Java-OCA-OCPP.git</developerConnection>
34+
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP.git</url>
35+
</scm>
36+
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+
48+
<dependencies>
49+
<dependency>
50+
<groupId>eu.chargetime.ocpp</groupId>
51+
<artifactId>common</artifactId>
52+
<version>1.0.2</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>eu.chargetime.ocpp</groupId>
56+
<artifactId>ocpp-v2</artifactId>
57+
<version>1.1.0</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>junit</groupId>
61+
<artifactId>junit</artifactId>
62+
<version>4.13.1</version>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.spockframework</groupId>
67+
<artifactId>spock-core</artifactId>
68+
<version>1.0-groovy-2.4</version>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.hamcrest</groupId>
73+
<artifactId>hamcrest-core</artifactId>
74+
<version>1.3</version>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>ch.qos.logback</groupId>
79+
<artifactId>logback-core</artifactId>
80+
<version>1.2.9</version>
81+
<scope>test</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>ch.qos.logback</groupId>
85+
<artifactId>logback-classic</artifactId>
86+
<version>1.2.0</version>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.slf4j</groupId>
91+
<artifactId>jul-to-slf4j</artifactId>
92+
<version>1.7.10</version>
93+
<scope>test</scope>
94+
</dependency>
95+
</dependencies>
96+
97+
<build>
98+
<plugins>
99+
<plugin>
100+
<groupId>org.codehaus.gmavenplus</groupId>
101+
<artifactId>gmavenplus-plugin</artifactId>
102+
<version>1.13.1</version>
103+
<executions>
104+
<execution>
105+
<goals>
106+
<goal>addTestSources</goal>
107+
<goal>compileTests</goal>
108+
</goals>
109+
</execution>
110+
</executions>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-compiler-plugin</artifactId>
115+
<version>3.5.1</version>
116+
<configuration>
117+
<source>1.8</source>
118+
<target>1.8</target>
119+
</configuration>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-surefire-plugin</artifactId>
124+
<version>2.22.2</version>
125+
<configuration>
126+
<skipTests>true</skipTests>
127+
<includes>
128+
<include>**/*Test.java</include>
129+
</includes>
130+
</configuration>
131+
<executions>
132+
<execution>
133+
<id>integration-test</id>
134+
<goals>
135+
<goal>test</goal>
136+
</goals>
137+
<phase>integration-test</phase>
138+
<configuration>
139+
<includes>
140+
<include>**/*Spec.java</include>
141+
</includes>
142+
</configuration>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
</plugins>
147+
</build>
148+
149+
</project>

ocpp-v2/build.gradle

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*/
4+
5+
dependencies {
6+
compile project(':common')
7+
compile project(':OCPP-J')
8+
compile project(':v1_6')
9+
compile 'com.google.code.findbugs:jsr305:3.0.1'
10+
compile 'org.java-websocket:Java-WebSocket:1.5.3'
11+
testCompile 'junit:junit:4.12'
12+
testCompile 'org.mockito:mockito-core:1.10.19'
13+
testCompile 'org.hamcrest:hamcrest-core:1.3'
14+
}
15+
16+
task javadocJar(type: Jar) {
17+
classifier = 'javadoc'
18+
from(javadoc.destinationDir)
19+
}
20+
21+
description = 'Java-OCA-OCPP v2'
22+
publishing.publications.maven.artifact(javadocJar)

ocpp-v2/pom.xml

+167
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
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>ocpp-v2</artifactId>
9+
<version>1.1.0</version>
10+
<packaging>jar</packaging>
11+
12+
<name>Java-OCA-OCPP v2</name>
13+
<description>Implementation of Open Charge-Point Protocol version 2.x.</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>[email protected]</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>common</artifactId>
53+
<version>1.0.2</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>eu.chargetime.ocpp</groupId>
57+
<artifactId>OCPP-J</artifactId>
58+
<version>1.0.2</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>eu.chargetime.ocpp</groupId>
62+
<artifactId>v1_6</artifactId>
63+
<version>1.1.0</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.code.findbugs</groupId>
67+
<artifactId>jsr305</artifactId>
68+
<version>3.0.1</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.java-websocket</groupId>
72+
<artifactId>Java-WebSocket</artifactId>
73+
<version>1.5.3</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>junit</groupId>
77+
<artifactId>junit</artifactId>
78+
<version>4.13.1</version>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.mockito</groupId>
83+
<artifactId>mockito-core</artifactId>
84+
<version>1.10.19</version>
85+
<scope>test</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.hamcrest</groupId>
89+
<artifactId>hamcrest-core</artifactId>
90+
<version>1.3</version>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>ch.qos.logback</groupId>
95+
<artifactId>logback-classic</artifactId>
96+
<version>1.2.3</version>
97+
<scope>test</scope>
98+
</dependency>
99+
</dependencies>
100+
101+
<build>
102+
<plugins>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-compiler-plugin</artifactId>
106+
<configuration>
107+
<source>1.8</source>
108+
<target>1.8</target>
109+
</configuration>
110+
<version>3.5.1</version>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-source-plugin</artifactId>
115+
<version>2.2.1</version>
116+
<executions>
117+
<execution>
118+
<id>attach-sources</id>
119+
<phase>verify</phase>
120+
<goals>
121+
<goal>jar-no-fork</goal>
122+
</goals>
123+
</execution>
124+
</executions>
125+
</plugin>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-javadoc-plugin</artifactId>
129+
<version>2.9.1</version>
130+
<executions>
131+
<execution>
132+
<id>attach-javadocs</id>
133+
<goals>
134+
<goal>jar</goal>
135+
</goals>
136+
</execution>
137+
</executions>
138+
</plugin>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-gpg-plugin</artifactId>
142+
<version>1.5</version>
143+
<executions>
144+
<execution>
145+
<id>sign-artifacts</id>
146+
<phase>verify</phase>
147+
<goals>
148+
<goal>sign</goal>
149+
</goals>
150+
</execution>
151+
</executions>
152+
</plugin>
153+
<plugin>
154+
<groupId>org.sonatype.plugins</groupId>
155+
<artifactId>nexus-staging-maven-plugin</artifactId>
156+
<version>1.6.8</version>
157+
<extensions>true</extensions>
158+
<configuration>
159+
<serverId>ossrh</serverId>
160+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
161+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
162+
</configuration>
163+
</plugin>
164+
</plugins>
165+
</build>
166+
167+
</project>

0 commit comments

Comments
 (0)