Skip to content

Commit 0f43113

Browse files
robert-s-ubirobert-s-ubi
committed
Rename artefacts/subprojects and update README.md
Also clean up dependencies and make them consistent, and unify spacing across pom.xml files.
1 parent f3e832f commit 0f43113

File tree

22 files changed

+360
-421
lines changed

22 files changed

+360
-421
lines changed

‎README.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,22 @@ Please note, this is a library and not an application, so there is no main metho
1212

1313
The design is driven by test, which will ensure premium software that is easy to adapt and modify to your needs.
1414

15-
The library supports version 2.0.1 and 1.6 SOAP and web sockets.
15+
The library supports OCPP 1.6 with JSON and SOAP transports and OCPP 2.0.1.
16+
17+
The following packages are built from the sources:
18+
19+
| Package | Description |
20+
|-------------|-------------------------------------------------------------------|
21+
| ocpp16j | OCPP 1.6 with JSON transport (only) |
22+
| ocpp16s | OCPP 1.6 with SOAP transport (only) |
23+
| ocpp2 | OCPP 2.0.1 (multi-protocol capable, ocpp16j integration possible) |
24+
| | |
25+
| ocpp16 | OCPP 1.6 base dependency package |
26+
| ocpp-common | common dependency package |
27+
| ocpp-json | JSON transport dependency package |
28+
| | |
29+
| ocpp16-test | OCPP 1.6 integration tests |
30+
| ocpp2-test | OCPP 1.6 and 2.0.1 integration tests |
1631

1732
Incoming request events are split into feature profiles as described in the OCPP specification.
1833
I recommend that you download and read the specification from openchargealliance.org

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file was generated by the Gradle 'init' task.
2+
* Java-OCA-OCPP gradle build configuration
33
*/
44

55
buildscript {

‎ocpp-common/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Java-OCA-OCPP ocpp-common gradle build configuration
3+
*/
14

25
dependencies {
36
compile 'org.slf4j:slf4j-api:2.0.17'
@@ -9,4 +12,4 @@ dependencies {
912
testCompile 'org.hamcrest:hamcrest-all:1.3'
1013
}
1114

12-
description = 'Java-OCA-OCPP Common'
15+
description = 'Java-OCA-OCPP OCPP Common Package'

‎ocpp-common/pom.xml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>eu.chargetime.ocpp</groupId>
8-
<artifactId>common</artifactId>
8+
<artifactId>ocpp-common</artifactId>
99
<version>1.2.0</version>
1010

11-
<name>Java-OCA-OCPP common</name>
12-
<description>Implementation of Open Charge-Point Protocol common library.</description>
11+
<name>Java-OCA-OCPP OCPP Common Package</name>
12+
<description>Java-OCA-OCPP common dependency package</description>
1313
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
1414

1515
<licenses>
@@ -85,6 +85,7 @@
8585
<scope>test</scope>
8686
</dependency>
8787
</dependencies>
88+
8889
<build>
8990
<plugins>
9091
<plugin>
@@ -124,29 +125,29 @@
124125
</executions>
125126
</plugin>
126127
<plugin>
127-
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-gpg-plugin</artifactId>
129-
<version>3.2.8</version>
130-
<executions>
131-
<execution>
132-
<id>sign-artifacts</id>
133-
<phase>verify</phase>
134-
<goals>
135-
<goal>sign</goal>
136-
</goals>
137-
</execution>
138-
</executions>
128+
<groupId>org.apache.maven.plugins</groupId>
129+
<artifactId>maven-gpg-plugin</artifactId>
130+
<version>3.2.8</version>
131+
<executions>
132+
<execution>
133+
<id>sign-artifacts</id>
134+
<phase>verify</phase>
135+
<goals>
136+
<goal>sign</goal>
137+
</goals>
138+
</execution>
139+
</executions>
139140
</plugin>
140141
<plugin>
141-
<groupId>org.sonatype.plugins</groupId>
142-
<artifactId>nexus-staging-maven-plugin</artifactId>
143-
<version>1.7.0</version>
144-
<extensions>true</extensions>
145-
<configuration>
146-
<serverId>ossrh</serverId>
147-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
148-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
149-
</configuration>
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>
150151
</plugin>
151152
</plugins>
152153
</build>

‎ocpp-json/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/*
2-
* This file was generated by the Gradle 'init' task.
2+
* Java-OCA-OCPP ocpp-json gradle build configuration
33
*/
44

55
dependencies {
6-
compile project(':common')
6+
compile project(':ocpp-common')
77
compile 'com.google.code.gson:gson:2.13.2'
88
compile 'org.java-websocket:Java-WebSocket:1.6.0'
9+
910
testCompile 'junit:junit:4.13.2'
1011
testCompile 'org.mockito:mockito-core:4.11.0'
1112
testCompile 'org.hamcrest:hamcrest-core:3.0'
@@ -16,5 +17,5 @@ task javadocJar(type: Jar) {
1617
from(javadoc.destinationDir)
1718
}
1819

19-
description = 'Java-OCA-OCPP OCPP-J'
20+
description = 'Java-OCA-OCPP OCPP JSON Transport'
2021
publishing.publications.maven.artifact(javadocJar)

‎ocpp-json/pom.xml‎

Lines changed: 71 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>eu.chargetime.ocpp</groupId>
8-
<artifactId>OCPP-J</artifactId>
8+
<artifactId>ocpp-json</artifactId>
99
<version>1.2.0</version>
1010
<packaging>jar</packaging>
1111

12-
<name>Java-OCA-OCPP OCPP-J</name>
13-
<description>Implementation of Open Charge-Point Protocols OCPP-J</description>
12+
<name>Java-OCA-OCPP OCPP JSON Transport</name>
13+
<description>JSON transport dependency package</description>
1414
<url>https://github.com/ChargeTimeEU/Java-OCA-OCPP</url>
1515

1616
<licenses>
17-
<license>
18-
<name>MIT License</name>
19-
<url>http://www.opensource.org/licenses/mit-license.php</url>
20-
</license>
17+
<license>
18+
<name>MIT License</name>
19+
<url>http://www.opensource.org/licenses/mit-license.php</url>
20+
</license>
2121
</licenses>
2222

2323
<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>
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>
3131

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>
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>
3737

3838
<distributionManagement>
3939
<snapshotRepository>
@@ -49,7 +49,7 @@
4949
<dependencies>
5050
<dependency>
5151
<groupId>eu.chargetime.ocpp</groupId>
52-
<artifactId>common</artifactId>
52+
<artifactId>ocpp-common</artifactId>
5353
<version>1.2.0</version>
5454
</dependency>
5555
<dependency>
@@ -81,78 +81,72 @@
8181
<version>3.0</version>
8282
<scope>test</scope>
8383
</dependency>
84-
<dependency>
85-
<groupId>ch.qos.logback</groupId>
86-
<artifactId>logback-classic</artifactId>
87-
<version>1.3.16</version>
88-
<scope>test</scope>
89-
</dependency>
9084
</dependencies>
9185

9286
<build>
9387
<plugins>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-compiler-plugin</artifactId>
97-
<configuration>
98-
<source>1.8</source>
99-
<target>1.8</target>
100-
</configuration>
101-
<version>3.14.1</version>
102-
</plugin>
103-
<plugin>
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>
10498
<groupId>org.apache.maven.plugins</groupId>
10599
<artifactId>maven-source-plugin</artifactId>
106100
<version>3.4.0</version>
107101
<executions>
108-
<execution>
109-
<id>attach-sources</id>
110-
<phase>verify</phase>
111-
<goals>
112-
<goal>jar-no-fork</goal>
113-
</goals>
114-
</execution>
102+
<execution>
103+
<id>attach-sources</id>
104+
<phase>verify</phase>
105+
<goals>
106+
<goal>jar-no-fork</goal>
107+
</goals>
108+
</execution>
115109
</executions>
116-
</plugin>
110+
</plugin>
117111
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-javadoc-plugin</artifactId>
120-
<version>3.12.0</version>
121-
<executions>
122-
<execution>
123-
<id>attach-javadocs</id>
124-
<goals>
125-
<goal>jar</goal>
126-
</goals>
127-
</execution>
128-
</executions>
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>
129123
</plugin>
130124
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-gpg-plugin</artifactId>
133-
<version>3.2.8</version>
134-
<executions>
135-
<execution>
136-
<id>sign-artifacts</id>
137-
<phase>verify</phase>
138-
<goals>
139-
<goal>sign</goal>
140-
</goals>
141-
</execution>
142-
</executions>
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>
143137
</plugin>
144138
<plugin>
145-
<groupId>org.sonatype.plugins</groupId>
146-
<artifactId>nexus-staging-maven-plugin</artifactId>
147-
<version>1.7.0</version>
148-
<extensions>true</extensions>
149-
<configuration>
150-
<serverId>ossrh</serverId>
151-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
152-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
153-
</configuration>
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>
154148
</plugin>
155149
</plugins>
156150
</build>
157151

158-
</project>
152+
</project>

‎ocpp-v1_6-example/json-client-implementation/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>eu.chargetime.ocpp</groupId>
12-
<artifactId>json-client-implementation</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
14-
<name>json-client-implementation</name>
15-
<description>Demo project for a json client application, written in form of tests</description>
12+
<artifactId>ocpp16-json-client-example</artifactId>
13+
<version>1.2.0</version>
14+
<name>Example OCPP 1.6 JSON Client Implementation</name>
15+
<description>Demo project for an OCPP 1.6 JSON client application, written in form of tests</description>
1616
<properties>
1717
<java.version>11</java.version>
1818
</properties>
@@ -33,19 +33,9 @@
3333
<artifactId>lombok</artifactId>
3434
<optional>true</optional>
3535
</dependency>
36-
<dependency>
37-
<groupId>org.java-websocket</groupId>
38-
<artifactId>Java-WebSocket</artifactId>
39-
<version>1.6.0</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>com.google.code.gson</groupId>
43-
<artifactId>gson</artifactId>
44-
<version>2.8.9</version>
45-
</dependency>
4636
<dependency>
4737
<groupId>eu.chargetime.ocpp</groupId>
48-
<artifactId>v1_6</artifactId>
38+
<artifactId>ocpp16j</artifactId>
4939
<version>1.2.0</version>
5040
</dependency>
5141
<dependency>

0 commit comments

Comments
 (0)