Skip to content

Commit

Permalink
Update to the new revapi-parent version to get the goodies.
Browse files Browse the repository at this point in the history
  • Loading branch information
metlos committed Sep 8, 2021
1 parent 6b1f7b5 commit 572fef1
Show file tree
Hide file tree
Showing 22 changed files with 252 additions and 320 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target/
*.ipr
*.iws
.idea/
*.bak
58 changes: 18 additions & 40 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2018-2020 Lukas Krejci
Copyright 2018-2021 Lukas Krejci
and other contributors as indicated by the @author tags.
Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,33 +19,27 @@
-->
<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>org.revapi</groupId>
<artifactId>revapi-build</artifactId>
<version>41</version>
<version>43</version>
</parent>

<groupId>org.revapi.testjars</groupId>
<artifactId>testjars-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<inceptionYear>2018</inceptionYear>

<organization>
<name>Lukas Krejci</name>
<url>http://lukas.krejci.pw</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<organization>
<name>Lukas Krejci</name>
<url>http://lukas.krejci.pw</url>
</organization>

<developers>
<developer>
<name>Lukas Krejci</name>
Expand All @@ -54,42 +48,26 @@
<timezone>+1</timezone>
</developer>
</developers>

<issueManagement>
<system>github-issues</system>
<url>https://github.com/revapi/testjars/issues</url>
</issueManagement>


<modules>
<module>testjars-core</module>
<module>testjars-junit4</module>
<module>testjars-junit5</module>
<module>testjars-maven-resolver</module>
</modules>
<scm>
<connection>scm:git:git://github.com/revapi/testjars.git</connection>
<developerConnection>scm:git:ssh://[email protected]/revapi/testjars.git</developerConnection>
<url>https://github.com/revapi/testjars</url>
<tag>HEAD</tag>
<url>https://github.com/revapi/testjars</url>
</scm>

<issueManagement>
<system>github-issues</system>
<url>https://github.com/revapi/testjars/issues</url>
</issueManagement>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>testjars-core</module>
<module>testjars-junit4</module>
<module>testjars-junit5</module>
<module>testjars-maven-resolver</module>
</modules>
</project>
38 changes: 4 additions & 34 deletions testjars-core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2018-2020 Lukas Krejci
Copyright 2018-2021 Lukas Krejci
and other contributors as indicated by the @author tags.
Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -18,50 +18,20 @@
-->
<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>
<artifactId>testjars-parent</artifactId>
<groupId>org.revapi.testjars</groupId>
<version>0.2.1-SNAPSHOT</version>
<artifactId>testjars-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>testjars-core</artifactId>

<properties>
<automatic.module.name>org.revapi.testjars.core</automatic.module.name>
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.1.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018 Lukas Krejci
* Copyright 2018-2021 Lukas Krejci
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -40,7 +40,7 @@ private static URI getSourceFileName() {
try {
return new URI(CLASS_NAME + ".java");
} catch (URISyntaxException e) {
//doesn't happen
// doesn't happen
return null;
}
}
Expand Down Expand Up @@ -73,8 +73,8 @@ private void generateIfNeeded() throws IOException {
return;
}

//notice that we don't actually need to generate any complicated code. Having the classes on the classpath
//is enough for them to be present in the model captured during the annotation processing.
// notice that we don't actually need to generate any complicated code. Having the classes on the classpath
// is enough for them to be present in the model captured during the annotation processing.
source = "@" + MarkerAnnotationObject.CLASS_NAME + "\npublic class " + CLASS_NAME + "\n{}\n";
}
}
Loading

0 comments on commit 572fef1

Please sign in to comment.