Skip to content

Commit

Permalink
Tidy POMs (#690)
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Brandes <mc.cache@web.de>
  • Loading branch information
NotMyFault authored Jan 12, 2024
1 parent dfd7502 commit 732b376
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 7 deletions.
6 changes: 4 additions & 2 deletions empty-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?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/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.jenkins.archetypes</groupId>
<artifactId>archetypes-parent</artifactId>
<version>1.24-SNAPSHOT</version>
</parent>

<groupId>io.jenkins.archetypes</groupId>
<artifactId>empty-plugin</artifactId>
<packaging>maven-archetype</packaging>

<name>Empty Jenkins Plugin</name>
<description>Skeleton of a Jenkins plugin with a POM and an empty source tree.</description>

Expand Down Expand Up @@ -57,5 +60,4 @@
</plugin>
</plugins>
</build>

</project>
3 changes: 3 additions & 0 deletions empty-plugin/src/main/resources/archetype-resources/pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.76</version>
<relativePath />
</parent>

<groupId>io.jenkins.plugins</groupId>
<artifactId>${artifactId}</artifactId>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>

<name>TODO Plugin</name>
#if( $hostOnJenkinsGitHub == "true" )<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>#end

Expand Down
5 changes: 4 additions & 1 deletion global-configuration/pom.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?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/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.jenkins.archetypes</groupId>
<artifactId>archetypes-parent</artifactId>
<version>1.24-SNAPSHOT</version>
</parent>

<artifactId>global-configuration-plugin</artifactId>
<packaging>maven-archetype</packaging>

<name>Global Configuration Jenkins Plugin</name>
<description>Skeleton of a Jenkins plugin with a POM and an example piece of global configuration.</description>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.76</version>
<relativePath />
</parent>

<groupId>io.jenkins.plugins</groupId>
<artifactId>${artifactId}</artifactId>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>

<name>TODO Plugin</name>
#if( $hostOnJenkinsGitHub == "true" )<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>#end

Expand Down
8 changes: 5 additions & 3 deletions hello-world/pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?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/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.jenkins.archetypes</groupId>
<artifactId>archetypes-parent</artifactId>
<version>1.24-SNAPSHOT</version>
</parent>

<groupId>io.jenkins.archetypes</groupId>
<artifactId>hello-world-plugin</artifactId>
<packaging>maven-archetype</packaging>

<name>Hello World Builder Jenkins Plugin</name>
<description>Skeleton of a Jenkins plugin with a POM and an example build step.</description>

Expand Down Expand Up @@ -57,5 +60,4 @@
</plugin>
</plugins>
</build>

</project>
</project>
3 changes: 3 additions & 0 deletions hello-world/src/main/resources/archetype-resources/pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.76</version>
<relativePath />
</parent>

<groupId>io.jenkins.plugins</groupId>
<artifactId>${artifactId}</artifactId>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>

<name>TODO Plugin</name>
#if( $hostOnJenkinsGitHub == "true" )<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>#end

Expand Down
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<?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/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.jenkins.tools</groupId>
<artifactId>central-repository-pom</artifactId>
<version>1.2</version>
<relativePath />
</parent>

<groupId>io.jenkins.archetypes</groupId>
<artifactId>archetypes-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jenkins Archetypes</name>
<description>Maven archetypes of useful things you may want to create in the Jenkins project.</description>

<!-- These developers currently have write access to release to sonatype OSS -->
<developers>
<developer>
Expand Down Expand Up @@ -52,20 +56,24 @@
</roles>
</developer>
</developers>

<modules>
<module>empty-plugin</module>
<module>hello-world</module>
<module>global-configuration</module>
</modules>

<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
<connection>scm:git:git@github.com/jenkinsci/archetypes.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/archetypes.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/jenkinsci/archetypes/</url>
</scm>

<properties>
<archetype.version>3.2.1</archetype.version>
</properties>

<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -102,6 +110,7 @@
</extension>
</extensions>
</build>

<profiles>
<profile>
<!-- integration tests are a bit slow, no need to run them twice per release -->
Expand Down

0 comments on commit 732b376

Please sign in to comment.