Skip to content

Allow easy consumption of beta restriction #98

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

Merged
jglick merged 2 commits into from
Apr 3, 2018
Merged

Allow easy consumption of beta restriction #98

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9cd00b
Allow easy consumption of beta restriction.
jglick Mar 26, 2018
9bc85f6
access-modifier.version=1.14
jglick Apr 3, 2018
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
23 changes: 21 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@
<maven-scm.version>1.9.5</maven-scm.version>
<!-- To skip the wizard by default in hpi:run. It should not impact other goals. -->
<hudson.Main.development>true</hudson.Main.development>
<access-modifier.version>1.14-SNAPSHOT</access-modifier.version> <!-- TODO https://github.com/kohsuke/access-modifier/pull/11 -->
<!-- After release, would just be ${access-modifier.version}: -->
<access-modifier-annotation.version>1.14-20180326.221427-2</access-modifier-annotation.version>
<access-modifier-checker.version>1.14-20180326.221430-2</access-modifier-checker.version>
<!-- To opt in to @Restricted(Beta.class) APIs, set to true: -->
<useBeta>false</useBeta>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -276,6 +282,12 @@
<version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<version>${access-modifier-annotation.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<!--
Expand Down Expand Up @@ -430,7 +442,7 @@
<plugin>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-checker</artifactId>
<version>1.13</version>
<version>${access-modifier-checker.version}</version>
</plugin>
<plugin>
<groupId>com.cloudbees</groupId>
Expand Down Expand Up @@ -539,7 +551,6 @@
<exclude>com.google.guava:guava</exclude> <!-- TODO needed for Jenkins 2.71 and earlier -->
<exclude>commons-logging:commons-logging</exclude> <!-- ditto -->
<exclude>com.google.code.findbugs:jsr305</exclude> <!-- ditto -->
<exclude>org.kohsuke:access-modifier-annotation</exclude> <!-- needed between Jenkins 2.36—2.60 -->
<exclude>net.java.dev.jna:jna</exclude> <!-- needed for Jenkins 1.585 and earlier -->
</excludes>
</requireUpperBoundDeps>
Expand Down Expand Up @@ -677,6 +688,14 @@
<plugin>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-checker</artifactId>
<configuration>
<properties>
<property>
<name>useBeta</name>
<value>${useBeta}</value>
</property>
</properties>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
Expand Down
20 changes: 20 additions & 0 deletions src/it/beta-fail/downstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-fail</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-fail</groupId>
<artifactId>downstream</artifactId>
<packaging>hpi</packaging>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.its.beta-fail</groupId>
<artifactId>upstream</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
7 changes: 7 additions & 0 deletions src/it/beta-fail/downstream/src/main/java/downstream/Caller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package downstream;
import upstream.Api;
public class Caller {
static {
Api.experimental();
}
}
2 changes: 2 additions & 0 deletions src/it/beta-fail/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
invoker.goals=clean install
invoker.buildResult=failure
36 changes: 36 additions & 0 deletions src/it/beta-fail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>@project.version@</version>
<relativePath/>
</parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-fail</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<jenkins.version>2.60.3</jenkins.version>
<java.level>8</java.level>
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
Copy link
Member

@batmat batmat Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this is just to shave off some build time?

Copy link
Member Author

@jglick jglick Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

</properties>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>upstream</module>
<module>downstream</module>
</modules>
</project>
3 changes: 3 additions & 0 deletions src/it/beta-fail/postbuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
assert new File(basedir, 'build.log').text.contains('[ERROR] downstream/Caller:5 upstream/Api.experimental()V is still in beta')

return true
13 changes: 13 additions & 0 deletions src/it/beta-fail/upstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-fail</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-fail</groupId>
<artifactId>upstream</artifactId>
<packaging>hpi</packaging>
</project>
7 changes: 7 additions & 0 deletions src/it/beta-fail/upstream/src/main/java/upstream/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package upstream;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.Beta;
public class Api {
@Restricted(Beta.class)
public static void experimental() {}
}
20 changes: 20 additions & 0 deletions src/it/beta-just-testing/downstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-just-testing</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-just-testing</groupId>
<artifactId>downstream</artifactId>
<packaging>hpi</packaging>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.its.beta-just-testing</groupId>
<artifactId>upstream</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
3 changes: 3 additions & 0 deletions src/it/beta-just-testing/downstream/src/main/java/downstream/NotCaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package downstream;
public class NotCaller {
}
7 changes: 7 additions & 0 deletions src/it/beta-just-testing/downstream/src/test/java/downstream/ApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package downstream;
import upstream.Api;
public class ApiTest {
static {
Api.experimental();
}
}
1 change: 1 addition & 0 deletions src/it/beta-just-testing/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invoker.goals=clean install
36 changes: 36 additions & 0 deletions src/it/beta-just-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>@project.version@</version>
<relativePath/>
</parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-just-testing</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<jenkins.version>2.7.3</jenkins.version>
<java.level>7</java.level>
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
</properties>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>upstream</module>
<module>downstream</module>
</modules>
</project>
13 changes: 13 additions & 0 deletions src/it/beta-just-testing/upstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-just-testing</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-just-testing</groupId>
<artifactId>upstream</artifactId>
<packaging>hpi</packaging>
</project>
7 changes: 7 additions & 0 deletions src/it/beta-just-testing/upstream/src/main/java/upstream/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package upstream;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.Beta;
public class Api {
@Restricted(Beta.class)
public static void experimental() {}
}
23 changes: 23 additions & 0 deletions src/it/beta-pass/downstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-pass</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-pass</groupId>
<artifactId>downstream</artifactId>
<packaging>hpi</packaging>
<properties>
<useBeta>true</useBeta>
</properties>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.its.beta-pass</groupId>
<artifactId>upstream</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
7 changes: 7 additions & 0 deletions src/it/beta-pass/downstream/src/main/java/downstream/Caller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package downstream;
import upstream.Api;
public class Caller {
static {
Api.experimental();
}
}
1 change: 1 addition & 0 deletions src/it/beta-pass/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invoker.goals=clean install
36 changes: 36 additions & 0 deletions src/it/beta-pass/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>@project.version@</version>
<relativePath/>
</parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-pass</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<jenkins.version>2.107.1</jenkins.version>
<java.level>8</java.level>
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
</properties>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>upstream</module>
<module>downstream</module>
</modules>
</project>
13 changes: 13 additions & 0 deletions src/it/beta-pass/upstream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins.its</groupId>
<artifactId>beta-pass</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.plugins.its.beta-pass</groupId>
<artifactId>upstream</artifactId>
<packaging>hpi</packaging>
</project>
7 changes: 7 additions & 0 deletions src/it/beta-pass/upstream/src/main/java/upstream/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package upstream;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.Beta;
public class Api {
@Restricted(Beta.class)
public static void experimental() {}
}