Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/merge
Browse files Browse the repository at this point in the history
  • Loading branch information
bsorrentino committed Mar 5, 2020
2 parents 4b3c043 + 5f36b02 commit 128a2be
Show file tree
Hide file tree
Showing 8 changed files with 241 additions and 165 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ target
# intelliJ
#
.idea/
*.iml
*.iml
78 changes: 39 additions & 39 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
<packaging>maven-plugin</packaging>
<name>Maven Bulk Deploy Plugin - ${project.version}</name>
<description><![CDATA[
Plugin that makes easy implementing BOM approach. It allows to install & deploy libraries from folder(s) generating BOM file.
Plugin that makes easy implementing BOM approach. It allows to install & deploy libraries from folder(s) generating BOM file.
]]></description>
<url>https://github.com/bsorrentino/maven-bulk-deploy</url>
<!--

<!--
<prerequisites>
<maven>3.5.0</maven>
</prerequisites>
-->
-->

<scm>
<developerConnection>scm:git:https://github.com/bsorrentino/maven-bulk-deploy.git</developerConnection>
<connection>scm:git:https://github.com/bsorrentino/maven-bulk-deploy.git</connection>
<developerConnection>scm:git:https://github.com/bsorrentino/maven-bulk-deploy.git</developerConnection>
<connection>scm:git:https://github.com/bsorrentino/maven-bulk-deploy.git</connection>
<url>https://github.com/bsorrentino/maven-bulk-deploy.git</url>
</scm>

Expand All @@ -37,11 +37,11 @@
</distributionManagement>

<properties>

<maven.version>3.5.4</maven.version>
<pluginTools.version>3.6.0</pluginTools.version>
<reports-plugin-version>2.4</reports-plugin-version>

<!-- SONATYPE REPO -->
<snapshot.repo.id>sonatype-repo</snapshot.repo.id>
<snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots</snapshot.repo.url>
Expand Down Expand Up @@ -86,7 +86,7 @@
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>

<dependencies>
<!-- Maven classes maintained as compatibility layer for tools done with Maven 2.
<dependency>
Expand All @@ -95,7 +95,7 @@
<version>${maven.version}</version>
</dependency>
-->

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Expand Down Expand Up @@ -133,9 +133,9 @@
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
<version>4.11</version>
<version>4.11</version>
</dependency>

</dependencies>

<reporting>
Expand Down Expand Up @@ -177,7 +177,7 @@
</reporting>

<build>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -188,7 +188,7 @@
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
Expand Down Expand Up @@ -241,22 +241,22 @@

<configuration>
</configuration>
</plugin>
</plugin>



<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>

</plugins>

</build>

<profiles>

<profile>
<id>release</id>
<build>
Expand Down Expand Up @@ -318,19 +318,19 @@
<phase>site</phase>
</execution>
</executions>
</plugin>
</plugin>


</plugins>
</build>
</profile>

<profile>
<id>softphone</id>
<build>
<plugins>
<!--

<!--
=======================
CONFLUENCE REPORT
=======================
Expand All @@ -350,7 +350,7 @@
<id>confluence</id>
<configuration>
<endPoint>${confluence.home}/rpc/xmlrpc</endPoint>
<serverId>softphone-server</serverId>
<serverId>softphone-server</serverId>
<spaceKey>DEV</spaceKey>
<parentPageTitle>Plugin</parentPageTitle>
<properties>
Expand All @@ -360,26 +360,26 @@
<label>maven</label>
<label>deploy</label>
</labels>

</configuration>
<reports>
<report>confluence-summary</report>
<report>confluence-summary</report>
</reports>
</reportSet>
</reportSets>
</reportSets>

</plugin>
</reportPlugins>
</configuration>
</plugin>


</plugins>


</build>
</profile>

</profile>

</profiles>
</project>
</project>
Loading

0 comments on commit 128a2be

Please sign in to comment.