Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MJLINK-76] Cleanup aftr parent pom update #193

Merged
merged 2 commits into from
Jan 29, 2024
Merged

[MJLINK-76] Cleanup aftr parent pom update #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75eeb48
[MJLINK-76] Cleanup aftr parent pom update
slachiewicz Jan 29, 2024
81620ec
[MJLINK-69] our base is now Java 11
slachiewicz Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 2 additions & 39 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-jlink-plugin/</url>
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-jlink-plugin/</url>
</ciManagement>
<distributionManagement>
<site>
Expand All @@ -72,12 +72,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.0</version>
</dependency>

<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
Expand Down Expand Up @@ -158,37 +152,6 @@
<directory>src/main/filtered-resources</directory>
</resource>
</resources>
<pluginManagement>
<plugins>
<!-- remove with next parent upgrade -->
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
Expand Down Expand Up @@ -237,7 +200,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<environmentVariables>
<!--
! Prevent reading the .mavenrc or maven_pre.bat on Windows
! Prevent reading the .mavenrc or maven_pre.bat on Windows
! in integration tests.
-->
<MAVEN_SKIP_RC>1</MAVEN_SKIP_RC>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-26/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
4 changes: 1 addition & 3 deletions src/it/projects/MJLINK-3_improveVerboseOutput/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.9+
invoker.goals = clean install
invoker.goals = clean install
2 changes: 0 additions & 2 deletions src/it/projects/MJLINK-40_includeLocales/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.9+
invoker.goals = clean install
18 changes: 0 additions & 18 deletions src/it/projects/MJLINK-4_dependencyResolution/invoker.properties
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/it/projects/MJLINK-52_classifiers/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-52_classifiers_duplicate_classifier/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-52_classifiers_duplicate_default/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
invoker.buildResult = failure
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-52_classifiers_jarproject/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-6_allowSetJmodPath/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/MJLINK-9_reactor/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/bind-services/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/compress-0/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/compress-1/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/compress-2/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/disable-plugin/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/endian-big/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/endian/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/ignore-signing-information/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/no-header-files/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/no-man-pages/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/strip-debug/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/cli-options/suggest-providers/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean package
1 change: 0 additions & 1 deletion src/it/projects/setup-jar-module-info/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean install
1 change: 0 additions & 1 deletion src/it/projects/setup-jar/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 1.9+
invoker.goals = clean install