Skip to content

Commit

Permalink
deegree#873 - added parent pom and cleaned up; added config file to f…
Browse files Browse the repository at this point in the history
…ix build errors
  • Loading branch information
lgoltz committed Dec 14, 2017
1 parent b26278f commit 0486336
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 159 deletions.
277 changes: 118 additions & 159 deletions deegree-tools/deegree-tools-config/pom.xml
Original file line number Diff line number Diff line change
@@ -1,170 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.deegree</groupId>
<artifactId>deegree-cli-utility</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<inceptionYear>2016</inceptionYear>
<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">
<modelVersion>4.0.0</modelVersion>
<artifactId>deegree-tools-config</artifactId>
<packaging>jar</packaging>

<!-- Added licence header to source files with:
mvn -Dlicense.addJavaLicenseAfterPackage=false -Dlicense.licenseName=lgpl_v2_1 license:update-file-header
Added licence file with:
mvn license:download-licenses
-->
<licenses>
<license>
<name>GNU Lesser General Public License (LGPL), version 2.1</name>
<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<organization>
<name>weichand.de, lat/lon GmbH</name>
<url>http://www.lat-lon.de</url>
</organization>
<parent>
<groupId>org.deegree</groupId>
<artifactId>deegree-tools</artifactId>
<version>3.4.0-SNAPSHOT</version>
</parent>

<developers>
<developer>
<name>Juergen Weichand</name>
<email>juergen@weichand.de</email>
</developer>
<developer>
<name>Lyn Goltz</name>
<email>goltz@lat-lon.de</email>
</developer>
</developers>
<inceptionYear>2016</inceptionYear>

<scm>
<connection>scm:git:git@github.com:lat-lon/deegree-cli-utility.git</connection>
<developerConnection>scm:git:git@github.com:lat-lon/deegree-cli-utility.git</developerConnection>
<url>https://github.com/lat-lon/deegree-cli-utility</url>
<tag>HEAD</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<deegree.version>3.4-RC5</deegree.version>
</properties>
<!-- Added licence header to source files with:
mvn -Dlicense.addJavaLicenseAfterPackage=false -Dlicense.licenseName=lgpl_v2_1 license:update-file-header
Added licence file with:
mvn license:download-licenses
-->
<licenses>
<license>
<name>GNU Lesser General Public License (LGPL), version 2.1</name>
<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<repositories>
<repository>
<id>deegree-repo</id>
<url>http://repo.deegree.org/content/groups/public</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<organization>
<name>weichand.de, lat/lon GmbH</name>
<url>http://www.lat-lon.de</url>
</organization>

<dependencies>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-core-base</artifactId>
<version>${deegree.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-featurestore-sql</artifactId>
<version>${deegree.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-sqldialect-postgis</artifactId>
<version>${deegree.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-sqldialect-oracle</artifactId>
<version>${deegree.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<developers>
<developer>
<name>Juergen Weichand</name>
<email>juergen@weichand.de</email>
</developer>
<developer>
<name>Lyn Goltz</name>
<email>goltz@lat-lon.de</email>
</developer>
</developers>

<profiles>
<profile>
<id>jar-with-dependencies</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>de.weichand.deegree.Exec</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>deegree-core-base</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>deegree-featurestore-sql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>deegree-sqldialect-postgis</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>deegree-sqldialect-oracle</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

<distributionManagement>
<repository>
<id>latlon-deegreeaddons-releases</id>
<url>http://repo/nexus/content/repositories/deegreeaddons-releases/</url>
</repository>
<snapshotRepository>
<id>latlon-deegreeaddons-snapshots</id>
<url>http://repo/nexus/content/repositories/deegreeaddons-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>jar-with-dependencies</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>de.weichand.deegree.Exec</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# not ignoring anything

0 comments on commit 0486336

Please sign in to comment.