Skip to content

Commit 4441537

Browse files
adamretteradamretter
committed
[refactor] Use a parent POM for common settings between Apps
1 parent 8d5b77d commit 4441537

File tree

3 files changed

+53
-198
lines changed

3 files changed

+53
-198
lines changed

‎GPL2.1-template.txt‎ renamed to ‎LGPL2.1-template.txt‎

File renamed without changes.

‎pom.xml‎

Lines changed: 35 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34

45
<modelVersion>4.0.0</modelVersion>
56

67
<parent>
7-
<groupId>org.sonatype.oss</groupId>
8-
<artifactId>oss-parent</artifactId>
9-
<version>7</version>
10-
<relativePath />
8+
<groupId>org.exist-db</groupId>
9+
<artifactId>exist-apps-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
<relativePath/>
1112
</parent>
1213

1314
<groupId>org.exist-db</groupId>
@@ -24,7 +25,7 @@
2425
<url>http://exist-db.org</url>
2526
</organization>
2627

27-
<licenses>
28+
<licenses>
2829
<license>
2930
<name>GNU Lesser General Public License, version 2.1</name>
3031
<url>http://opensource.org/licenses/LGPL-2.1</url>
@@ -33,15 +34,14 @@
3334
</licenses>
3435

3536
<scm>
36-
<url>https://www.github.com/exist-db/documentation.git</url>
37+
<url>https://www.github.com/exist-db/documentation.git</url>
3738
<connection>scm:git:https://www.github.com/exist-db/documentation.git</connection>
3839
<developerConnection>scm:git:https://www.github.com/exist-db/documentation.git</developerConnection>
39-
<tag>HEAD</tag>
40-
</scm>
41-
<issueManagement>
42-
<system>GitHub</system>
43-
<url>https://github.com/eXist-db/documentation/issues</url>
44-
</issueManagement>
40+
</scm>
41+
<issueManagement>
42+
<system>GitHub</system>
43+
<url>https://github.com/eXist-db/documentation/issues</url>
44+
</issueManagement>
4545

4646
<properties>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,55 +50,29 @@
5050

5151
<exist.version>3.5.0</exist.version>
5252

53-
<package-title>${project.name}</package-title>
5453
<package-name>http://exist-db.org/apps/doc</package-name>
55-
<package-abbrev>${project.artifactId}</package-abbrev>
56-
<package-final-name>${project.artifactId}-${project.version}</package-final-name>
57-
58-
<!-- other packages that the documentation links to; their `abbrev` must match their expath-pkg.xml -->
59-
<dashboard-package-abbrev>dashboard</dashboard-package-abbrev>
60-
<demo-package-abbrev>demo</demo-package-abbrev>
61-
<fundocs-package-abbrev>fundocs</fundocs-package-abbrev>
62-
<exide-package-abbrev>eXide</exide-package-abbrev>
63-
<monex-package-abbrev>monex</monex-package-abbrev>
6454
</properties>
6555

66-
<dependencies>
67-
<dependency>
68-
<groupId>org.exist-db</groupId>
69-
<artifactId>exist-testkit</artifactId>
70-
<version>${exist.version}</version>
71-
<scope>test</scope>
72-
</dependency>
73-
<dependency>
74-
<groupId>junit</groupId>
75-
<artifactId>junit</artifactId>
76-
<version>4.12</version>
77-
<scope>test</scope>
78-
</dependency>
79-
</dependencies>
80-
8156
<reporting>
82-
<plugins>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-changes-plugin</artifactId>
86-
<version>2.12.1</version>
87-
<configuration>
88-
<includeOpenIssues>false</includeOpenIssues>
89-
<onlyMilestoneIssues>false</onlyMilestoneIssues>
90-
<columnNames>Type, Summary</columnNames>
91-
<outputDirectory>${project.basedir}</outputDirectory>
92-
</configuration>
93-
<reportSets>
94-
<reportSet>
95-
<reports>
96-
<report>github-report</report>
97-
</reports>
98-
</reportSet>
99-
</reportSets>
100-
</plugin>
101-
</plugins>
57+
<plugins>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-changes-plugin</artifactId>
61+
<configuration>
62+
<includeOpenIssues>false</includeOpenIssues>
63+
<onlyMilestoneIssues>false</onlyMilestoneIssues>
64+
<columnNames>Type, Summary</columnNames>
65+
<outputDirectory>${project.basedir}</outputDirectory>
66+
</configuration>
67+
<reportSets>
68+
<reportSet>
69+
<reports>
70+
<report>github-report</report>
71+
</reports>
72+
</reportSet>
73+
</reportSets>
74+
</plugin>
75+
</plugins>
10276
</reporting>
10377

10478
<build>
@@ -120,44 +94,10 @@
12094
</resources>
12195

12296
<plugins>
123-
<plugin>
124-
<groupId>com.mycila</groupId>
125-
<artifactId>license-maven-plugin</artifactId>
126-
<version>3.0</version>
127-
<configuration>
128-
<header>GPL2.1-template.txt</header>
129-
<failIfMissing>true</failIfMissing>
130-
<aggregate>true</aggregate>
131-
<strictCheck>true</strictCheck>
132-
<properties>
133-
<owner>${project.organization.name}</owner>
134-
<organisation>${project.organization.name}</organisation>
135-
<email>[email protected]</email>
136-
<url>${project.organization.url}</url>
137-
</properties>
138-
<headerDefinitions>
139-
<headerDefinition>xquery-license-style.xml</headerDefinition>
140-
</headerDefinitions>
141-
<mapping>
142-
<xq>xquery_style</xq>
143-
<xqm>xquery_style</xqm>
144-
<xql>xquery_style</xql>
145-
<xconf>xml_style</xconf>
146-
</mapping>
147-
<excludes>
148-
<exclude>pom.xml</exclude>
149-
<exclude>README.md</exclude>
150-
<exclude>LICENSE</exclude>
151-
<exclude>xquery-license-style.xml</exclude>
152-
<exclude>xar-assembly.xml</exclude>
153-
<exclude>**/*.ent</exclude>
154-
</excludes>
155-
</configuration>
156-
</plugin>
97+
15798
<plugin>
15899
<groupId>org.codehaus.mojo</groupId>
159100
<artifactId>xml-maven-plugin</artifactId>
160-
<version>1.0.1</version>
161101
<executions>
162102
<execution>
163103
<phase>validate</phase>
@@ -180,60 +120,9 @@
180120
</validationSets>
181121
</configuration>
182122
</plugin>
183-
<plugin>
184-
<groupId>org.apache.maven.plugins</groupId>
185-
<artifactId>maven-compiler-plugin</artifactId>
186-
<version>3.6.1</version>
187-
<configuration>
188-
<source>${project.build.source}</source>
189-
<target>${project.build.target}</target>
190-
<encoding>${project.build.sourceEncoding}</encoding>
191-
</configuration>
192-
<executions>
193-
<execution>
194-
<phase>compile</phase>
195-
<goals>
196-
<goal>compile</goal>
197-
</goals>
198-
</execution>
199-
</executions>
200-
</plugin>
201-
<plugin>
202-
<groupId>com.code54.mojo</groupId>
203-
<artifactId>buildversion-plugin</artifactId>
204-
<version>1.0.3</version>
205-
<executions>
206-
<execution>
207-
<phase>validate</phase>
208-
<goals>
209-
<goal>set-properties</goal>
210-
</goals>
211-
</execution>
212-
</executions>
213-
</plugin>
214-
<plugin>
215-
<groupId>org.apache.maven.plugins</groupId>
216-
<artifactId>maven-jar-plugin</artifactId>
217-
<version>3.0.2</version>
218-
<configuration>
219-
<archive>
220-
<manifestEntries>
221-
<Build-Tag>${build-tag}</Build-Tag>
222-
<Git-Commit>${build-commit}</Git-Commit>
223-
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
224-
<Build-Version>${build-version}</Build-Version>
225-
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
226-
<Source-Repository>${project.scm.connection}</Source-Repository>
227-
<Description>${project.description}</Description>
228-
<Implementation-URL>${project.url}</Implementation-URL>
229-
</manifestEntries>
230-
</archive>
231-
</configuration>
232-
</plugin>
233123
<plugin>
234124
<groupId>ro.kuberam.maven.plugins</groupId>
235125
<artifactId>kuberam-expath-plugin</artifactId>
236-
<version>0.4.9</version>
237126
<executions>
238127
<execution>
239128
<id>create-xar</id>
@@ -248,53 +137,19 @@
248137
</execution>
249138
</executions>
250139
</plugin>
251-
<plugin>
252-
<!-- Attach source jars -->
253-
<groupId>org.apache.maven.plugins</groupId>
254-
<artifactId>maven-source-plugin</artifactId>
255-
<version>3.0.1</version>
256-
<configuration>
257-
<archive>
258-
<manifest>
259-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
260-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
261-
</manifest>
262-
<manifestEntries>
263-
<Build-Tag>${build-tag}</Build-Tag>
264-
<Git-Commit>${build-commit}</Git-Commit>
265-
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
266-
<Build-Version>${build-version}</Build-Version>
267-
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
268-
<Source-Repository>${project.scm.connection}</Source-Repository>
269-
<Description>${project.description}</Description>
270-
<Implementation-URL>${project.url}</Implementation-URL>
271-
</manifestEntries>
272-
</archive>
273-
</configuration>
274-
<executions>
275-
<execution>
276-
<id>attach-sources</id>
277-
<phase>verify</phase>
278-
<goals>
279-
<goal>jar</goal>
280-
</goals>
281-
</execution>
282-
</executions>
283-
</plugin>
284140
<plugin>
285141
<groupId>org.apache.maven.plugins</groupId>
286142
<artifactId>maven-gpg-plugin</artifactId>
287-
<version>1.6</version>
288143
<configuration>
289144
<useAgent>true</useAgent>
290145
</configuration>
291146
</plugin>
292147
<plugin>
293148
<groupId>org.apache.maven.plugins</groupId>
294149
<artifactId>maven-release-plugin</artifactId>
295-
<version>2.5.3</version>
296150
<configuration>
297-
<mavenExecutorId>forked-path</mavenExecutorId> <!-- avoid a bug with GPG plugin hanging http://jira.codehaus.org/browse/MGPG-9 -->
151+
<mavenExecutorId>forked-path
152+
</mavenExecutorId> <!-- avoid a bug with GPG plugin hanging http://jira.codehaus.org/browse/MGPG-9 -->
298153
<autoVersionSubmodules>true</autoVersionSubmodules>
299154
<tagNameFormat>@{project.version}</tagNameFormat>
300155
</configuration>

‎src/main/xar-resources/templates/page.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
3131
<ul class="dropdown-menu">
3232
<li>
33-
<a href="{${dashboard-package-abbrev}}/index.html">Dashboard</a>
33+
<a href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
3434
</li>
3535
<li>
3636
<a href="http://exist-db.org">eXist-db.org</a>
@@ -41,41 +41,41 @@
4141
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Demo</a>
4242
<ul class="dropdown-menu">
4343
<li>
44-
<a href="{${demo-package-abbrev}}/index.html">Overview</a>
44+
<a href="{${demo.pkg.abbrev}}/index.html">Overview</a>
4545
</li>
4646
<li>
47-
<a href="{${demo-package-abbrev}}/examples/basic/basics.html">Basic XQuery Examples</a>
47+
<a href="{${demo.pkg.abbrev}}/examples/basic/basics.html">Basic XQuery Examples</a>
4848
</li>
4949
<li>
50-
<a href="{${demo-package-abbrev}}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
50+
<a href="{${demo.pkg.abbrev}}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
5151
</li>
5252
<li>
53-
<a href="{${demo-package-abbrev}}/examples/web/index.html">Web Examples</a>
53+
<a href="{${demo.pkg.abbrev}}/examples/web/index.html">Web Examples</a>
5454
</li>
5555
<li>
56-
<a href="{${demo-package-abbrev}}/examples/urlrewriting/index.html">URL Rewriting</a>
56+
<a href="{${demo.pkg.abbrev}}/examples/urlrewriting/index.html">URL Rewriting</a>
5757
</li>
5858
<li>
59-
<a href="{${demo-package-abbrev}}/examples/special/index.html">Special Features</a>
59+
<a href="{${demo.pkg.abbrev}}/examples/special/index.html">Special Features</a>
6060
</li>
6161
<li>
62-
<a href="{${demo-package-abbrev}}/examples/templating/templates.html">Templating</a>
62+
<a href="{${demo.pkg.abbrev}}/examples/templating/templates.html">Templating</a>
6363
</li>
6464
<li>
65-
<a href="{${demo-package-abbrev}}/cex-demo.html">Content Extraction</a>
65+
<a href="{${demo.pkg.abbrev}}/cex-demo.html">Content Extraction</a>
6666
</li>
6767
<li>
68-
<a href="{${demo-package-abbrev}}/examples/tests/test.html">Unit Testing</a>
68+
<a href="{${demo.pkg.abbrev}}/examples/tests/test.html">Unit Testing</a>
6969
</li>
7070
<li>
71-
<a href="{${demo-package-abbrev}}/examples/contacts/html/home.html?browseContacts">RestXQ and
71+
<a href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html?browseContacts">RestXQ and
7272
AngularJS</a>
7373
</li>
7474
<li>
75-
<a href="{${demo-package-abbrev}}/examples/xforms/">XForms and RestXQ</a>
75+
<a href="{${demo.pkg.abbrev}}/examples/xforms/">XForms and RestXQ</a>
7676
</li>
7777
<li>
78-
<a href="{${demo-package-abbrev}}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
78+
<a href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
7979
</li>
8080
</ul>
8181
</li>
@@ -86,7 +86,7 @@
8686
<a href="documentation.xml">Documentation</a>
8787
</li>
8888
<li>
89-
<a href="{${fundocs-package-abbrev}}/index.html">XQuery Functions</a>
89+
<a href="{${fundocs.pkg.abbrev}}/index.html">XQuery Functions</a>
9090
</li>
9191
<li>
9292
<a href="getting-help.xml">Get Support</a>
@@ -103,7 +103,7 @@
103103
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Development</a>
104104
<ul class="dropdown-menu">
105105
<li>
106-
<a href="{${exide-package-abbrev}}/index.html">eXide</a>
106+
<a href="{${exide.pkg.abbrev}}/index.html">eXide</a>
107107
</li>
108108
<li>
109109
<a href="http://exist-db.org/api/index.html">Javadocs</a>
@@ -124,13 +124,13 @@
124124
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration</a>
125125
<ul class="dropdown-menu">
126126
<li>
127-
<a href="{${dashboard-package-abbrev}}/index.html">Dashboard</a>
127+
<a href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
128128
</li>
129129
<li>
130130
<a href="/webstart/exist.jnlp">Webstart Client</a>
131131
</li>
132132
<li>
133-
<a href="{${monex-package-abbrev}}/">Monitoring and Profiling</a>
133+
<a href="{${monex.pkg.abbrev}}/">Monitoring and Profiling</a>
134134
</li>
135135
</ul>
136136
</li>
@@ -162,7 +162,7 @@
162162
<a href="documentation.xml">Documentation</a>
163163
</li>
164164
<li>
165-
<a href="{${demo-package-abbrev}}/index.html">Demo</a>
165+
<a href="{${demo.pkg.abbrev}}/index.html">Demo</a>
166166
</li>
167167
<li class="hidden-xs-inline">
168168
<a href="/status">Status</a>

0 commit comments

Comments
 (0)