Skip to content

Commit ce3f5d9

Browse files
fstabfstab
committed
Make project easier to work with in the Intellij IDE
1 parent 5ecd189 commit ce3f5d9

4 files changed

Lines changed: 92 additions & 8 deletions

File tree

‎integration_tests/it_java_versions/pom.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
<configuration>
7979
<source>1.6</source>
8080
<target>1.6</target>
81-
<!-- Intellij users: Intellij currently does not support different Java versions -->
82-
<!-- for sources and test sources, see https://youtrack.jetbrains.com/issue/IDEA-85478 -->
8381
<testSource>1.8</testSource>
8482
<testTarget>1.8</testTarget>
8583
</configuration>
@@ -91,6 +89,36 @@
9189
</plugins>
9290
</build>
9391

92+
<profiles>
93+
<profile>
94+
<!-- Intellij does not support different Java versions for source and testSource -->
95+
<!-- As a workaround, use Java 8 in Intellij. -->
96+
<!-- This will be fixed with https://youtrack.jetbrains.com/issue/IDEA-85478 -->
97+
<id>intellij</id>
98+
<activation>
99+
<activeByDefault>false</activeByDefault>
100+
<property>
101+
<!-- This property is only set when you open the project in Intellij. -->
102+
<!-- When you compile in the command line, the property will not be set -->
103+
<!-- and this profile will not be used. -->
104+
<name>idea.maven.embedder.version</name>
105+
</property>
106+
</activation>
107+
<build>
108+
<plugins>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-compiler-plugin</artifactId>
112+
<configuration>
113+
<source>1.8</source>
114+
<target>1.8</target>
115+
</configuration>
116+
</plugin>
117+
</plugins>
118+
</build>
119+
</profile>
120+
</profiles>
121+
94122
<licenses>
95123
<license>
96124
<name>The Apache Software License, Version 2.0</name>

‎integration_tests/it_log4j2/pom.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@
9797
<!-- downgrade to log4j 2.3 to run a quick test with Java 6. -->
9898
<source>1.6</source>
9999
<target>1.6</target>
100-
<!-- Intellij users: Intellij currently does not support different Java versions -->
101-
<!-- for sources and test sources, see https://youtrack.jetbrains.com/issue/IDEA-85478 -->
102100
<testSource>1.8</testSource>
103101
<testTarget>1.8</testTarget>
104102
</configuration>
@@ -110,6 +108,36 @@
110108
</plugins>
111109
</build>
112110

111+
<profiles>
112+
<profile>
113+
<!-- Intellij does not support different Java versions for source and testSource -->
114+
<!-- As a workaround, use Java 8 in Intellij. -->
115+
<!-- This will be fixed with https://youtrack.jetbrains.com/issue/IDEA-85478 -->
116+
<id>intellij</id>
117+
<activation>
118+
<activeByDefault>false</activeByDefault>
119+
<property>
120+
<!-- This property is only set when you open the project in Intellij. -->
121+
<!-- When you compile in the command line, the property will not be set -->
122+
<!-- and this profile will not be used. -->
123+
<name>idea.maven.embedder.version</name>
124+
</property>
125+
</activation>
126+
<build>
127+
<plugins>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-compiler-plugin</artifactId>
131+
<configuration>
132+
<source>1.8</source>
133+
<target>1.8</target>
134+
</configuration>
135+
</plugin>
136+
</plugins>
137+
</build>
138+
</profile>
139+
</profiles>
140+
113141
<licenses>
114142
<license>
115143
<name>The Apache Software License, Version 2.0</name>

‎integration_tests/it_pushgateway/pom.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
<configuration>
7676
<source>1.6</source>
7777
<target>1.6</target>
78-
<!-- Intellij users: Intellij currently does not support different Java versions -->
79-
<!-- for sources and test sources, see https://youtrack.jetbrains.com/issue/IDEA-85478 -->
8078
<testSource>1.8</testSource>
8179
<testTarget>1.8</testTarget>
8280
</configuration>
@@ -88,6 +86,36 @@
8886
</plugins>
8987
</build>
9088

89+
<profiles>
90+
<profile>
91+
<!-- Intellij does not support different Java versions for source and testSource -->
92+
<!-- As a workaround, use Java 8 in Intellij. -->
93+
<!-- This will be fixed with https://youtrack.jetbrains.com/issue/IDEA-85478 -->
94+
<id>intellij</id>
95+
<activation>
96+
<activeByDefault>false</activeByDefault>
97+
<property>
98+
<!-- This property is only set when you open the project in Intellij. -->
99+
<!-- When you compile in the command line, the property will not be set -->
100+
<!-- and this profile will not be used. -->
101+
<name>idea.maven.embedder.version</name>
102+
</property>
103+
</activation>
104+
<build>
105+
<plugins>
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-compiler-plugin</artifactId>
109+
<configuration>
110+
<source>1.8</source>
111+
<target>1.8</target>
112+
</configuration>
113+
</plugin>
114+
</plugins>
115+
</build>
116+
</profile>
117+
</profiles>
118+
91119
<licenses>
92120
<license>
93121
<name>The Apache Software License, Version 2.0</name>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
</executions>
174174
</plugin>
175175
<plugin>
176-
<artifactId>maven-release-plugin</artifactId>
177176
<groupId>org.apache.maven.plugins</groupId>
177+
<artifactId>maven-release-plugin</artifactId>
178178
<configuration>
179179
<autoVersionSubmodules>true</autoVersionSubmodules>
180180
<useReleaseProfile>false</useReleaseProfile>
@@ -183,8 +183,8 @@
183183
</configuration>
184184
</plugin>
185185
<plugin>
186-
<artifactId>maven-deploy-plugin</artifactId>
187186
<groupId>org.apache.maven.plugins</groupId>
187+
<artifactId>maven-deploy-plugin</artifactId>
188188
</plugin>
189189
<plugin>
190190
<groupId>org.apache.felix</groupId>

0 commit comments

Comments
 (0)