You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/05/03 07:40:11 UTC
[maven-compiler-plugin] 02/02: (doc) pom cleanup
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 7351a2961d8ff4fcc73cbae14550e9d59e897d03
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon May 3 09:32:04 2021 +0200
(doc) pom cleanup
---
.github/dependabot.yml | 17 +++++++++++++++++
pom.xml | 36 ++----------------------------------
src/it/MCOMPILER-197/pom.xml | 2 +-
3 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b76b895..778ea2a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
version: 2
updates:
- package-ecosystem: "maven"
diff --git a/pom.xml b/pom.xml
index 28734e9..6889879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@ under the License.
<groovyVersion>1.8.0</groovyVersion>
<groovyEclipseCompilerVersion>2.7.0-01</groovyEclipseCompilerVersion>
<groovy-eclipse-batch>2.0.4-04</groovy-eclipse-batch>
- <openJpaVersion>2.4.2</openJpaVersion>
<plexus-java.version>1.0.7</plexus-java.version>
<javaVersion>7</javaVersion>
<maven.it.failure.ignore>false</maven.it.failure.ignore>
@@ -210,20 +209,19 @@ under the License.
<configuration>
<excludes combine.children="append">
<exclude>.java-version</exclude>
- <exclude>.github/dependabot.yml</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-bytecode-version</id>
<configuration>
<rules>
<enforceBytecodeVersion>
- <maxJdkVersion>1.6</maxJdkVersion>
+ <maxJdkVersion>${javaVersion}</maxJdkVersion>
<excludes>
<exclude>org.ow2.asm:asm</exclude>
</excludes>
@@ -310,36 +308,6 @@ under the License.
</plugins>
</pluginManagement>
</build>
- <!--
- add those dependency just to have faster it test (for folks who doesn't have those locally
- they will be downloaded from local repo rather than central
- -->
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>${groovyEclipseCompilerVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-batch</artifactId>
- <version>${groovy-eclipse-batch}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovyVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openJpaVersion}</version>
- <!-- TODO: scope test? -->
- </dependency>
- </dependencies>
</profile>
</profiles>
</project>
diff --git a/src/it/MCOMPILER-197/pom.xml b/src/it/MCOMPILER-197/pom.xml
index f9621fe..353e10e 100644
--- a/src/it/MCOMPILER-197/pom.xml
+++ b/src/it/MCOMPILER-197/pom.xml
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>@openJpaVersion@</version>
+ <version>2.4.2</version>
</dependency>
</dependencies>
</plugin>