Skip to content

Commit b88a78f

Browse files
duncdrumduncdrum
authored
Merge pull request #159 from adamretter/hotifx/abbrev-links
Fix the linking to apps by abbrev package name
2 parents 306e267 + c70e99e commit b88a78f

File tree

4 files changed

+70
-191
lines changed

4 files changed

+70
-191
lines changed

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

File renamed without changes.

‎pom.xml‎

Lines changed: 51 additions & 172 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.1</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,90 +50,54 @@
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>
5754
</properties>
5855

59-
<dependencies>
60-
<dependency>
61-
<groupId>org.exist-db</groupId>
62-
<artifactId>exist-testkit</artifactId>
63-
<version>${exist.version}</version>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>junit</groupId>
68-
<artifactId>junit</artifactId>
69-
<version>4.12</version>
70-
<scope>test</scope>
71-
</dependency>
72-
</dependencies>
73-
7456
<reporting>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-changes-plugin</artifactId>
79-
<version>2.12.1</version>
80-
<configuration>
81-
<includeOpenIssues>false</includeOpenIssues>
82-
<onlyMilestoneIssues>false</onlyMilestoneIssues>
83-
<columnNames>Type, Summary</columnNames>
84-
<outputDirectory>${project.basedir}</outputDirectory>
85-
</configuration>
86-
<reportSets>
87-
<reportSet>
88-
<reports>
89-
<report>github-report</report>
90-
</reports>
91-
</reportSet>
92-
</reportSets>
93-
</plugin>
94-
</plugins>
95-
</reporting>
96-
97-
<build>
9857
<plugins>
9958
<plugin>
100-
<groupId>com.mycila</groupId>
101-
<artifactId>license-maven-plugin</artifactId>
102-
<version>3.0</version>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-changes-plugin</artifactId>
10361
<configuration>
104-
<header>GPL2.1-template.txt</header>
105-
<failIfMissing>true</failIfMissing>
106-
<aggregate>true</aggregate>
107-
<strictCheck>true</strictCheck>
108-
<properties>
109-
<owner>${project.organization.name}</owner>
110-
<organisation>${project.organization.name}</organisation>
111-
<email>[email protected]</email>
112-
<url>${project.organization.url}</url>
113-
</properties>
114-
<headerDefinitions>
115-
<headerDefinition>xquery-license-style.xml</headerDefinition>
116-
</headerDefinitions>
117-
<mapping>
118-
<xq>xquery_style</xq>
119-
<xqm>xquery_style</xqm>
120-
<xql>xquery_style</xql>
121-
<xconf>xml_style</xconf>
122-
</mapping>
123-
<excludes>
124-
<exclude>pom.xml</exclude>
125-
<exclude>README.md</exclude>
126-
<exclude>LICENSE</exclude>
127-
<exclude>xquery-license-style.xml</exclude>
128-
<exclude>xar-assembly.xml</exclude>
129-
<exclude>**/*.ent</exclude>
130-
</excludes>
62+
<includeOpenIssues>false</includeOpenIssues>
63+
<onlyMilestoneIssues>false</onlyMilestoneIssues>
64+
<columnNames>Type, Summary</columnNames>
65+
<outputDirectory>${project.basedir}</outputDirectory>
13166
</configuration>
67+
<reportSets>
68+
<reportSet>
69+
<reports>
70+
<report>github-report</report>
71+
</reports>
72+
</reportSet>
73+
</reportSets>
13274
</plugin>
75+
</plugins>
76+
</reporting>
77+
78+
<build>
79+
<resources>
80+
<resource>
81+
<directory>src/main/xar-resources</directory>
82+
<filtering>true</filtering>
83+
<includes>
84+
<include>templates/**</include>
85+
</includes>
86+
</resource>
87+
<resource>
88+
<directory>src/main/xar-resources</directory>
89+
<filtering>false</filtering>
90+
<excludes>
91+
<exclude>templates/**</exclude>
92+
</excludes>
93+
</resource>
94+
</resources>
95+
96+
<plugins>
97+
13398
<plugin>
13499
<groupId>org.codehaus.mojo</groupId>
135100
<artifactId>xml-maven-plugin</artifactId>
136-
<version>1.0.1</version>
137101
<executions>
138102
<execution>
139103
<phase>validate</phase>
@@ -156,60 +120,9 @@
156120
</validationSets>
157121
</configuration>
158122
</plugin>
159-
<plugin>
160-
<groupId>org.apache.maven.plugins</groupId>
161-
<artifactId>maven-compiler-plugin</artifactId>
162-
<version>3.6.1</version>
163-
<configuration>
164-
<source>${project.build.source}</source>
165-
<target>${project.build.target}</target>
166-
<encoding>${project.build.sourceEncoding}</encoding>
167-
</configuration>
168-
<executions>
169-
<execution>
170-
<phase>compile</phase>
171-
<goals>
172-
<goal>compile</goal>
173-
</goals>
174-
</execution>
175-
</executions>
176-
</plugin>
177-
<plugin>
178-
<groupId>com.code54.mojo</groupId>
179-
<artifactId>buildversion-plugin</artifactId>
180-
<version>1.0.3</version>
181-
<executions>
182-
<execution>
183-
<phase>validate</phase>
184-
<goals>
185-
<goal>set-properties</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
</plugin>
190-
<plugin>
191-
<groupId>org.apache.maven.plugins</groupId>
192-
<artifactId>maven-jar-plugin</artifactId>
193-
<version>3.0.2</version>
194-
<configuration>
195-
<archive>
196-
<manifestEntries>
197-
<Build-Tag>${build-tag}</Build-Tag>
198-
<Git-Commit>${build-commit}</Git-Commit>
199-
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
200-
<Build-Version>${build-version}</Build-Version>
201-
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
202-
<Source-Repository>${project.scm.connection}</Source-Repository>
203-
<Description>${project.description}</Description>
204-
<Implementation-URL>${project.url}</Implementation-URL>
205-
</manifestEntries>
206-
</archive>
207-
</configuration>
208-
</plugin>
209123
<plugin>
210124
<groupId>ro.kuberam.maven.plugins</groupId>
211125
<artifactId>kuberam-expath-plugin</artifactId>
212-
<version>0.4.9</version>
213126
<executions>
214127
<execution>
215128
<id>create-xar</id>
@@ -224,53 +137,19 @@
224137
</execution>
225138
</executions>
226139
</plugin>
227-
<plugin>
228-
<!-- Attach source jars -->
229-
<groupId>org.apache.maven.plugins</groupId>
230-
<artifactId>maven-source-plugin</artifactId>
231-
<version>3.0.1</version>
232-
<configuration>
233-
<archive>
234-
<manifest>
235-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
236-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
237-
</manifest>
238-
<manifestEntries>
239-
<Build-Tag>${build-tag}</Build-Tag>
240-
<Git-Commit>${build-commit}</Git-Commit>
241-
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
242-
<Build-Version>${build-version}</Build-Version>
243-
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
244-
<Source-Repository>${project.scm.connection}</Source-Repository>
245-
<Description>${project.description}</Description>
246-
<Implementation-URL>${project.url}</Implementation-URL>
247-
</manifestEntries>
248-
</archive>
249-
</configuration>
250-
<executions>
251-
<execution>
252-
<id>attach-sources</id>
253-
<phase>verify</phase>
254-
<goals>
255-
<goal>jar</goal>
256-
</goals>
257-
</execution>
258-
</executions>
259-
</plugin>
260140
<plugin>
261141
<groupId>org.apache.maven.plugins</groupId>
262142
<artifactId>maven-gpg-plugin</artifactId>
263-
<version>1.6</version>
264143
<configuration>
265144
<useAgent>true</useAgent>
266145
</configuration>
267146
</plugin>
268147
<plugin>
269148
<groupId>org.apache.maven.plugins</groupId>
270149
<artifactId>maven-release-plugin</artifactId>
271-
<version>2.5.3</version>
272150
<configuration>
273-
<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 -->
274153
<autoVersionSubmodules>true</autoVersionSubmodules>
275154
<tagNameFormat>@{project.version}</tagNameFormat>
276155
</configuration>

0 commit comments

Comments
 (0)