Skip to content

Commit c342b8e

Browse files
authored
Merge pull request #97 from scalecube/cleanup
2 parents ac53b28 + 90e77bd commit c342b8e

File tree

1 file changed

+14
-152
lines changed

1 file changed

+14
-152
lines changed

pom.xml

Lines changed: 14 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
24
<modelVersion>4.0.0</modelVersion>
35

46
<groupId>io.scalecube</groupId>
5-
<artifactId>scalecube-parent-pom</artifactId>
7+
<artifactId>scalecube-parent</artifactId>
68
<version>0.2.20-SNAPSHOT</version>
79
<packaging>pom</packaging>
810
<name>ScaleCube parent project</name>
@@ -22,8 +24,8 @@
2224

2325
<scm>
2426
<url>https://scalecube.io</url>
25-
<connection>scm:git:https://github.com/scalecube/scalecube-parent.git</connection>
26-
<developerConnection>scm:git:https://github.com/scalecube/scalecube-parent.git
27+
<connection>scm:git:https://github.com/scalecube/${project.artifactId}.git</connection>
28+
<developerConnection>scm:git:https://github.com/scalecube/${project.artifactId}.git
2729
</developerConnection>
2830
<tag>HEAD</tag>
2931
</scm>
@@ -43,7 +45,6 @@
4345
</developers>
4446

4547
<properties>
46-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4748
<!-- plugins versions -->
4849
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
4950
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
@@ -57,18 +58,16 @@
5758
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
5859
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
5960
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
61+
<com.puppycrawl.tools.checkstyle-version>8.14</com.puppycrawl.tools.checkstyle-version>
6062

6163
<!-- check style configuration -->
64+
<checkstyle.skip>false</checkstyle.skip>
6265
<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
63-
<com.puppycrawl.tools.checkstyle-version>8.14</com.puppycrawl.tools.checkstyle-version>
64-
65-
<dockerfile.repository>scalecube/${project.artifactId}</dockerfile.repository>
66-
<dockerfile.maven.version>1.4.13</dockerfile.maven.version>
67-
<dockerfile.maven.extension.version>1.4.6</dockerfile.maven.extension.version>
68-
<dockerfile.useMavenSettingsForAuth>true</dockerfile.useMavenSettingsForAuth>
69-
<dockerfile.googleContainerRegistryEnabled>false</dockerfile.googleContainerRegistryEnabled>
66+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7068

71-
<github.repository>${env.GITHUB_REPOSITORY}</github.repository>
69+
<distributionManagement.url>https://maven.pkg.github.com/scalecube/${project.artifactId}
70+
</distributionManagement.url>
7271
</properties>
7372

7473
<reporting>
@@ -96,39 +95,6 @@
9695
<generateBackupPoms>false</generateBackupPoms>
9796
</configuration>
9897
</plugin>
99-
<plugin>
100-
<artifactId>maven-jar-plugin</artifactId>
101-
<version>${maven-jar-plugin.version}</version>
102-
<configuration>
103-
<archive>
104-
<manifest>
105-
<addClasspath>true</addClasspath>
106-
<classpathPrefix>lib/</classpathPrefix>
107-
<mainClass>${mainClass}</mainClass>
108-
</manifest>
109-
</archive>
110-
<excludes>
111-
<exclude>META-INF/*.SF</exclude>
112-
</excludes>
113-
</configuration>
114-
</plugin>
115-
<plugin>
116-
<artifactId>maven-dependency-plugin</artifactId>
117-
<version>${maven-dependency-plugin.version}</version>
118-
<executions>
119-
<execution>
120-
<phase>package</phase>
121-
<goals>
122-
<goal>copy-dependencies</goal>
123-
</goals>
124-
<configuration>
125-
<overWriteReleases>false</overWriteReleases>
126-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
127-
<silent>true</silent>
128-
</configuration>
129-
</execution>
130-
</executions>
131-
</plugin>
13298
<plugin>
13399
<groupId>org.codehaus.mojo</groupId>
134100
<artifactId>xml-maven-plugin</artifactId>
@@ -222,7 +188,7 @@
222188
<message>The reactor is not valid</message>
223189
<ignoreModuleDependencies>true</ignoreModuleDependencies>
224190
</reactorModuleConvergence>
225-
<dependencyConvergence />
191+
<dependencyConvergence/>
226192
</rules>
227193
</configuration>
228194
</execution>
@@ -289,87 +255,6 @@
289255
</execution>
290256
</executions>
291257
</plugin>
292-
<!-- Docker -->
293-
<plugin>
294-
<groupId>com.spotify</groupId>
295-
<artifactId>dockerfile-maven-plugin</artifactId>
296-
<version>${dockerfile.maven.version}</version>
297-
<executions>
298-
<execution>
299-
<id>default</id>
300-
<goals>
301-
<goal>build</goal>
302-
</goals>
303-
<phase>install</phase>
304-
<configuration>
305-
<buildArgs>
306-
<EXECUTABLE_JAR>${project.build.finalName}</EXECUTABLE_JAR>
307-
<SERVICE_NAME>${project.artifactId}</SERVICE_NAME>
308-
<SERVICE_VERSION>${project.version}</SERVICE_VERSION>
309-
</buildArgs>
310-
<tag>latest</tag>
311-
</configuration>
312-
</execution>
313-
<execution>
314-
<id>extra-tag</id>
315-
<goals>
316-
<goal>tag</goal>
317-
</goals>
318-
<phase>install</phase>
319-
<configuration>
320-
<tag>${docker.image.extra-tag}</tag>
321-
</configuration>
322-
</execution>
323-
<execution>
324-
<id>push-extra-tags</id>
325-
<goals>
326-
<goal>push</goal>
327-
</goals>
328-
<phase>deploy</phase>
329-
<configuration>
330-
<tag>${docker.image.extra-tag}</tag>
331-
</configuration>
332-
</execution>
333-
<execution>
334-
<id>tag-version</id>
335-
<goals>
336-
<goal>tag</goal>
337-
</goals>
338-
<phase>install</phase>
339-
<configuration>
340-
<tag>${docker.image.tag}</tag>
341-
</configuration>
342-
</execution>
343-
<execution>
344-
<id>deployment</id>
345-
<goals>
346-
<goal>push</goal>
347-
</goals>
348-
<phase>deploy</phase>
349-
<configuration>
350-
<tag>latest</tag>
351-
</configuration>
352-
</execution>
353-
<execution>
354-
<id>tag-deployment</id>
355-
<goals>
356-
<goal>push</goal>
357-
</goals>
358-
<phase>deploy</phase>
359-
<configuration>
360-
<tag>${docker.image.tag}</tag>
361-
</configuration>
362-
</execution>
363-
</executions>
364-
<configuration>
365-
<repository>docker.pkg.github.com/${github.repository}/${project.artifactId}
366-
</repository>
367-
<username>${env.GITHUB_ACTOR}</username>
368-
<password>${env.GITHUB_TOKEN}</password>
369-
<googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
370-
<skipDockerInfo>true</skipDockerInfo>
371-
</configuration>
372-
</plugin>
373258
</plugins>
374259
</pluginManagement>
375260

@@ -394,36 +279,13 @@
394279
</build>
395280

396281
<profiles>
397-
<profile>
398-
<id>SkipDockerGoals</id>
399-
<activation>
400-
<activeByDefault>true</activeByDefault>
401-
</activation>
402-
<properties>
403-
<dockerfile.skip>true</dockerfile.skip>
404-
</properties>
405-
</profile>
406-
<profile>
407-
<id>RunDockerGoals</id>
408-
<activation>
409-
<os>
410-
<family>unix</family>
411-
</os>
412-
<file>
413-
<exists>/usr/bin/docker</exists>
414-
</file>
415-
</activation>
416-
<properties>
417-
<dockerfile.skip>false</dockerfile.skip>
418-
</properties>
419-
</profile>
420282
<profile>
421283
<id>deploy2Github</id>
422284
<distributionManagement>
423285
<repository>
424286
<id>github</id>
425287
<name>GitHub Packages</name>
426-
<url>https://maven.pkg.github.com/scalecube/scalecube-parent</url>
288+
<url>${distributionManagement.url}</url>
427289
</repository>
428290
</distributionManagement>
429291
</profile>

0 commit comments

Comments
 (0)