Skip to content

Commit 150ae65

Browse files
mpkorstanjempkorstanje
committed
Merge branch 'master' into develop-v5
2 parents bb94e26 + 622bb1c commit 150ae65

File tree

1 file changed

+7
-237
lines changed

1 file changed

+7
-237
lines changed

‎pom.xml

+7-237
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>io.cucumber</groupId>
3+
<parent>
4+
<groupId>io.cucumber</groupId>
5+
<artifactId>cucumber-parent</artifactId>
6+
<version>1.0.2</version>
7+
</parent>
48
<artifactId>cucumber-jvm</artifactId>
59
<version>5.0.0-SNAPSHOT</version>
610
<packaging>pom</packaging>
@@ -34,10 +38,6 @@
3438

3539

3640
<properties>
37-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
39-
<minimum.maven.version>3.3</minimum.maven.version>
40-
<outputDirectory>${project.build.directory}</outputDirectory>
4141
<gherkin.version>5.1.0</gherkin.version>
4242
<groovy.version>2.4.15</groovy.version>
4343
<picocontainer.version>2.15</picocontainer.version>
@@ -80,13 +80,6 @@
8080
<datatable.version>1.1.7</datatable.version>
8181
<project.Automatic-Module-Name></project.Automatic-Module-Name>
8282
</properties>
83-
<licenses>
84-
<license>
85-
<name>MIT License</name>
86-
<url>http://www.opensource.org/licenses/mit-license</url>
87-
<distribution>repo</distribution>
88-
</license>
89-
</licenses>
9083
<scm>
9184
<connection>scm:git:git://github.com/cucumber/cucumber-jvm.git</connection>
9285
<developerConnection>scm:git:[email protected]:cucumber/cucumber-jvm.git</developerConnection>
@@ -215,7 +208,7 @@
215208
<artifactId>spring-data-jpa</artifactId>
216209
<version>${spring.data.version}</version>
217210
<exclusions>
218-
<!-- Exclude the dependency on junit, which is older and clashes with our 4.11 junit dep -->
211+
<!-- Exclude the dependency on junit, which is older and clashes with our 4.12 junit dep -->
219212
<exclusion>
220213
<groupId>junit</groupId>
221214
<artifactId>junit-dep</artifactId>
@@ -489,28 +482,6 @@
489482
</dependencies>
490483
</dependencyManagement>
491484

492-
<!--
493-
this adds a repository that the plugins will use for dependency resolution
494-
Any items that we use in a plugin's <dependency> phase can be resolved from here, as well as central
495-
-->
496-
<pluginRepositories>
497-
<pluginRepository>
498-
<id>sonatype.org</id>
499-
<url>https://oss.sonatype.org/content/repositories/releases</url>
500-
</pluginRepository>
501-
</pluginRepositories>
502-
503-
<distributionManagement>
504-
<snapshotRepository>
505-
<id>ossrh</id>
506-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
507-
</snapshotRepository>
508-
<repository>
509-
<id>ossrh</id>
510-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
511-
</repository>
512-
</distributionManagement>
513-
514485
<modules>
515486
<module>core</module>
516487
<module>java</module>
@@ -536,50 +507,6 @@
536507
</modules>
537508
</profile>
538509

539-
<profile>
540-
<id>sign-source-javadoc</id>
541-
<build>
542-
<plugins>
543-
<plugin>
544-
<groupId>org.apache.maven.plugins</groupId>
545-
<artifactId>maven-source-plugin</artifactId>
546-
<executions>
547-
<execution>
548-
<id>attach-sources</id>
549-
<goals>
550-
<goal>jar-no-fork</goal>
551-
</goals>
552-
</execution>
553-
</executions>
554-
</plugin>
555-
<plugin>
556-
<groupId>org.apache.maven.plugins</groupId>
557-
<artifactId>maven-javadoc-plugin</artifactId>
558-
<executions>
559-
<execution>
560-
<id>attach-javadocs</id>
561-
<goals>
562-
<goal>jar</goal>
563-
</goals>
564-
</execution>
565-
</executions>
566-
</plugin>
567-
<plugin>
568-
<groupId>org.apache.maven.plugins</groupId>
569-
<artifactId>maven-gpg-plugin</artifactId>
570-
<executions>
571-
<execution>
572-
<phase>verify</phase>
573-
<goals>
574-
<goal>sign</goal>
575-
</goals>
576-
</execution>
577-
</executions>
578-
</plugin>
579-
</plugins>
580-
</build>
581-
</profile>
582-
583510
<profile>
584511
<id>coveralls.io</id>
585512
<build>
@@ -645,7 +572,6 @@
645572
<pluginManagement>
646573
<plugins>
647574
<!-- Standard plugins - alphabetically -->
648-
649575
<plugin>
650576
<groupId>org.apache.maven.plugins</groupId>
651577
<artifactId>maven-antrun-plugin</artifactId>
@@ -664,12 +590,6 @@
664590
</dependencies>
665591
</plugin>
666592

667-
<plugin>
668-
<groupId>org.apache.maven.plugins</groupId>
669-
<artifactId>maven-clean-plugin</artifactId>
670-
<version>3.0.0</version>
671-
</plugin>
672-
673593
<plugin>
674594
<groupId>org.apache.maven.plugins</groupId>
675595
<artifactId>maven-compiler-plugin</artifactId>
@@ -682,16 +602,9 @@
682602
</configuration>
683603
</plugin>
684604

685-
<plugin>
686-
<groupId>org.apache.maven.plugins</groupId>
687-
<artifactId>maven-gpg-plugin</artifactId>
688-
<version>1.6</version>
689-
</plugin>
690-
691605
<plugin>
692606
<groupId>org.apache.maven.plugins</groupId>
693607
<artifactId>maven-javadoc-plugin</artifactId>
694-
<version>3.0.0-M1</version>
695608
<configuration>
696609
<use>false</use>
697610
<excludePackageNames>io.cucumber.examples*,org.springframework</excludePackageNames>
@@ -716,89 +629,11 @@
716629
io.cucumber.spring:io.cucumber.weld:io.cucumber.guice:io.cucumber.needle:io.cucumber.picocontainer:io.cucumber.openejb
717630
</packages>
718631
</group>
719-
720632
</groups>
721-
<!-- Won't work for children, but works for top level javadoc:aggregate. Good enough. -->
722633
<stylesheet>java</stylesheet>
723634
</configuration>
724635
</plugin>
725636

726-
<plugin>
727-
<groupId>org.apache.maven.plugins</groupId>
728-
<artifactId>maven-jar-plugin</artifactId>
729-
<version>3.0.2</version>
730-
<configuration>
731-
<archive>
732-
<manifestEntries>
733-
<Automatic-Module-Name>${project.Automatic-Module-Name}</Automatic-Module-Name>
734-
</manifestEntries>
735-
</archive>
736-
</configuration>
737-
</plugin>
738-
739-
<plugin>
740-
<groupId>org.apache.maven.plugins</groupId>
741-
<artifactId>maven-project-info-reports-plugin</artifactId>
742-
<version>2.9</version>
743-
</plugin>
744-
745-
<plugin>
746-
<groupId>org.apache.maven.plugins</groupId>
747-
<artifactId>maven-release-plugin</artifactId>
748-
<version>2.5.3</version>
749-
<configuration>
750-
<tagNameFormat>v@{project.version}</tagNameFormat>
751-
</configuration>
752-
</plugin>
753-
754-
<plugin>
755-
<groupId>org.apache.maven.plugins</groupId>
756-
<artifactId>maven-site-plugin</artifactId>
757-
<version>3.6</version>
758-
</plugin>
759-
760-
<plugin>
761-
<groupId>org.apache.maven.plugins</groupId>
762-
<artifactId>maven-resources-plugin</artifactId>
763-
<version>3.0.2</version>
764-
</plugin>
765-
766-
<plugin>
767-
<groupId>org.apache.maven.plugins</groupId>
768-
<artifactId>maven-source-plugin</artifactId>
769-
<version>3.0.1</version>
770-
</plugin>
771-
772-
<plugin>
773-
<groupId>org.apache.maven.plugins</groupId>
774-
<artifactId>maven-surefire-plugin</artifactId>
775-
<version>2.20</version>
776-
<configuration>
777-
<argLine>-Duser.language=en</argLine>
778-
<argLine>-Xmx1024m</argLine>
779-
<argLine>-XX:MaxPermSize=256m</argLine>
780-
<argLine>-Dfile.encoding=UTF-8</argLine>
781-
<useFile>false</useFile>
782-
</configuration>
783-
<dependencies>
784-
<dependency>
785-
<groupId>org.junit.jupiter</groupId>
786-
<artifactId>junit-jupiter-engine</artifactId>
787-
<version>${junit-jupiter.version}</version>
788-
</dependency>
789-
<dependency>
790-
<groupId>org.junit.platform</groupId>
791-
<artifactId>junit-platform-engine</artifactId>
792-
<version>${junit-platform.version}</version>
793-
</dependency>
794-
<dependency>
795-
<groupId>org.junit.vintage</groupId>
796-
<artifactId>junit-vintage-engine</artifactId>
797-
<version>${junit-jupiter.version}</version>
798-
</dependency>
799-
</dependencies>
800-
</plugin>
801-
802637
<plugin>
803638
<groupId>org.apache.maven.plugins</groupId>
804639
<artifactId>maven-war-plugin</artifactId>
@@ -811,21 +646,6 @@
811646
<version>3.0.0</version>
812647
</plugin>
813648

814-
<plugin>
815-
<groupId>org.apache.maven.plugins</groupId>
816-
<artifactId>maven-deploy-plugin</artifactId>
817-
<version>2.8.2</version>
818-
</plugin>
819-
<plugin>
820-
<groupId>org.apache.maven.plugins</groupId>
821-
<artifactId>maven-install-plugin</artifactId>
822-
<version>2.5.2</version>
823-
</plugin>
824-
<plugin>
825-
<groupId>org.apache.maven.plugins</groupId>
826-
<artifactId>maven-enforcer-plugin</artifactId>
827-
<version>3.0.0-M1</version>
828-
</plugin>
829649
<plugin>
830650
<groupId>org.revapi</groupId>
831651
<artifactId>revapi-maven-plugin</artifactId>
@@ -862,11 +682,7 @@
862682
</analysisConfiguration>
863683
</configuration>
864684
</plugin>
865-
<plugin>
866-
<groupId>org.sonatype.plugins</groupId>
867-
<artifactId>nexus-staging-maven-plugin</artifactId>
868-
<version>1.6.7</version>
869-
</plugin>
685+
870686
</plugins>
871687
</pluginManagement>
872688

@@ -877,58 +693,12 @@
877693
<executions>
878694
<execution>
879695
<id>enforce</id>
880-
<configuration>
881-
<rules>
882-
<requireJavaVersion>
883-
<version>[1.8,)</version>
884-
</requireJavaVersion>
885-
<requireMavenVersion>
886-
<version>[${minimum.maven.version},)</version>
887-
</requireMavenVersion>
888-
<requirePluginVersions>
889-
<message>Best Practice is to always define plugin versions!</message>
890-
<banLatest>true</banLatest>
891-
<banRelease>true</banRelease>
892-
<banSnapshots>true</banSnapshots>
893-
<phases>clean,deploy,site</phases>
894-
</requirePluginVersions>
895-
<bannedDependencies>
896-
<excludes>
897-
<exclude>commons-logging</exclude>
898-
<!-- use slf4j -->
899-
<exclude>log4j</exclude>
900-
<!-- use slf4j -->
901-
</excludes>
902-
</bannedDependencies>
903-
</rules>
904-
</configuration>
905696
<goals>
906697
<goal>enforce</goal>
907698
</goals>
908699
</execution>
909700
</executions>
910701
</plugin>
911-
<plugin>
912-
<groupId>org.apache.maven.plugins</groupId>
913-
<artifactId>maven-release-plugin</artifactId>
914-
<configuration>
915-
<autoVersionSubmodules>true</autoVersionSubmodules>
916-
<useReleaseProfile>false</useReleaseProfile>
917-
<releaseProfiles>release</releaseProfiles>
918-
<goals>deploy</goals>
919-
</configuration>
920-
</plugin>
921-
<plugin>
922-
<groupId>org.sonatype.plugins</groupId>
923-
<artifactId>nexus-staging-maven-plugin</artifactId>
924-
<extensions>true</extensions>
925-
<configuration>
926-
<serverId>ossrh</serverId>
927-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
928-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
929-
<autoDropAfterRelease>true</autoDropAfterRelease>
930-
</configuration>
931-
</plugin>
932702
</plugins>
933703

934704
</build>

0 commit comments

Comments
 (0)