Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit a0601ef

Browse files
danhaywooddanhaywood
committed
#87 - inlines mavenmixins for swagger and validate (to quickstart) because unable to get them working with {revision} and flattened pom's
1 parent bc062c6 commit a0601ef

File tree

4 files changed

+185
-230
lines changed

4 files changed

+185
-230
lines changed

‎ex/app/quickstart/appdefn/pom.xml

+110-220
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
<isis-maven-plugin.swagger.appManifest>
2020
domainapp.appdefn.DomainAppAppManifestNoFlywayDb
2121
</isis-maven-plugin.swagger.appManifest>
22+
23+
<isis.version>${isisVersion}</isis.version>
2224
</properties>
25+
26+
2327
<build>
2428
<resources>
2529
<resource>
@@ -77,14 +81,45 @@
7781
<groupId>com.danhaywood.mavenmixin</groupId>
7882
<artifactId>cucumberreporting</artifactId>
7983
</mixin>
80-
<mixin>
81-
<groupId>org.incode.mavenmixin</groupId>
82-
<artifactId>incode-mavenmixin-swagger</artifactId>
83-
</mixin>
8484
</mixins>
8585
</configuration>
8686
</plugin>
8787

88+
<plugin>
89+
<groupId>org.apache.isis.tool</groupId>
90+
<artifactId>isis-maven-plugin</artifactId>
91+
<version>${isis.version}</version>
92+
<executions>
93+
<execution>
94+
<phase>package</phase>
95+
<goals>
96+
<goal>swagger</goal>
97+
</goals>
98+
<configuration>
99+
<appManifest>${isis-maven-plugin.swagger.appManifest}</appManifest>
100+
<visibilities>
101+
<visibility>PUBLIC</visibility>
102+
<visibility>PRIVATE</visibility>
103+
</visibilities>
104+
<format>JSON</format>
105+
<fileNamePrefix>swagger</fileNamePrefix>
106+
</configuration>
107+
</execution>
108+
</executions>
109+
110+
<dependencies>
111+
<dependency>
112+
<groupId>${project.groupId}</groupId>
113+
<artifactId>${project.artifactId}</artifactId>
114+
<version>${project.version}</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.hsqldb</groupId>
118+
<artifactId>hsqldb</artifactId>
119+
<version>2.3.1</version>
120+
</dependency>
121+
</dependencies>
122+
</plugin>
88123
</plugins>
89124
</build>
90125

@@ -129,6 +164,77 @@
129164
<artifactId>isis-core-wrapper</artifactId>
130165
</dependency>
131166

167+
<dependency>
168+
<groupId>org.isisaddons.metamodel.paraname8</groupId>
169+
<artifactId>isis-metamodel-paraname8-dom</artifactId>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.isisaddons.module.togglz</groupId>
173+
<artifactId>isis-module-togglz-glue</artifactId>
174+
</dependency>
175+
<dependency>
176+
<groupId>org.isisaddons.module.audit</groupId>
177+
<artifactId>isis-module-audit-dom</artifactId>
178+
</dependency>
179+
<dependency>
180+
<groupId>org.isisaddons.module.command</groupId>
181+
<artifactId>isis-module-command-dom</artifactId>
182+
</dependency>
183+
<dependency>
184+
<groupId>org.isisaddons.module.publishmq</groupId>
185+
<artifactId>isis-module-publishmq-dom-jdo</artifactId>
186+
</dependency>
187+
<dependency>
188+
<groupId>org.isisaddons.module.publishmq</groupId>
189+
<artifactId>isis-module-publishmq-dom-servicespi</artifactId>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.mindrot</groupId>
193+
<artifactId>jbcrypt</artifactId>
194+
<version>${jbcrypt.version}</version>
195+
</dependency>
196+
<dependency>
197+
<groupId>org.isisaddons.module.security</groupId>
198+
<artifactId>isis-module-security-dom</artifactId>
199+
</dependency>
200+
<dependency>
201+
<groupId>org.mindrot</groupId>
202+
<artifactId>jbcrypt</artifactId>
203+
</dependency>
204+
<dependency>
205+
<groupId>org.isisaddons.module.sessionlogger</groupId>
206+
<artifactId>isis-module-sessionlogger-dom</artifactId>
207+
</dependency>
208+
<dependency>
209+
<groupId>org.isisaddons.wicket.excel</groupId>
210+
<artifactId>isis-wicket-excel-cpt</artifactId>
211+
</dependency>
212+
<dependency>
213+
<groupId>org.isisaddons.wicket.fullcalendar2</groupId>
214+
<artifactId>isis-wicket-fullcalendar2-cpt</artifactId>
215+
</dependency>
216+
<dependency>
217+
<groupId>org.isisaddons.wicket.gmap3</groupId>
218+
<artifactId>isis-wicket-gmap3-cpt</artifactId>
219+
</dependency>
220+
<dependency>
221+
<groupId>org.isisaddons.wicket.summernote</groupId>
222+
<artifactId>isis-wicket-summernote-cpt</artifactId>
223+
</dependency>
224+
<dependency>
225+
<groupId>org.isisaddons.wicket.pdfjs</groupId>
226+
<artifactId>isis-wicket-pdfjs-cpt</artifactId>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.isisaddons.wicket.wickedcharts</groupId>
230+
<artifactId>isis-wicket-wickedcharts-cpt</artifactId>
231+
</dependency>
232+
<dependency>
233+
<groupId>org.incode.example.settings</groupId>
234+
<artifactId>incode-example-settings-dom</artifactId>
235+
</dependency>
236+
237+
132238
<!-- test -->
133239
<dependency>
134240
<groupId>org.apache.isis.mavendeps</groupId>
@@ -139,220 +245,4 @@
139245

140246
</dependencies>
141247

142-
<profiles>
143-
<profile>
144-
<id>metamodel-paraname8</id>
145-
<activation>
146-
<property>
147-
<name>!skip.metamodel-paraname8</name>
148-
</property>
149-
</activation>
150-
<dependencies>
151-
<dependency>
152-
<groupId>org.isisaddons.metamodel.paraname8</groupId>
153-
<artifactId>isis-metamodel-paraname8-dom</artifactId>
154-
</dependency>
155-
</dependencies>
156-
</profile>
157-
<profile>
158-
<id>ext-togglz</id>
159-
<activation>
160-
<property>
161-
<name>!skip.ext-togglz</name>
162-
</property>
163-
</activation>
164-
<dependencies>
165-
<dependency>
166-
<groupId>org.isisaddons.module.togglz</groupId>
167-
<artifactId>isis-module-togglz-glue</artifactId>
168-
</dependency>
169-
</dependencies>
170-
</profile>
171-
<profile>
172-
<id>spi-audit</id>
173-
<activation>
174-
<property>
175-
<name>!skip.spi-audit</name>
176-
</property>
177-
</activation>
178-
<dependencies>
179-
<dependency>
180-
<groupId>org.isisaddons.module.audit</groupId>
181-
<artifactId>isis-module-audit-dom</artifactId>
182-
</dependency>
183-
</dependencies>
184-
</profile>
185-
<profile>
186-
<id>spi-command</id>
187-
<activation>
188-
<property>
189-
<name>!skip.spi-command</name>
190-
</property>
191-
</activation>
192-
<dependencies>
193-
<dependency>
194-
<groupId>org.isisaddons.module.command</groupId>
195-
<artifactId>isis-module-command-dom</artifactId>
196-
</dependency>
197-
</dependencies>
198-
</profile>
199-
<profile>
200-
<id>spi-publishmq</id>
201-
<activation>
202-
<property>
203-
<name>!skip.spi-publishmq</name>
204-
</property>
205-
</activation>
206-
<dependencies>
207-
<dependency>
208-
<groupId>org.isisaddons.module.publishmq</groupId>
209-
<artifactId>isis-module-publishmq-dom-jdo</artifactId>
210-
</dependency>
211-
<dependency>
212-
<groupId>org.isisaddons.module.publishmq</groupId>
213-
<artifactId>isis-module-publishmq-dom-servicespi</artifactId>
214-
</dependency>
215-
</dependencies>
216-
</profile>
217-
<profile>
218-
<id>spi-security</id>
219-
<activation>
220-
<property>
221-
<name>!skip.spi-security</name>
222-
</property>
223-
</activation>
224-
<dependencyManagement>
225-
<dependencies>
226-
<dependency>
227-
<groupId>org.mindrot</groupId>
228-
<artifactId>jbcrypt</artifactId>
229-
<version>${jbcrypt.version}</version>
230-
</dependency>
231-
</dependencies>
232-
</dependencyManagement>
233-
<dependencies>
234-
<dependency>
235-
<groupId>org.isisaddons.module.security</groupId>
236-
<artifactId>isis-module-security-dom</artifactId>
237-
</dependency>
238-
<dependency>
239-
<groupId>org.mindrot</groupId>
240-
<artifactId>jbcrypt</artifactId>
241-
</dependency>
242-
</dependencies>
243-
</profile>
244-
<profile>
245-
<id>spi-sessionlogger</id>
246-
<activation>
247-
<property>
248-
<name>!skip.spi-sessionlogger</name>
249-
</property>
250-
</activation>
251-
<dependencies>
252-
<dependency>
253-
<groupId>org.isisaddons.module.sessionlogger</groupId>
254-
<artifactId>isis-module-sessionlogger-dom</artifactId>
255-
</dependency>
256-
</dependencies>
257-
</profile>
258-
<profile>
259-
<id>wicket-excel</id>
260-
<activation>
261-
<property>
262-
<name>!skip.wicket-excel</name>
263-
</property>
264-
</activation>
265-
<dependencies>
266-
<dependency>
267-
<groupId>org.isisaddons.wicket.excel</groupId>
268-
<artifactId>isis-wicket-excel-cpt</artifactId>
269-
</dependency>
270-
</dependencies>
271-
</profile>
272-
<profile>
273-
<id>wicket-fullcalendar2</id>
274-
<activation>
275-
<property>
276-
<name>!skip.wicket-fullcalendar2</name>
277-
</property>
278-
</activation>
279-
<dependencies>
280-
<dependency>
281-
<groupId>org.isisaddons.wicket.fullcalendar2</groupId>
282-
<artifactId>isis-wicket-fullcalendar2-cpt</artifactId>
283-
</dependency>
284-
</dependencies>
285-
</profile>
286-
<profile>
287-
<id>wicket-gmap3</id>
288-
<activation>
289-
<property>
290-
<name>!skip.wicket-gmap3</name>
291-
</property>
292-
</activation>
293-
<dependencies>
294-
<dependency>
295-
<groupId>org.isisaddons.wicket.gmap3</groupId>
296-
<artifactId>isis-wicket-gmap3-cpt</artifactId>
297-
</dependency>
298-
</dependencies>
299-
</profile>
300-
<profile>
301-
<id>wicket-summernote</id>
302-
<activation>
303-
<property>
304-
<name>!skip.wicket-summernote</name>
305-
</property>
306-
</activation>
307-
<dependencies>
308-
<dependency>
309-
<groupId>org.isisaddons.wicket.summernote</groupId>
310-
<artifactId>isis-wicket-summernote-cpt</artifactId>
311-
</dependency>
312-
</dependencies>
313-
</profile>
314-
<profile>
315-
<id>wicket-pdfjs</id>
316-
<activation>
317-
<property>
318-
<name>!skip.wicket-pdfjs</name>
319-
</property>
320-
</activation>
321-
<dependencies>
322-
<dependency>
323-
<groupId>org.isisaddons.wicket.pdfjs</groupId>
324-
<artifactId>isis-wicket-pdfjs-cpt</artifactId>
325-
</dependency>
326-
</dependencies>
327-
</profile>
328-
<profile>
329-
<id>wicket-wickedcharts</id>
330-
<activation>
331-
<property>
332-
<name>!skip.wicket-wickedcharts</name>
333-
</property>
334-
</activation>
335-
<dependencies>
336-
<dependency>
337-
<groupId>org.isisaddons.wicket.wickedcharts</groupId>
338-
<artifactId>isis-wicket-wickedcharts-cpt</artifactId>
339-
</dependency>
340-
</dependencies>
341-
</profile>
342-
<profile>
343-
<id>module-settings</id>
344-
<activation>
345-
<property>
346-
<name>!skip.module-settings</name>
347-
</property>
348-
</activation>
349-
<dependencies>
350-
<dependency>
351-
<groupId>org.incode.example.settings</groupId>
352-
<artifactId>incode-example-settings-dom</artifactId>
353-
</dependency>
354-
</dependencies>
355-
</profile>
356-
</profiles>
357-
358248
</project>

0 commit comments

Comments
 (0)