Skip to content

Commit 714a93f

Browse files
jglickjglick
authored
Merge pull request #7 from stapler/updates
Update to RELEASE121
2 parents 8765695 + 66dd766 commit 714a93f

File tree

8 files changed

+81
-106
lines changed

8 files changed

+81
-106
lines changed

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ pipeline {
66
}
77
agent {
88
docker {
9-
image 'maven:3.5.0-jdk-8'
9+
image 'maven:3.6.3-jdk-11'
1010
label 'docker'
1111
}
1212
}
1313
stages {
1414
stage('main') {
1515
steps {
16-
sh 'mvn -B -s settings-azure.xml -Dmaven.test.failure.ignore clean verify'
16+
sh 'mvn -B -ntp -Dmaven.test.failure.ignore clean verify'
1717
}
1818
post {
1919
success {

‎application/pom.xml‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,67 @@
6161
<artifactId>java</artifactId>
6262
<version>${netbeans.version}</version>
6363
<type>pom</type>
64+
<exclusions>
65+
<!-- Only a few of these are inherently necessary. -->
66+
<!-- The rest are due to the fact that java.kit depends on some, and more depend on java.kit, and more on them, etc. -->
67+
<!-- Perhaps it would be easier to give up on the whole cluster system and just include enough modules to run interactive tests. -->
68+
<exclusion>
69+
<groupId>org.netbeans.modules</groupId>
70+
<artifactId>org-netbeans-modules-debugger-jpda-kit</artifactId>
71+
</exclusion>
72+
<exclusion>
73+
<groupId>org.netbeans.modules</groupId>
74+
<artifactId>org-netbeans-modules-debugger-jpda-jsui</artifactId>
75+
</exclusion>
76+
<exclusion>
77+
<groupId>org.netbeans.modules</groupId>
78+
<artifactId>org-netbeans-modules-debugger-jpda-truffle</artifactId>
79+
</exclusion>
80+
<exclusion>
81+
<groupId>org.netbeans.modules</groupId>
82+
<artifactId>org-netbeans-modules-debugger-jpda-trufflenode</artifactId>
83+
</exclusion>
84+
<exclusion>
85+
<groupId>org.netbeans.modules</groupId>
86+
<artifactId>org-netbeans-modules-debugger-jpda-visual</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>org.netbeans.modules</groupId>
90+
<artifactId>org-netbeans-modules-form-kit</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>org.netbeans.modules</groupId>
94+
<artifactId>org-netbeans-modules-gradle-spring</artifactId>
95+
</exclusion>
96+
<exclusion>
97+
<groupId>org.netbeans.modules</groupId>
98+
<artifactId>org-netbeans-modules-java-kit</artifactId>
99+
</exclusion>
100+
<exclusion>
101+
<groupId>org.netbeans.modules</groupId>
102+
<artifactId>org-netbeans-modules-java-source-nbjavac</artifactId>
103+
</exclusion>
104+
<exclusion>
105+
<groupId>org.netbeans.modules</groupId>
106+
<artifactId>org-netbeans-modules-j2ee-persistence-kit</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>org.netbeans.modules</groupId>
110+
<artifactId>org-netbeans-modules-ko4j-debugging</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>org.netbeans.modules</groupId>
114+
<artifactId>org-netbeans-modules-maven-spring</artifactId>
115+
</exclusion>
116+
<exclusion>
117+
<groupId>org.netbeans.modules</groupId>
118+
<artifactId>org-netbeans-modules-nashorn-execution</artifactId>
119+
</exclusion>
120+
<exclusion>
121+
<groupId>org.netbeans.modules</groupId>
122+
<artifactId>org-netbeans-modules-spring-beans</artifactId>
123+
</exclusion>
124+
</exclusions>
64125
</dependency>
65126
<dependency>
66127
<groupId>org.netbeans.cluster</groupId>
@@ -89,7 +150,7 @@
89150
<build>
90151
<plugins>
91152
<plugin>
92-
<groupId>org.codehaus.mojo</groupId>
153+
<groupId>org.apache.netbeans.utilities</groupId>
93154
<artifactId>nbm-maven-plugin</artifactId>
94155
</plugin>
95156
<plugin>

‎application/src/test/java/org/kohsuke/stapler/netbeans/plugin/ApplicationTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ public class ApplicationTest extends NbTestCase {
1010
public static Test suite() {
1111
return NbModuleSuite.createConfiguration(ApplicationTest.class).
1212
gui(false).
13+
/* TODO fails with two exceptions: one about --jdkhome; another about jcl.over.slf4j_1.7.29 vs. org.slf4j
1314
failOnException(Level.INFO).
15+
*/
1416
enableClasspathModules(false). // #271423
1517
clusters(".*").
1618
/* TODO does not suffice to hide, e.g.: the modules [org.netbeans.modules.form.nb] use org.jdesktop.layout which is deprecated: Use javax.swing.GroupLayout instead. …

‎jenkins-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<build>
2828
<plugins>
2929
<plugin>
30-
<groupId>org.codehaus.mojo</groupId>
30+
<groupId>org.apache.netbeans.utilities</groupId>
3131
<artifactId>nbm-maven-plugin</artifactId>
3232
<extensions>true</extensions>
3333
<configuration>

‎pom.xml‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<pluginManagement>
3131
<plugins>
3232
<plugin>
33-
<groupId>org.codehaus.mojo</groupId>
33+
<groupId>org.apache.netbeans.utilities</groupId>
3434
<artifactId>nbm-maven-plugin</artifactId>
35-
<version>3.13</version>
35+
<version>4.5</version>
3636
<extensions>true</extensions>
3737
<configuration>
3838
<brandingToken>${brandingToken}</brandingToken>
@@ -42,10 +42,9 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>3.0</version>
45+
<version>3.8.1</version>
4646
<configuration>
47-
<source>1.${java.level}</source>
48-
<target>1.${java.level}</target>
47+
<release>11</release>
4948
</configuration>
5049
</plugin>
5150
<plugin>
@@ -56,26 +55,6 @@
5655
</plugins>
5756
</pluginManagement>
5857
<plugins>
59-
<plugin>
60-
<groupId>org.codehaus.mojo</groupId>
61-
<artifactId>animal-sniffer-maven-plugin</artifactId>
62-
<version>1.16</version>
63-
<executions>
64-
<execution>
65-
<phase>package</phase>
66-
<goals>
67-
<goal>check</goal>
68-
</goals>
69-
<configuration>
70-
<signature>
71-
<groupId>org.codehaus.mojo.signature</groupId>
72-
<artifactId>java1${java.level}</artifactId>
73-
<version>1.0</version>
74-
</signature>
75-
</configuration>
76-
</execution>
77-
</executions>
78-
</plugin>
7958
<plugin>
8059
<groupId>org.codehaus.gmaven</groupId>
8160
<artifactId>groovy-maven-plugin</artifactId>
@@ -116,8 +95,7 @@
11695
</modules>
11796

11897
<properties>
119-
<netbeans.version>RELEASE82</netbeans.version>
98+
<netbeans.version>RELEASE121</netbeans.version>
12099
<brandingToken>nb</brandingToken>
121-
<java.level>8</java.level>
122100
</properties>
123101
</project>

‎settings-azure.xml‎

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

‎stapler-plugin/pom.xml‎

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@
120120
<artifactId>org-openide-util-lookup</artifactId>
121121
<version>${netbeans.version}</version>
122122
</dependency>
123+
<dependency>
124+
<groupId>org.netbeans.api</groupId>
125+
<artifactId>org-netbeans-modules-java-project</artifactId>
126+
<version>${netbeans.version}</version>
127+
</dependency>
123128
<dependency>
124129
<groupId>org.netbeans.api</groupId>
125130
<artifactId>org-netbeans-modules-java-source-base</artifactId>
@@ -146,12 +151,6 @@
146151
<version>${netbeans.version}</version>
147152
<scope>test</scope>
148153
</dependency>
149-
<dependency>
150-
<groupId>org.netbeans.modules</groupId>
151-
<artifactId>org-netbeans-lib-nbjavac</artifactId>
152-
<version>${netbeans.version}</version>
153-
<scope>test</scope>
154-
</dependency>
155154
<dependency>
156155
<groupId>org.netbeans.modules</groupId>
157156
<artifactId>org-netbeans-modules-parsing-nb</artifactId>
@@ -173,15 +172,15 @@
173172
<dependency>
174173
<groupId>org.jenkins-ci.main</groupId>
175174
<artifactId>jenkins-core</artifactId>
176-
<version>1.466.2</version>
175+
<version>2.249.2</version>
177176
<scope>test</scope>
178177
</dependency>
179178
</dependencies>
180179

181180
<build>
182181
<plugins>
183182
<plugin>
184-
<groupId>org.codehaus.mojo</groupId>
183+
<groupId>org.apache.netbeans.utilities</groupId>
185184
<artifactId>nbm-maven-plugin</artifactId>
186185
<extensions>true</extensions>
187186
</plugin>
@@ -192,63 +191,6 @@
192191
<useDefaultManifestFile>true</useDefaultManifestFile>
193192
</configuration>
194193
</plugin>
195-
<plugin>
196-
<groupId>org.apache.maven.plugins</groupId>
197-
<artifactId>maven-dependency-plugin</artifactId>
198-
<version>2.6</version>
199-
<executions>
200-
<execution>
201-
<id>endorsed</id>
202-
<phase>validate</phase>
203-
<goals>
204-
<goal>copy</goal>
205-
</goals>
206-
</execution>
207-
</executions>
208-
<configuration>
209-
<outputDirectory>${endorsed.dir}</outputDirectory>
210-
<silent>true</silent>
211-
<artifactItems>
212-
<artifactItem>
213-
<groupId>org.netbeans.api</groupId>
214-
<artifactId>org-netbeans-libs-javacapi</artifactId>
215-
<version>${netbeans.version}</version>
216-
</artifactItem>
217-
<artifactItem>
218-
<groupId>org.netbeans.external</groupId>
219-
<artifactId>nb-javac-api</artifactId>
220-
<version>${netbeans.version}</version>
221-
</artifactItem>
222-
<artifactItem>
223-
<groupId>org.netbeans.modules</groupId>
224-
<artifactId>org-netbeans-libs-javacimpl</artifactId>
225-
<version>${netbeans.version}</version>
226-
</artifactItem>
227-
<artifactItem>
228-
<groupId>org.netbeans.external</groupId>
229-
<artifactId>nb-javac-impl</artifactId>
230-
<version>${netbeans.version}</version>
231-
</artifactItem>
232-
</artifactItems>
233-
</configuration>
234-
</plugin>
235-
<plugin>
236-
<groupId>org.apache.maven.plugins</groupId>
237-
<artifactId>maven-compiler-plugin</artifactId>
238-
<configuration>
239-
<compilerArguments>
240-
<endorseddirs>${endorsed.dir}</endorseddirs>
241-
</compilerArguments>
242-
</configuration>
243-
</plugin>
244-
<plugin>
245-
<groupId>org.apache.maven.plugins</groupId>
246-
<artifactId>maven-surefire-plugin</artifactId>
247-
<version>2.13</version>
248-
<configuration>
249-
<argLine>-Djava.endorsed.dirs=${endorsed.dir}</argLine>
250-
</configuration>
251-
</plugin>
252194
</plugins>
253195
</build>
254196
</project>

‎stapler-plugin/src/test/java/org/kohsuke/stapler/netbeans/plugin/ACLImpersonateHintTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@
2828
import java.net.URL;
2929
import org.acegisecurity.Authentication;
3030
import org.junit.Test;
31+
import org.kohsuke.stapler.StaplerProxy;
3132
import org.netbeans.modules.java.hints.test.api.HintTest;
3233
import org.openide.filesystems.FileUtil;
3334

3435
public class ACLImpersonateHintTest {
3536

3637
@Test public void warningIssued() throws Exception {
37-
HintTest.create().classpath(cpify(ACL.class), cpify(Authentication.class))
38+
HintTest.create().classpath(cpify(ACL.class), cpify(Authentication.class), cpify(StaplerProxy.class))
3839
.input("package test;\n"
3940
+ "import hudson.model.AbstractProject;\n"
4041
+ "import hudson.security.ACL;\n"

0 commit comments

Comments
 (0)