deegree#858 - configured/fixed filtering of project.version

lat-lon · Sep 6, 2019 · d62f556 · d62f556
1 parent 51bc4e6
commit d62f556
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/deegree-services/deegree-webservices-handbook/pom.xml b/deegree-services/deegree-webservices-handbook/pom.xml
@@ -32,6 +32,37 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}/generated-sources</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/asciidoc</directory>
+                  <excludes>
+                    <exclude>images/*.*</exclude>
+                  </excludes>
+                  <filtering>true</filtering>
+                </resource>
+                <resource>
+                  <directory>src/main/asciidoc</directory>
+                  <includes>
+                    <include>images/*.*</include>
+                  </includes>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.asciidoctor</groupId>
         <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -55,6 +86,7 @@
                 <revdate>${revdate}</revdate>
                 <revnumber>${revnumber}</revnumber>
               </attributes>
+              <sourceDirectory>${project.build.outputDirectory}/generated-sources</sourceDirectory>
               <outputDirectory>${project.build.directory}/pdf</outputDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
             </configuration>
@@ -74,6 +106,7 @@
                 <revdate>${revdate}</revdate>
                 <revnumber>${revnumber}</revnumber>
               </attributes>
+              <sourceDirectory>${project.build.outputDirectory}/generated-sources</sourceDirectory>
               <outputDirectory>${project.build.directory}/html</outputDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
             </configuration>

diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/javamodules.adoc
@@ -114,7 +114,7 @@ add two JAR files (see <<anchor-adding-jars>>):
 _ojdbc8.jar_)footnote:[http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
 (registration required)]
 * Module
-deegree-sqldialect-oraclefootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-sqldialect-oracle/$%7Bproject.version%7D/deegree-sqldialect-oracle-$%7Bproject.version}.jar]
+deegree-sqldialect-oraclefootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-sqldialect-oracle/${project.version}/deegree-sqldialect-oracle-${project.version}.jar]
 
 ==== Adding Oracle GeoRaster support
 
@@ -135,7 +135,7 @@ add the following JAR files (see <<anchor-adding-jars>>):
 ** xdb6.jar
 ** xmlparserv2_sans_jaxp_services.jar
 * Module
-deegree-coveragestore-oracle-georasterfootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-coveragestore-oracle-georaster/$%7Bproject.version%7D/deegree-coveragestore-oracle-georaster-$%7Bproject.version}.jar]
+deegree-coveragestore-oracle-georasterfootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-coveragestore-oracle-georaster/${project.version}/deegree-coveragestore-oracle-georaster-${project.version}.jar]
 
 NOTE: The Oracle Spatial and GeoRaster libraries can be found, without version
 number in filename, inside the Oracle Database installation directory.
@@ -163,4 +163,4 @@ resources, you need to add two JAR files (see <<anchor-adding-jars>>):
 * A compatible Microsoft JDBC driver (e.g.
 _sqljdbc4.jar_)footnote:[http://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx]
 * Module
-deegree-sqldialect-mssqlfootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-sqldialect-mssql/$%7Bproject.version%7D/deegree-sqldialect-mssql-$%7Bproject.version}.jar]
+deegree-sqldialect-mssqlfootnote:[http://repo.deegree.org/content/repositories/public/org/deegree/deegree-sqldialect-mssql/${project.version}/deegree-sqldialect-mssql-${project.version}.jar]