Skip to content

Commit 70de744

Browse files
shroffkshroffk
committed
update the pom to match the restructured sub modules
1 parent 69948ad commit 70de744

File tree

3 files changed

+1
-268
lines changed

3 files changed

+1
-268
lines changed

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

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

‎pom.xml‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
<epics-pvdata.version>6.1.0-SNAPSHOT</epics-pvdata.version>
1717
<epics-ntypes.version>0.3.0-SNAPSHOT</epics-ntypes.version>
1818
<epics-pvaccess.version>5.1.0-SNAPSHOT</epics-pvaccess.version>
19-
<epics-pvaclient.version>4.3.0-SNAPSHOT</epics-pvaclient.version>
20-
<epics-pvdatabase.version>4.3.0-SNAPSHOT</epics-pvdatabase.version>
21-
<jca.version>2.3.7-SNAPSHOT</jca.version>
19+
<jca.version>2.4.1-SNAPSHOT</jca.version>
2220
<!-- Versions of examples bundled with Core -->
2321

2422
<!-- Name of javadoc overview page -->
@@ -30,8 +28,6 @@
3028
<module>pvDataJava</module>
3129
<module>normativeTypesJava</module>
3230
<module>pvAccessJava</module>
33-
<module>pvaClientJava</module>
34-
<module>pvDatabaseJava</module>
3531
<module>epics-core</module>
3632
<module>epics-deploy</module>
3733
<module>epics-util</module>
@@ -200,43 +196,6 @@
200196
<version>${epics-pvaccess.version}</version>
201197
<classifier>javadoc</classifier>
202198
</dependency>
203-
204-
<dependency>
205-
<groupId>org.epics</groupId>
206-
<artifactId>epics-pvaclient</artifactId>
207-
<version>${epics-pvaclient.version}</version>
208-
</dependency>
209-
<dependency>
210-
<groupId>org.epics</groupId>
211-
<artifactId>epics-pvaclient</artifactId>
212-
<version>${epics-pvaclient.version}</version>
213-
<classifier>sources</classifier>
214-
</dependency>
215-
<dependency>
216-
<groupId>org.epics</groupId>
217-
<artifactId>epics-pvaclient</artifactId>
218-
<version>${epics-pvaclient.version}</version>
219-
<classifier>javadoc</classifier>
220-
</dependency>
221-
222-
<dependency>
223-
<groupId>org.epics</groupId>
224-
<artifactId>epics-pvdatabase</artifactId>
225-
<version>${epics-pvdatabase.version}</version>
226-
</dependency>
227-
<dependency>
228-
<groupId>org.epics</groupId>
229-
<artifactId>epics-pvdatabase</artifactId>
230-
<version>${epics-pvdatabase.version}</version>
231-
<classifier>sources</classifier>
232-
</dependency>
233-
<dependency>
234-
<groupId>org.epics</groupId>
235-
<artifactId>epics-pvdatabase</artifactId>
236-
<version>${epics-pvdatabase.version}</version>
237-
<classifier>javadoc</classifier>
238-
</dependency>
239-
240199
<dependency>
241200
<groupId>org.epics</groupId>
242201
<artifactId>jca</artifactId>
@@ -376,8 +335,6 @@
376335
<activeByDefault>true</activeByDefault>
377336
</activation>
378337
<modules>
379-
<module>directoryService</module>
380-
<module>exampleJava</module>
381338
<module>bundleJava</module>
382339
</modules>
383340
</profile>
@@ -412,8 +369,6 @@
412369
<javadoc.opts>-html5</javadoc.opts>
413370
</properties>
414371
<modules>
415-
<module>directoryService</module>
416-
<module>exampleJava</module>
417372
<module>bundleJava</module>
418373
</modules>
419374
<build>

0 commit comments

Comments
 (0)