Skip to content

Commit

Permalink
Integrate into maven's build
Browse files Browse the repository at this point in the history
  • Loading branch information
gnodet committed Oct 27, 2024
1 parent 92a08b2 commit 887b641
Show file tree
Hide file tree
Showing 16 changed files with 94 additions and 206 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
*.css text
*.js text
*.sql text
*.jar binary
*.war binary
28 changes: 28 additions & 0 deletions apache-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,34 @@ under the License.
</plugins>
</build>
</profile>
<profile>
<id>run-its</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>create-distribution-dir</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<finalName>./</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<outputDirectory>${basedir}/target/maven</outputDirectory>
<descriptors>
<descriptor>src/assembly/dir.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>apache-release</id>
<build>
Expand Down
12 changes: 0 additions & 12 deletions its/.asf.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions its/.gitattributes

This file was deleted.

29 changes: 0 additions & 29 deletions its/.github/dependabot.yml

This file was deleted.

55 changes: 0 additions & 55 deletions its/.github/workflows/maven-verify.yml

This file was deleted.

1 change: 0 additions & 1 deletion its/.mvn/readme.txt

This file was deleted.

64 changes: 0 additions & 64 deletions its/Jenkinsfile

This file was deleted.

7 changes: 7 additions & 0 deletions its/core-it-suite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,13 @@ under the License.
<profile>
<id>run-its</id>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>apache-maven</artifactId>
<version>4.0.0-beta-6-SNAPSHOT</version>
<classifier>bin</classifier>
<type>zip</type>
</dependency>
<!-- not really used but will force download in the local repo used -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public static void serialize(Properties props, String key, Object value) {
} else if (value instanceof Map) {
Map map = (Map) value;
props.setProperty(key, Integer.toString(map.size()));
@SuppressWarnings("checkstyle:UnusedLocalVariable")
int i = 0;
for (Iterator it = map.keySet().iterator(); it.hasNext(); i++) {
Object k = it.next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ private static void store(Properties props, String key, Object obj, Collection v
} else if (obj instanceof Map) {
Map map = (Map) obj;
props.put(key, Integer.toString(map.size()));
@SuppressWarnings("checkstyle:UnusedLocalVariable")
int index = 0;
for (Iterator it = map.entrySet().iterator(); it.hasNext(); index++) {
Map.Entry entry = (Map.Entry) it.next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void execute() throws MojoExecutionException {
throw new MojoExecutionException(e.getMessage(), e);
}
try {
@SuppressWarnings("checkstyle:UnusedLocalVariable")
FileWagon theWagon = (FileWagon) fileWagon;
} catch (ClassCastException e) {
getLog().error("", e);
Expand All @@ -64,6 +65,7 @@ public void execute() throws MojoExecutionException {
throw new MojoExecutionException(e.getMessage(), e);
}
try {
@SuppressWarnings("checkstyle:UnusedLocalVariable")
ScpWagon theWagon = (ScpWagon) scpWagon;
} catch (ClassCastException e) {
getLog().error("", e);
Expand Down
8 changes: 4 additions & 4 deletions its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ under the License.
<name>Maven IT Plugin :: mng-7529 plugin</name>

<properties>
<maven-version>3.6.0</maven-version>
<maven3-version>3.6.0</maven3-version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven-version}</version>
<version>${maven3-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -50,13 +50,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven-version}</version>
<version>${maven3-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven-version}</version>
<version>${maven3-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public void execute() throws MojoExecutionException {
request.setMavenProject(project);
request.setRepositorySession(buildingRequest.getRepositorySession());

@SuppressWarnings("checkstyle:UnusedLocalVariable")
DependencyResolutionResult result = dependencyResolver.resolve(request);

getLog().info("Resolution successful, resolved ok");
Expand Down
11 changes: 5 additions & 6 deletions its/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ under the License.

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>41</version>
<relativePath />
<artifactId>maven</artifactId>
<version>4.0.0-beta-6-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.its</groupId>
Expand Down Expand Up @@ -71,10 +70,10 @@ under the License.
<maven.site.path>core-its</maven.site.path>
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
<rat.ignoreErrors>true</rat.ignoreErrors>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!-- <maven.compiler.source>8</maven.compiler.source>-->
<!-- <maven.compiler.target>8</maven.compiler.target>-->

<maven-version>3.8.6</maven-version>
<maven-version>4.0.0-beta-6-SNAPSHOT</maven-version>
<maven-plugin-tools-version>3.6.4</maven-plugin-tools-version>
</properties>

Expand Down
Loading

0 comments on commit 887b641

Please sign in to comment.