Skip to content

Commit

Permalink
Bring minimal POM changes from the PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
@kasarit
kasarit committed Dec 13, 2019
1 parent 3e6d30c commit 5dbd4c1
Showing 1 changed file with 6 additions and 139 deletions.
145 changes: 6 additions & 139 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?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">
<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">
<parent>
<groupId>fi.fmi</groupId>
<artifactId>fmi-os-parent-pom</artifactId>
Expand All @@ -11,29 +12,15 @@
<description>Aviation weather message conversions</description>
<groupId>fi.fmi.avi.converter</groupId>
<artifactId>fmi-avi-messageconverter</artifactId>
<version>3.9.4.K-SNAPSHOT</version>
<version>3.9.5-SNAPSHOT</version>

<scm>
<connection>scm:git:https://github.com/ernstdevreede/fmi-avi-messageconverter.git</connection>
<developerConnection>scm:git:https://github.com/ernstdevreede/fmi-avi-messageconverter.git</developerConnection>
<url>https://github.com/ernstdevreede/fmi-avi-messageconverter</url>
<connection>scm:git:https://github.com/fmidev/fmi-avi-messageconverter.git</connection>
<developerConnection>scm:git:https://github.com/fmidev/fmi-avi-messageconverter.git</developerConnection>
<url>https://github.com/fmidev/fmi-avi-messageconverter</url>
<tag>HEAD</tag>
</scm>

<properties>
<!-- Github site plugin for Github mvn repo deployment -->
<site-maven-plugin.version>0.12</site-maven-plugin.version>
<!-- Most of these SHOULD NOT be overriden in child POMs -->
<project.scm.id>github</project.scm.id>
<github-repo-owner>ernstdevreede</github-repo-owner>
<github.global.server>github</github.global.server>
<github-mvn-release-repo>knmi-mvn-repo</github-mvn-release-repo>
<github-mvn-snapshot-repo>knmi-mvn-snapshot-repo</github-mvn-snapshot-repo>
<scm-url>scm:https://github.com/${github-repo-owner}/${project.artifactId}.git/</scm-url>
<scm-web-url>https://github.com/${github-repo-owner}/${project.artifactId}</scm-web-url>

</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -46,42 +33,6 @@
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>knmi-os-mvn-snapshot-repo</id>
<url>https://raw.githubusercontent.com/ernstdevreede/fmi-os-mvn-snapshot-repo/master</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>fmi-os-mvn-snapshot-repo</id>
<url>https://raw.githubusercontent.com/fmidev/fmi-os-mvn-snapshot-repo/master</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>fmi-os-mvn-release-repo</id>
<url>https://raw.githubusercontent.com/fmidev/fmi-os-mvn-repo/master</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</releases>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -174,91 +125,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>${site-maven-plugin.version}</version>
<configuration>
<message>Maven artifacts for ${project.version}</message> <!-- git commit message -->
<noJekyll>true</noJekyll> <!-- disable webpage processing -->
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
<branch>refs/heads/master</branch> <!-- remote branch name -->
<includes>
<include>**/*</include>
</includes>
<repositoryName>${github-mvn-release-repo}</repositoryName> <!-- github repo name -->
<repositoryOwner>${github-repo-owner}</repositoryOwner> <!-- github username -->
<merge>true</merge>
</configuration>
<executions>
<!-- run site-maven-plugin's 'site' target as part of the build's
normal 'release' phase -->
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>snapshot</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Maven artifacts for ${project.version}</message> <!-- git commit message -->
<noJekyll>true</noJekyll> <!-- disable webpage processing -->
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
<branch>refs/heads/master</branch> <!-- remote branch name -->
<includes>
<include>**/*</include>
</includes>
<repositoryName>${github-mvn-snapshot-repo}</repositoryName> <!-- github repo name -->
<repositoryOwner>${github-repo-owner}</repositoryOwner> <!-- github username -->
<merge>true</merge>
</configuration>
<executions>
<!-- run site-maven-plugin's 'site' target as part of the build's
normal 'deploy' phase -->
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

</project>

0 comments on commit 5dbd4c1

Please sign in to comment.