-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Example of updating to new parent 53 (unreleased yet)
Changes: * parent POM updated (53 not released yet!) * changed header as this is ASL2 project (default is EPL1) * mvn spotless:apply * mvn license:format
- Loading branch information
Showing
132 changed files
with
13,489 additions
and
12,617 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,40 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Copyright (c) 2014-2022 Takari, Inc. | ||
Copyright (c) 2014-2024 Takari, Inc. | ||
All rights reserved. This program and the accompanying materials | ||
are made available under the terms of the Eclipse Public License v1.0 | ||
which accompanies this distribution, and is available at | ||
http://www.eclipse.org/legal/epl-v10.html | ||
https://www.eclipse.org/legal/epl-v10.html | ||
--> | ||
|
||
<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"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
<groupId>io.takari</groupId> | ||
<artifactId>takari</artifactId> | ||
<version>52</version> | ||
<version>53-SNAPSHOT</version> | ||
</parent> | ||
|
||
<groupId>io.takari.maven.plugins</groupId> | ||
<artifactId>takari-lifecycle</artifactId> | ||
<version>2.1.4-SNAPSHOT</version> | ||
<packaging>pom</packaging> | ||
|
||
<modules> | ||
<module>takari-lifecycle-plugin</module> | ||
<!-- TODO consider moving integration tests to the main module --> | ||
<module>takari-lifecycle-plugin-its</module> | ||
</modules> | ||
|
||
<scm> | ||
<connection>scm:git:[email protected]/takari/takari-lifecycle-plugin.git</connection> | ||
<developerConnection>scm:git:ssh://[email protected]/takari/takari-lifecycle-plugin.git</developerConnection> | ||
<tag>takari-lifecycle-2.1.2</tag> | ||
<url>http://github.com/takari/takari-lifecycle-plugin</url> | ||
</scm> | ||
|
||
<properties> | ||
<mavenVersion>3.9.6</mavenVersion> | ||
<aetherVersion>1.9.18</aetherVersion> | ||
|
@@ -35,27 +47,14 @@ | |
<pluginTestingVersion>3.0.1</pluginTestingVersion> | ||
</properties> | ||
|
||
<scm> | ||
<connection>scm:git:[email protected]/takari/takari-lifecycle-plugin.git</connection> | ||
<developerConnection>scm:git:ssh://[email protected]/takari/takari-lifecycle-plugin.git</developerConnection> | ||
<url>http://github.com/takari/takari-lifecycle-plugin</url> | ||
<tag>takari-lifecycle-2.1.2</tag> | ||
</scm> | ||
|
||
<modules> | ||
<module>takari-lifecycle-plugin</module> | ||
<!-- TODO consider moving integration tests to the main module --> | ||
<module>takari-lifecycle-plugin-its</module> | ||
</modules> | ||
|
||
<build> | ||
<resources> | ||
<resource> | ||
<directory>src/main/resources</directory> | ||
</resource> | ||
<resource> | ||
<directory>src/main/resources-filtered</directory> | ||
<filtering>true</filtering> | ||
<directory>src/main/resources-filtered</directory> | ||
</resource> | ||
</resources> | ||
<pluginManagement> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 9 additions & 11 deletions
20
...fecycle-plugin-its/src/test/java/io/tesla/maven/plugins/test/AbstractIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,26 @@ | ||
package io.tesla.maven.plugins.test; | ||
|
||
import org.junit.Rule; | ||
import org.junit.runner.RunWith; | ||
|
||
import io.takari.maven.testing.TestProperties; | ||
import io.takari.maven.testing.TestResources; | ||
import io.takari.maven.testing.executor.MavenRuntime; | ||
import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder; | ||
import io.takari.maven.testing.executor.MavenVersions; | ||
import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner; | ||
import org.junit.Rule; | ||
import org.junit.runner.RunWith; | ||
|
||
@RunWith(MavenJUnitTestRunner.class) | ||
@MavenVersions({"3.6.3", "3.8.8", "3.9.6"}) | ||
public abstract class AbstractIntegrationTest { | ||
|
||
@Rule | ||
public final TestResources resources = new TestResources(); | ||
|
||
public final TestProperties properties = new TestProperties(); | ||
@Rule | ||
public final TestResources resources = new TestResources(); | ||
|
||
public final MavenRuntime verifier; | ||
public final TestProperties properties = new TestProperties(); | ||
|
||
public AbstractIntegrationTest(MavenRuntimeBuilder verifierBuilder) throws Exception { | ||
this.verifier = verifierBuilder.withCliOptions("-U", "-B").build(); | ||
} | ||
public final MavenRuntime verifier; | ||
|
||
public AbstractIntegrationTest(MavenRuntimeBuilder verifierBuilder) throws Exception { | ||
this.verifier = verifierBuilder.withCliOptions("-U", "-B").build(); | ||
} | ||
} |
Oops, something went wrong.