Skip to content

Commit a3d0bbc

Browse files
shroffkshroffk
authored
Merge pull request #38 from epics-base/release_simplification
Release simplification
2 parents 102c7df + 9a946ec commit a3d0bbc

File tree

10 files changed

+15
-300
lines changed

10 files changed

+15
-300
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,3 @@
1414
path = normativeTypesJava
1515
url = https://github.com/epics-base/normativeTypesJava
1616
branch = master
17-
[submodule "pvaClientJava"]
18-
path = pvaClientJava
19-
url = https://github.com/epics-base/pvaClientJava
20-
branch = master
21-
[submodule "pvDatabaseJava"]
22-
path = pvDatabaseJava
23-
url = https://github.com/epics-base/pvDatabaseJava
24-
branch = master
25-
[submodule "exampleJava"]
26-
path = exampleJava
27-
url = https://github.com/epics-base/exampleJava
28-
branch = master
29-
[submodule "directoryService"]
30-
path = directoryService
31-
url = https://github.com/epics-base/directoryService
32-
branch = master

‎README.md‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,13 @@ to depend on a matching set of the EPICS Core libraries.
88

99

1010
## Code Submodules
11-
Five maven submodules/directories/projects contain the code of EPICS Core:
11+
Maven submodules/directories/projects contain the code of EPICS Core:
1212
* pvDataJava
1313
* pvAccessJava
1414
* normativeTypesJava
1515
* epics-util
1616
* epics-vtype
17-
18-
Two git submodules contain the code of EPICS Core:
19-
* pvaClientJava
20-
* pvDatabaseJava
21-
22-
Two git submodules contain example code:
23-
* exampleJava
24-
* directoryService
17+
* gpclient
2518

2619
One submodule creates the distribution tar/zip archives:
2720
* bundleJava
@@ -32,11 +25,13 @@ One directory/project provides the dependency POM:
3225
One (dummy) directory/project deploys the libraries to Maven Central:
3326
* epics-deploy
3427

28+
### example code
29+
https://github.com/epics-base/exampleJava/
30+
3531
## Maven Profiles
3632

3733
### with-examples
38-
This profile (enabled by default) adds the directories/projects exampleJava,
39-
directoryService and bundleJava as subprojects.
34+
This profile (enabled by default) adds the directories/projects bundleJava as subprojects.
4035

4136
Disable this profile when deploying to Maven repositories, as the artifacts
4237
of these subprojects contain applications and no libraries.

‎bundleJava/pom.xml‎

Lines changed: 0 additions & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
<properties>
1818
<!-- Versions of additional modules to be bundled -->
19-
<epics-directoryservice.version>0.6.0-SNAPSHOT</epics-directoryservice.version>
20-
<epics-examples.version>4.3.0-SNAPSHOT</epics-examples.version>
2119
<!-- Set the name for the release bundle -->
2220
<releaseName>EPICS-Java-${project.version}</releaseName>
2321
</properties>
@@ -78,37 +76,6 @@
7876
<artifactId>epics-pvaccess</artifactId>
7977
<classifier>javadoc</classifier>
8078
</dependency>
81-
82-
<dependency>
83-
<groupId>${project.groupId}</groupId>
84-
<artifactId>epics-pvaclient</artifactId>
85-
</dependency>
86-
<dependency>
87-
<groupId>${project.groupId}</groupId>
88-
<artifactId>epics-pvaclient</artifactId>
89-
<classifier>sources</classifier>
90-
</dependency>
91-
<dependency>
92-
<groupId>${project.groupId}</groupId>
93-
<artifactId>epics-pvaclient</artifactId>
94-
<classifier>javadoc</classifier>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>${project.groupId}</groupId>
99-
<artifactId>epics-pvdatabase</artifactId>
100-
</dependency>
101-
<dependency>
102-
<groupId>${project.groupId}</groupId>
103-
<artifactId>epics-pvdatabase</artifactId>
104-
<classifier>sources</classifier>
105-
</dependency>
106-
<dependency>
107-
<groupId>${project.groupId}</groupId>
108-
<artifactId>epics-pvdatabase</artifactId>
109-
<classifier>javadoc</classifier>
110-
</dependency>
111-
11279
<dependency>
11380
<groupId>org.epics</groupId>
11481
<artifactId>jca</artifactId>
@@ -123,187 +90,6 @@
12390
<artifactId>jca</artifactId>
12491
<classifier>javadoc</classifier>
12592
</dependency>
126-
127-
<dependency>
128-
<groupId>${project.groupId}</groupId>
129-
<artifactId>epics-directoryService</artifactId>
130-
<version>${epics-directoryservice.version}</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>${project.groupId}</groupId>
134-
<artifactId>epics-directoryService</artifactId>
135-
<version>${epics-directoryservice.version}</version>
136-
<classifier>sources</classifier>
137-
</dependency>
138-
<dependency>
139-
<groupId>${project.groupId}</groupId>
140-
<artifactId>epics-directoryService</artifactId>
141-
<version>${epics-directoryservice.version}</version>
142-
<classifier>javadoc</classifier>
143-
</dependency>
144-
145-
<dependency>
146-
<groupId>${project.groupId}</groupId>
147-
<artifactId>epics-examples-arrayPerformance</artifactId>
148-
<version>${epics-examples.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>${project.groupId}</groupId>
152-
<artifactId>epics-examples-arrayPerformance</artifactId>
153-
<version>${epics-examples.version}</version>
154-
<classifier>sources</classifier>
155-
</dependency>
156-
<dependency>
157-
<groupId>${project.groupId}</groupId>
158-
<artifactId>epics-examples-arrayPerformance</artifactId>
159-
<version>${epics-examples.version}</version>
160-
<classifier>javadoc</classifier>
161-
</dependency>
162-
163-
<dependency>
164-
<groupId>${project.groupId}</groupId>
165-
<artifactId>epics-examples-database</artifactId>
166-
<version>${epics-examples.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>${project.groupId}</groupId>
170-
<artifactId>epics-examples-database</artifactId>
171-
<version>${epics-examples.version}</version>
172-
<classifier>sources</classifier>
173-
</dependency>
174-
<dependency>
175-
<groupId>${project.groupId}</groupId>
176-
<artifactId>epics-examples-database</artifactId>
177-
<version>${epics-examples.version}</version>
178-
<classifier>javadoc</classifier>
179-
</dependency>
180-
181-
<dependency>
182-
<groupId>${project.groupId}</groupId>
183-
<artifactId>epics-examples-exampleClient</artifactId>
184-
<version>${epics-examples.version}</version>
185-
</dependency>
186-
<dependency>
187-
<groupId>${project.groupId}</groupId>
188-
<artifactId>epics-examples-exampleClient</artifactId>
189-
<version>${epics-examples.version}</version>
190-
<classifier>sources</classifier>
191-
</dependency>
192-
<dependency>
193-
<groupId>${project.groupId}</groupId>
194-
<artifactId>epics-examples-exampleClient</artifactId>
195-
<version>${epics-examples.version}</version>
196-
<classifier>javadoc</classifier>
197-
</dependency>
198-
199-
<dependency>
200-
<groupId>${project.groupId}</groupId>
201-
<artifactId>epics-examples-exampleLink</artifactId>
202-
<version>${epics-examples.version}</version>
203-
</dependency>
204-
<dependency>
205-
<groupId>${project.groupId}</groupId>
206-
<artifactId>epics-examples-exampleLink</artifactId>
207-
<version>${epics-examples.version}</version>
208-
<classifier>sources</classifier>
209-
</dependency>
210-
<dependency>
211-
<groupId>${project.groupId}</groupId>
212-
<artifactId>epics-examples-exampleLink</artifactId>
213-
<version>${epics-examples.version}</version>
214-
<classifier>javadoc</classifier>
215-
</dependency>
216-
217-
<dependency>
218-
<groupId>${project.groupId}</groupId>
219-
<artifactId>epics-examples-helloPutGet</artifactId>
220-
<version>${epics-examples.version}</version>
221-
</dependency>
222-
<dependency>
223-
<groupId>${project.groupId}</groupId>
224-
<artifactId>epics-examples-helloPutGet</artifactId>
225-
<version>${epics-examples.version}</version>
226-
<classifier>sources</classifier>
227-
</dependency>
228-
<dependency>
229-
<groupId>${project.groupId}</groupId>
230-
<artifactId>epics-examples-helloPutGet</artifactId>
231-
<version>${epics-examples.version}</version>
232-
<classifier>javadoc</classifier>
233-
</dependency>
234-
235-
<dependency>
236-
<groupId>${project.groupId}</groupId>
237-
<artifactId>epics-examples-helloRPC</artifactId>
238-
<version>${epics-examples.version}</version>
239-
</dependency>
240-
<dependency>
241-
<groupId>${project.groupId}</groupId>
242-
<artifactId>epics-examples-helloRPC</artifactId>
243-
<version>${epics-examples.version}</version>
244-
<classifier>sources</classifier>
245-
</dependency>
246-
<dependency>
247-
<groupId>${project.groupId}</groupId>
248-
<artifactId>epics-examples-helloRPC</artifactId>
249-
<version>${epics-examples.version}</version>
250-
<classifier>javadoc</classifier>
251-
</dependency>
252-
253-
<dependency>
254-
<groupId>${project.groupId}</groupId>
255-
<artifactId>epics-examples-powerSupply</artifactId>
256-
<version>${epics-examples.version}</version>
257-
</dependency>
258-
<dependency>
259-
<groupId>${project.groupId}</groupId>
260-
<artifactId>epics-examples-powerSupply</artifactId>
261-
<version>${epics-examples.version}</version>
262-
<classifier>sources</classifier>
263-
</dependency>
264-
<dependency>
265-
<groupId>${project.groupId}</groupId>
266-
<artifactId>epics-examples-powerSupply</artifactId>
267-
<version>${epics-examples.version}</version>
268-
<classifier>javadoc</classifier>
269-
</dependency>
270-
271-
<dependency>
272-
<groupId>${project.groupId}</groupId>
273-
<artifactId>epics-examples-pvDatabaseRPC</artifactId>
274-
<version>${epics-examples.version}</version>
275-
</dependency>
276-
<dependency>
277-
<groupId>${project.groupId}</groupId>
278-
<artifactId>epics-examples-pvDatabaseRPC</artifactId>
279-
<version>${epics-examples.version}</version>
280-
<classifier>sources</classifier>
281-
</dependency>
282-
<dependency>
283-
<groupId>${project.groupId}</groupId>
284-
<artifactId>epics-examples-pvDatabaseRPC</artifactId>
285-
<version>${epics-examples.version}</version>
286-
<classifier>javadoc</classifier>
287-
</dependency>
288-
289-
<dependency>
290-
<groupId>${project.groupId}</groupId>
291-
<artifactId>epics-examples-serviceAPI</artifactId>
292-
<version>${epics-examples.version}</version>
293-
</dependency>
294-
<dependency>
295-
<groupId>${project.groupId}</groupId>
296-
<artifactId>epics-examples-serviceAPI</artifactId>
297-
<version>${epics-examples.version}</version>
298-
<classifier>sources</classifier>
299-
</dependency>
300-
<dependency>
301-
<groupId>${project.groupId}</groupId>
302-
<artifactId>epics-examples-serviceAPI</artifactId>
303-
<version>${epics-examples.version}</version>
304-
<classifier>javadoc</classifier>
305-
</dependency>
306-
30793
</dependencies>
30894

30995
<build>

‎directoryService‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎epics-core/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@
2828
<groupId>${project.groupId}</groupId>
2929
<artifactId>epics-pvaccess</artifactId>
3030
</dependency>
31-
<dependency>
32-
<groupId>${project.groupId}</groupId>
33-
<artifactId>epics-pvaclient</artifactId>
34-
</dependency>
35-
<dependency>
36-
<groupId>${project.groupId}</groupId>
37-
<artifactId>epics-pvdatabase</artifactId>
38-
</dependency>
3931
<dependency>
4032
<groupId>org.epics</groupId>
4133
<artifactId>jca</artifactId>

‎exampleJava‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gpclient/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.epics</groupId>
54
<artifactId>gpclient</artifactId>
65
<name>gpclient</name>
76
<version>1.0.0-SNAPSHOT</version>
@@ -20,6 +19,9 @@
2019
<module>gpclient-sample</module>
2120
</modules>
2221
<build>
22+
<!-- Non-standard source directories -->
23+
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
24+
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
2325
<plugins>
2426
<plugin>
2527
<groupId>org.apache.maven.plugins</groupId>
@@ -111,4 +113,9 @@
111113
<scope>test</scope>
112114
</dependency>
113115
</dependencies>
116+
<parent>
117+
<groupId>org.epics</groupId>
118+
<artifactId>epics-parent</artifactId>
119+
<version>7.0.0-SNAPSHOT</version>
120+
</parent>
114121
</project>

0 commit comments

Comments
 (0)