Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
7a423d36
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a423d36
编写于
1月 22, 2016
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
[FIXED JENKINS-32493] Merging #2000.
上级
1f89b5a9
e7ead0ee
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
666 deletion
+3
-666
changelog.html
changelog.html
+3
-0
plugins/pom.xml
plugins/pom.xml
+0
-665
pom.xml
pom.xml
+0
-1
未找到文件。
changelog.html
浏览文件 @
7a423d36
...
...
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
"major RFE"
>
The official parent POM for plugins is now hosted in the
<code>
plugin-pom
</code>
repository, starting with version 2.0.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-32493"
>
issue 32493
</a>
)
<li
class=
"bug"
>
Under some conditions a build record could be loaded twice, leading to erratic behavior.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-22767"
>
issue 22767
</a>
)
...
...
plugins/pom.xml
已删除
100644 → 0
浏览文件 @
1f89b5a9
<?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
</groupId>
<artifactId>
jenkins
</artifactId>
<version>
1.35
</version>
<relativePath
/>
</parent>
<groupId>
org.jenkins-ci.plugins
</groupId>
<artifactId>
plugin
</artifactId>
<name>
Jenkins plugin POM
</name>
<version>
1.646-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<!--
We need the following because the artifactId=plugin but directoryName=plugins, and
Maven infers the wrong value if I don't specify it explicitly.
-->
<scm>
<connection>
scm:svn:https://svn.jenkins-ci.org/trunk/hudson/plugins/
</connection>
<developerConnection>
scm:svn:https://svn.jenkins-ci.org/trunk/hudson/plugins/
</developerConnection>
<url>
https://svn.jenkins-ci.org/trunk/hudson/plugins/
</url>
<tag>
HEAD
</tag>
</scm>
<issueManagement>
<system>
JIRA
</system>
<url>
http://issues.jenkins-ci.org/
</url>
</issueManagement>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<concurrency>
2
</concurrency>
<!-- may use e.g. 2C for 2 × (number of cores) -->
<!-- same version as in org.jenkins-ci.main:pom -->
<slf4jVersion>
1.7.7
</slf4jVersion>
<node.version>
4.0.0
</node.version>
<npm.version>
2.13.1
</npm.version>
</properties>
<dependencyManagement>
<!-- mark logging dependencies as provided by war -->
<dependencies>
<dependency>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
<version>
1.1.3
</version>
<scope>
provided
</scope>
<!-- by jcl-over-slf4j -->
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
1.2.17
</version>
<scope>
provided
</scope>
<!-- by log4j-over-slf4j -->
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-war
</artifactId>
<classifier>
war-for-test
</classifier>
<version>
1.646-SNAPSHOT
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-core
</artifactId>
<version>
1.646-SNAPSHOT
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-test-harness
</artifactId>
<version>
2.0
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.jenkins-ci
</groupId>
<artifactId>
test-annotations
</artifactId>
<version>
1.2
</version>
<scope>
test
</scope>
</dependency>
<!--
Maven is so brain-dead that when a dependency is like:
plugin -(provided)-> jenkins-core -(compile)-> stapler -(provided)-> servlet-api
Artifacts beyond the provided/provided dependency will not be made available to the plugin.
See this in DefaultArtifactFactory.createArtifact() in the maven-artifact module.
So for us to have servlet API in the classpath, we need to explicitly list servlet-api.
-->
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
servlet-api
</artifactId>
<version>
2.4
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<!-- for JRE requirement check annotation -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-annotations
</artifactId>
<version>
1.9
</version>
<scope>
provided
</scope>
<optional>
true
</optional>
<!-- no need to have this at runtime -->
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
${slf4jVersion}
</version>
<scope>
compile
</scope>
<!-- mark the API as optional so it is not packaged in the HPI but available during compile -->
<optional>
true
</optional>
</dependency>
<!-- make slf4j bindings to java.util.logging available during tests -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
log4j-over-slf4j
</artifactId>
<version>
${slf4jVersion}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
jcl-over-slf4j
</artifactId>
<version>
${slf4jVersion}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-jdk14
</artifactId>
<version>
${slf4jVersion}
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
<build>
<!--
Since new versions need to overwrite old versions, it's better
not to have version number in the .hpi file name.
-->
<finalName>
${project.artifactId}
</finalName>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<executions>
<execution>
<id>
enforce-banned-dependencies
</id>
<goals>
<goal>
enforce
</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>
org.sonatype.sisu:sisu-guice
</exclude>
<exclude>
log4j:log4j:*:jar:compile
</exclude>
<exclude>
log4j:log4j:*:jar:runtime
</exclude>
<exclude>
commons-logging:commons-logging:*:jar:compile
</exclude>
<exclude>
commons-logging:commons-logging:*:jar:runtime
</exclude>
</excludes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.jenkins-ci.tools
</groupId>
<artifactId>
maven-hpi-plugin
</artifactId>
<extensions>
true
</extensions>
<configuration>
<showDeprecation>
true
</showDeprecation>
<contextPath>
/jenkins
</contextPath>
</configuration>
</plugin>
<plugin>
<groupId>
org.kohsuke.stapler
</groupId>
<artifactId>
maven-stapler-plugin
</artifactId>
<!-- version specified in parent pom -->
<extensions>
true
</extensions>
</plugin>
<plugin>
<artifactId>
maven-release-plugin
</artifactId>
<!-- version specified in parent pom -->
<configuration>
<goals>
deploy
</goals>
</configuration>
</plugin>
<plugin>
<groupId>
org.jvnet.localizer
</groupId>
<artifactId>
maven-localizer-plugin
</artifactId>
<!-- version specified in parent pom -->
<executions>
<execution>
<goals>
<goal>
generate
</goal>
</goals>
<configuration>
<fileMask>
Messages.properties
</fileMask>
<outputDirectory>
target/generated-sources/localizer
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>
maven-javadoc-plugin
</artifactId>
<!-- version specified in parent pom -->
</plugin>
<plugin>
<groupId>
org.codehaus.gmaven
</groupId>
<artifactId>
gmaven-plugin
</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<id>
test-in-groovy
</id>
<!-- allow tests written in Groovy -->
<goals>
<goal>
generateTestStubs
</goal>
<goal>
testCompile
</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>
ant
</groupId>
<artifactId>
ant
</artifactId>
<version>
1.6.5
</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>
maven-surefire-plugin
</artifactId>
<version>
2.16
</version>
<configuration>
<systemProperties>
<property>
<name>
hudson.udp
</name>
<value>
33849
</value>
</property>
</systemProperties>
<reuseForks>
true
</reuseForks>
<forkCount>
${concurrency}
</forkCount>
</configuration>
</plugin>
<plugin>
<groupId>
com.cloudbees
</groupId>
<artifactId>
maven-license-plugin
</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<goals>
<goal>
process
</goal>
</goals>
<phase>
prepare-package
</phase>
<configuration>
<!--requireCompleteLicenseInfo>true</requireCompleteLicenseInfo-->
<generateLicenseXml>
target/${project.artifactId}/WEB-INF/licenses.xml
</generateLicenseXml>
<inlineScript>
<![CDATA[
filter {
def plugins = [] as Set
// collect all Jenkins plugins
models.entrySet().each { e ->
if (e.value.packaging=="hpi")
plugins.add(e.key.id)
}
// filter out dependencies that don't belong to this plugin
models.entrySet().removeAll(models.entrySet().findAll { e ->
def a = e.key;
if (a.dependencyTrail.size()>0
&&
plugins.contains(a.dependencyTrail[1]))
return true; // ignore transitive dependencies through other plugins
// if the dependency goes through jenkins core, we don't need to bundle it in the war
// because jenkins-core comes in the
<provided>
scope, I think this is a bug in Maven that it puts such
// dependencies into the artifact list.
if (a.dependencyTrail.find { trail -> trail.contains(":hudson-core:") || trail.contains(":jenkins-core:") })
return true;
return false;
})
}
]]>
</inlineScript>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<!--
Because Eclipse lacks JSR-269 support, put the output
to a different directory
-->
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-eclipse-plugin
</artifactId>
<configuration>
<buildOutputDirectory>
target/eclipse-classes
</buildOutputDirectory>
<additionalProjectnatures>
<!-- enable Groovy nature by default for DSLD support -->
<projectnature>
org.eclipse.jdt.groovy.core.groovyNature
</projectnature>
</additionalProjectnatures>
</configuration>
</plugin>
<!--
This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.
the plugins mention here are the ones we do not have direct control over, but are used for a jenkins plugin - all other
will be changed to in there source to support eclipse soon (hpi, license, localizer, access-modifier).
see also: http://wiki.eclipse.org/M2E_compatible_maven_plugins
-->
<plugin>
<groupId>
org.eclipse.m2e
</groupId>
<artifactId>
lifecycle-mapping
</artifactId>
<version>
1.0.0
</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<versionRange>
[1.0,)
</versionRange>
<goals>
<goal>
display-info
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore
/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.gmaven
</groupId>
<artifactId>
gmaven-plugin
</artifactId>
<versionRange>
[1.0,)
</versionRange>
<goals>
<goal>
testCompile
</goal>
<goal>
generateTestStubs
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore
/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<!-- make sure our code doesn't have 1.6 dependencies except where we know it -->
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
animal-sniffer-maven-plugin
</artifactId>
<version>
1.9
</version>
<executions>
<execution>
<goals>
<goal>
check
</goal>
</goals>
<phase>
test
</phase>
</execution>
</executions>
<configuration>
<!-- outside <execution> so that we can run 'animal-sniffer:check' from the top without breaking anything -->
<signature>
<groupId>
org.codehaus.mojo.signature
</groupId>
<artifactId>
java15
</artifactId>
<version>
1.0
</version>
</signature>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<extensions>
<extension>
<groupId>
org.kohsuke
</groupId>
<artifactId>
wagon-gitsite
</artifactId>
<version>
0.3.5
</version>
</extension>
</extensions>
</build>
<repositories>
<repository>
<id>
repo.jenkins-ci.org
</id>
<url>
http://repo.jenkins-ci.org/public/
</url>
<releases>
<enabled>
true
</enabled>
</releases>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>
repo.jenkins-ci.org
</id>
<url>
http://repo.jenkins-ci.org/public/
</url>
<releases>
<enabled>
true
</enabled>
</releases>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<site>
<id>
github-pages
</id>
<url>
gitsite:git@github.com/jenkinsci/maven-site.git:plugin-parent
</url>
</site>
<snapshotRepository>
<id>
maven.jenkins-ci.org
</id>
<url>
http://maven.jenkins-ci.org:8081/content/repositories/snapshots
</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>
all-tests
</id>
<activation>
<property>
<name>
!test
</name>
</property>
</activation>
<properties>
<maven.test.redirectTestOutputToFile>
true
</maven.test.redirectTestOutputToFile>
</properties>
</profile>
<profile>
<id>
node-classifier-linux
</id>
<activation>
<os>
<family>
Linux
</family>
<arch>
amd64
</arch>
</os>
</activation>
<properties>
<node.download.file>
node-v${node.version}-linux-x64.tar.gz
</node.download.file>
<node.download.classifier
/>
</properties>
</profile>
<profile>
<id>
node-classifier-mac
</id>
<activation>
<os>
<family>
mac
</family>
</os>
</activation>
<properties>
<node.download.file>
node-v${node.version}-darwin-x64.tar.gz
</node.download.file>
<node.download.classifier
/>
</properties>
</profile>
<profile>
<id>
node-classifier-windows
</id>
<activation>
<os>
<family>
windows
</family>
<arch>
x64
</arch>
</os>
</activation>
<properties>
<node.download.file>
win-x64/node.exe
</node.download.file>
<node.download.classifier>
/x64
</node.download.classifier>
</properties>
</profile>
<profile>
<id>
node-classifier-windows-amd64
</id>
<activation>
<os>
<family>
windows
</family>
<arch>
amd64
</arch>
</os>
</activation>
<properties>
<node.download.file>
win-x64/node.exe
</node.download.file>
<node.download.classifier>
/x64
</node.download.classifier>
</properties>
</profile>
<profile>
<id>
node-classifier-windows-x86
</id>
<activation>
<os>
<family>
windows
</family>
<arch>
x86
</arch>
</os>
</activation>
<properties>
<node.download.file>
win-x86/node.exe
</node.download.file>
<node.download.classifier
/>
</properties>
</profile>
<profile>
<id>
node-download
</id>
<activation>
<file>
<exists>
package.json
</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>
com.googlecode.maven-download-plugin
</groupId>
<artifactId>
download-maven-plugin
</artifactId>
<version>
1.2.1
</version>
<executions>
<execution>
<id>
get-node
</id>
<phase>
initialize
</phase>
<goals>
<goal>
wget
</goal>
</goals>
<configuration>
<url>
https://nodejs.org/dist/v${node.version}/${node.download.file}
</url>
<unpack>
false
</unpack>
<outputDirectory>
${project.build.directory}/frontend/v${node.version}${node.download.classifier}
</outputDirectory>
</configuration>
</execution>
<execution>
<id>
get-npm
</id>
<phase>
initialize
</phase>
<goals>
<goal>
wget
</goal>
</goals>
<configuration>
<url>
http://registry.npmjs.org/npm/-/npm-${npm.version}.tgz
</url>
<unpack>
false
</unpack>
<outputDirectory>
${project.build.directory}/frontend/
</outputDirectory>
<outputFileName>
npm-${npm.version}.tgz
</outputFileName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>
gulp-execution
</id>
<activation>
<file>
<exists>
gulpfile.js
</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<version>
1.3.1
</version>
<executions>
<execution>
<id>
enforce-versions
</id>
<goals>
<goal>
enforce
</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>
3.1.0
</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>
com.github.eirslett
</groupId>
<artifactId>
frontend-maven-plugin
</artifactId>
<version>
0.0.23
</version>
<executions>
<execution>
<phase>
initialize
</phase>
<id>
install node and npm
</id>
<goals>
<goal>
install-node-and-npm
</goal>
</goals>
<configuration>
<nodeVersion>
v${node.version}
</nodeVersion>
<npmVersion>
${npm.version}
</npmVersion>
<!-- Use the pre-download node and npm packages. See download-maven-plugin config above. -->
<downloadRoot>
${project.baseUri}target/frontend/
</downloadRoot>
</configuration>
</execution>
<execution>
<phase>
initialize
</phase>
<id>
npm install
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<!-- Note that this may not be omitted lest maven-release-plugin be confused (frontend-maven-plugin #109): -->
<arguments>
install
</arguments>
</configuration>
</execution>
<execution>
<phase>
generate-sources
</phase>
<id>
gulp bundle
</id>
<goals>
<goal>
gulp
</goal>
</goals>
<configuration>
<arguments>
bundle
</arguments>
</configuration>
</execution>
<execution>
<phase>
test
</phase>
<id>
gulp test
</id>
<goals>
<goal>
gulp
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>
clean-node
</id>
<activation>
<file>
<exists>
package.json
</exists>
</file>
<property>
<name>
cleanNode
</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-clean-plugin
</artifactId>
<configuration>
<filesets>
<fileset>
<directory>
node
</directory>
<followSymlinks>
false
</followSymlinks>
</fileset>
<fileset>
<directory>
node_modules
</directory>
<followSymlinks>
false
</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
pom.xml
浏览文件 @
7a423d36
...
...
@@ -52,7 +52,6 @@ THE SOFTWARE.
<module>
war
</module>
<module>
test
</module>
<module>
cli
</module>
<module>
plugins
</module>
</modules>
<scm>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录