Skip to content

Commit

Permalink
Merge branch 'master' of github.com:consulo/consulo-junit
Browse files Browse the repository at this point in the history 
# Conflicts:
#	plugin/src/main/java/module-info.java
  • Loading branch information
@VISTALL
VISTALL committed Dec 29, 2024
2 parents 580c4ab + ad5817d commit a7a9aa4
Show file tree
Hide file tree
Showing 10 changed files with 795 additions and 263 deletions.
110 changes: 55 additions & 55 deletions junit-rt/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2013-2017 consulo.io
- Copyright 2013-2024 consulo.io
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
Expand All @@ -15,63 +15,63 @@
- limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>consulo</groupId>
<artifactId>arch.managment-low-java</artifactId>
<version>3-SNAPSHOT</version>
<relativePath/>
</parent>
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>consulo</groupId>
<artifactId>arch.managment-low-java</artifactId>
<version>3-SNAPSHOT</version>
<relativePath/>
</parent>

<groupId>consulo.plugin</groupId>
<artifactId>com.intellij.junit-junit.rt</artifactId>
<version>3-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>consulo.plugin</groupId>
<artifactId>com.intellij.junit-junit.rt</artifactId>
<version>3-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<java.level>1.8</java.level>
</properties>
<properties>
<java.level>1.8</java.level>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>com.intellij.junit.rt</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>com.intellij.junit.rt</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>consulo</id>
<url>https://maven.consulo.io/repository/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:60</updatePolicy>
</snapshots>
</repository>
</repositories>
<repositories>
<repository>
<id>consulo</id>
<url>https://maven.consulo.io/repository/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:60</updatePolicy>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>consulo.java-java.rt</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>consulo.java-java.rt</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
144 changes: 72 additions & 72 deletions junit5-rt/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2013-2017 consulo.io
- Copyright 2013-2024 consulo.io
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
Expand All @@ -15,82 +15,82 @@
- limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>consulo</groupId>
<artifactId>arch.managment-low-java</artifactId>
<version>3-SNAPSHOT</version>
<relativePath/>
</parent>
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>consulo</groupId>
<artifactId>arch.managment-low-java</artifactId>
<version>3-SNAPSHOT</version>
<relativePath/>
</parent>

<groupId>consulo.plugin</groupId>
<artifactId>com.intellij.junit-junit5.rt</artifactId>
<version>3-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>consulo.plugin</groupId>
<artifactId>com.intellij.junit-junit5.rt</artifactId>
<version>3-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<java.level>1.8</java.level>
</properties>
<properties>
<java.level>1.8</java.level>
</properties>

<repositories>
<repository>
<id>consulo</id>
<url>https://maven.consulo.io/repository/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:60</updatePolicy>
</snapshots>
</repository>
</repositories>
<repositories>
<repository>
<id>consulo</id>
<url>https://maven.consulo.io/repository/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:60</updatePolicy>
</snapshots>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>com.intellij.junit5.rt</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>com.intellij.junit5.rt</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>consulo.java-java.rt</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>consulo.java-java.rt</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>com.intellij.junit-junit.rt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>com.intellij.junit-junit.rt</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit a7a9aa4

Please sign in to comment.