← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy

« back to all changes in this revision

Viewing changes to war/pom.xml

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-01-10 09:50:50 UTC
  • mfrom: (5.1.10 experimental)
  • Revision ID: package-import@ubuntu.com-20130110095050-kj8xuw20gcfh62k3
Tags: 1.480.2+dfsg-1~exp1
http://bugs.debian.org/696816
http://bugs.debian.org/697617
* New upstream release (Closes: #696816, #697617):
  - d/control: Added new BD on libjbcrypt-java.
  - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-40.
  - d/control: Versioned BD jenkins-trilead-ssh2 >= 214-jenkins-1.
  - Fixes the following security vulnerabilities:
    CVE-2012-6072, CVE-2012-6073, CVE-2012-6072, CVE-2013-0158.
* Tidied lintian warnings.
* Bumped Standards-Version: 3.9.4, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
war/pom.xml
28
28
  <parent>
29
29
    <groupId>org.jenkins-ci.main</groupId>
30
30
    <artifactId>pom</artifactId>
31
 
    <version>1.466.2</version>
 
31
    <version>1.480.2</version>
32
32
    <relativePath>../pom.xml</relativePath>
33
33
  </parent>
34
34
 
71
71
          <groupId>javax.servlet</groupId>
72
72
          <artifactId>jsp-api</artifactId>
73
73
        </exclusion>
 
74
        <!-- Stapler 1.195 fails to declare this as optional, and the 1.1 version lacks a license: -->
 
75
        <exclusion>
 
76
          <artifactId>metainf-services</artifactId>
 
77
          <groupId>org.kohsuke.metainf-services</groupId>
 
78
        </exclusion>
74
79
      </exclusions>
75
80
    </dependency>
76
81
    <!-- declare this in reactors, so i can use now directly : mvn install -pl war -am to get the war  -->
99
104
      -->
100
105
      <groupId>org.jenkins-ci</groupId>
101
106
      <artifactId>winstone</artifactId>
102
 
      <version>0.9.10-jenkins-36</version>
 
107
      <version>0.9.10-jenkins-40</version>
103
108
      <scope>test</scope>
104
109
    </dependency>
105
110
    <dependency>
106
111
      <groupId>org.jenkins-ci.modules</groupId>
107
112
      <artifactId>instance-identity</artifactId>
108
 
      <version>1.1</version>
 
113
      <version>1.2</version>
109
114
    </dependency>
110
115
    <dependency>
111
116
      <groupId>org.jenkins-ci.modules</groupId>
305
310
          -->
306
311
          <reload>manual</reload>
307
312
          <connectors>
308
 
            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
 
313
            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
309
314
                <port>${port}</port>
310
315
            </connector>
311
316
          </connectors>
319
324
            -->
320
325
            <additionalClassesDirectory>../core/target/classes</additionalClassesDirectory>
321
326
          </additionalClassesDirectories>
322
 
          <userRealms>
323
 
            <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
 
327
          <loginServices>
 
328
            <loginService implementation="org.eclipse.jetty.security.HashLoginService">
324
329
              <name>default</name>
325
330
              <config>${basedir}/src/realm.properties</config>
326
 
            </userRealm>
327
 
          </userRealms>
 
331
            </loginService>
 
332
          </loginServices>
328
333
          <systemProperties>
329
334
            <systemProperty>
330
335
              <name>JENKINS_HOME</name>
360
365
              <value><!-- run "mvn install" once will generate the.hpl -->
361
366
                  ${basedir}/../maven-plugin/target/test-classes/the.hpl,
362
367
                  ${basedir}/../ui-samples-plugin/target/test-classes/the.hpl,
363
 
                  ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins/javadoc.hpi
 
368
                  ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins/*.hpi
364
369
              </value>
365
370
            </systemProperty>
366
371
            <systemProperty>
378
383
              <value>true</value>
379
384
            </systemProperty>
380
385
          </systemProperties>
 
386
          <webApp>
 
387
            <configurationDiscovered>false</configurationDiscovered>
 
388
          </webApp>
381
389
        </configuration>
382
390
      </plugin>
383
391
    </plugins>