Skip to content

Commit 005e559

Browse files
VlatombeVlatombe
authored
Merge branch 'master' into web-fragments
2 parents 01fdf90 + b5a5e04 commit 005e559

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+304
-456
lines changed

‎bom/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ THE SOFTWARE.
9191
<artifactId>guava</artifactId>
9292
<version>33.4.0-jre</version>
9393
</dependency>
94-
<dependency>
95-
<groupId>com.sun.solaris</groupId>
96-
<artifactId>embedded_su4j</artifactId>
97-
<version>1.1</version>
98-
</dependency>
9994
<dependency>
10095
<groupId>com.sun.xml.txw2</groupId>
10196
<artifactId>txw2</artifactId>
@@ -131,11 +126,6 @@ THE SOFTWARE.
131126
<artifactId>commons-lang</artifactId>
132127
<version>2.6</version>
133128
</dependency>
134-
<dependency>
135-
<groupId>io.jenkins.stapler</groupId>
136-
<artifactId>jenkins-stapler-support</artifactId>
137-
<version>1.1</version>
138-
</dependency>
139129
<dependency>
140130
<groupId>jakarta.servlet</groupId>
141131
<artifactId>jakarta.servlet-api</artifactId>

‎core/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ THE SOFTWARE.
116116
<artifactId>bridge-method-annotation</artifactId>
117117
<version>${bridge-method-injector.version}</version>
118118
</dependency>
119-
<dependency>
120-
<groupId>com.sun.solaris</groupId>
121-
<artifactId>embedded_su4j</artifactId>
122-
</dependency>
123119
<dependency>
124120
<groupId>com.sun.xml.txw2</groupId>
125121
<artifactId>txw2</artifactId>
@@ -166,10 +162,6 @@ THE SOFTWARE.
166162
<groupId>commons-lang</groupId>
167163
<artifactId>commons-lang</artifactId>
168164
</dependency>
169-
<dependency>
170-
<groupId>io.jenkins.stapler</groupId>
171-
<artifactId>jenkins-stapler-support</artifactId>
172-
</dependency>
173165
<dependency>
174166
<!-- needed by Jelly -->
175167
<groupId>jakarta.servlet.jsp.jstl</groupId>

‎core/src/main/java/hudson/os/SU.java‎

Lines changed: 0 additions & 180 deletions
This file was deleted.

‎core/src/main/java/jenkins/model/Jenkins.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5814,7 +5814,6 @@ public boolean shouldShowStackTrace() {
58145814
*
58155815
* @since 2.222
58165816
*/
5817-
@Restricted(Beta.class)
58185817
public static final Permission MANAGE = new Permission(PERMISSIONS, "Manage",
58195818
Messages._Jenkins_Manage_Description(),
58205819
ADMINISTER,

‎core/src/main/java/jenkins/security/stapler/StaplerAccessibleType.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2018, CloudBees, Inc.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
package jenkins.security.stapler;
26+
27+
import java.lang.annotation.Documented;
28+
import java.lang.annotation.ElementType;
29+
import java.lang.annotation.Retention;
30+
import java.lang.annotation.RetentionPolicy;
31+
import java.lang.annotation.Target;
32+
33+
/**
34+
* Explicitly tell Jenkins the annotated type is to be accessible by Stapler, i.e. getters and fields with this (return) type can be invoked.
35+
*/
36+
@Target(ElementType.TYPE)
37+
@Retention(RetentionPolicy.RUNTIME)
38+
@Documented
39+
public @interface StaplerAccessibleType {}

‎core/src/main/java/jenkins/security/stapler/StaplerDispatchable.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2018, CloudBees, Inc.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
package jenkins.security.stapler;
26+
27+
import java.lang.annotation.Documented;
28+
import java.lang.annotation.ElementType;
29+
import java.lang.annotation.Retention;
30+
import java.lang.annotation.RetentionPolicy;
31+
import java.lang.annotation.Target;
32+
33+
/**
34+
* Explicitly tell Jenkins the annotated element is to be dispatched by Stapler, if possible.
35+
*/
36+
@Target({ElementType.FIELD, ElementType.METHOD})
37+
@Retention(RetentionPolicy.RUNTIME)
38+
@Documented
39+
public @interface StaplerDispatchable {}

‎core/src/main/java/jenkins/security/stapler/StaplerFragments.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2019 CloudBees, Inc.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
package jenkins.security.stapler;
26+
27+
import java.lang.annotation.Documented;
28+
import java.lang.annotation.ElementType;
29+
import java.lang.annotation.Retention;
30+
import java.lang.annotation.RetentionPolicy;
31+
import java.lang.annotation.Target;
32+
33+
/**
34+
* Lists the view names that should be considered fragments and should not be directly dispatched.
35+
*
36+
* @since 1.1
37+
*/
38+
@Target(ElementType.TYPE)
39+
@Retention(RetentionPolicy.RUNTIME)
40+
@Documented
41+
public @interface StaplerFragments {
42+
String[] value() default {};
43+
}

‎core/src/main/java/jenkins/security/stapler/StaplerNotDispatchable.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2018, CloudBees, Inc.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
package jenkins.security.stapler;
26+
27+
import java.lang.annotation.Documented;
28+
import java.lang.annotation.ElementType;
29+
import java.lang.annotation.Retention;
30+
import java.lang.annotation.RetentionPolicy;
31+
import java.lang.annotation.Target;
32+
33+
/**
34+
* Explicitly tell Jenkins the annotated element is not to be dispatched by Stapler.
35+
*/
36+
@Target({ElementType.FIELD, ElementType.METHOD})
37+
@Retention(RetentionPolicy.RUNTIME)
38+
@Documented
39+
public @interface StaplerNotDispatchable {}

0 commit comments

Comments
 (0)