Skip to content

Commit

Permalink
[infrastructure] fix release process (#37)
Browse files Browse the repository at this point in the history
- change from unleash-maven-plugin to maven-release-plugin
- fix missing javadoc on bundles
- fix wrong signature filename for features

Signed-off-by: Jan N. Klug <[email protected]>
  • Loading branch information
J-N-K authored Mar 21, 2021
1 parent 18757b1 commit 11aaab7
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 35 deletions.
30 changes: 30 additions & 0 deletions bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,36 @@
</plugins>
</build>
</profile>
<profile>
<id>javadoc</id>
<activation>
<file>
<exists>src/main/java</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>empty-javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${basedir}/javadoc</classesDirectory>
<skipIfEmpty>false</skipIfEmpty>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
49 changes: 48 additions & 1 deletion features/smarthomej-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>org.smarthomej.addons.features.karaf.smarthomej-addons</artifactId>
<packaging>feature</packaging>
<packaging>pom</packaging>

<name>SmartHome/J Add-ons :: Features :: Karaf :: Add-ons</name>
<description>SmartHome/J Add-ons Features</description>
Expand All @@ -27,6 +27,13 @@
</dependencies>

<build>
<resources>
<resource>
<targetPath>${project.build.directory}/feature</targetPath>
<filtering>true</filtering>
<directory>${project.basedir}/src/main/feature</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -61,6 +68,39 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>resources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<goals>
<goal>attach-artifact</goal>
</goals>
<phase>package</phase>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/feature/feature.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
Expand All @@ -72,6 +112,13 @@
</features>
</configuration>
</execution>
<execution>
<id>compile</id>
<goals>
<goal>features-generate-descriptor</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
38 changes: 4 additions & 34 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</developers>

<scm>
<connection>scm:git:[email protected]/smarthomej/addons.git</connection>
<developerConnection>scm:git:[email protected]/smarthomej/addons.git</developerConnection>
<connection>scm:git:[email protected]:smarthomej/addons.git</connection>
<developerConnection>scm:git:[email protected]:smarthomej/addons.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/smarthomej/addons</url>
</scm>
Expand Down Expand Up @@ -362,9 +362,10 @@ Import-Package: \\
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>3.0.0-M1</version>
<configuration>
<preparationGoals>clean install</preparationGoals>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
</plugin>

Expand Down Expand Up @@ -633,37 +634,6 @@ Import-Package: \\
</execution>
</executions>
</plugin>

<!-- unleash -->
<plugin>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-maven-plugin</artifactId>
<version>2.9.3</version>
<dependencies>
<!-- The next 3 dependencies were added due to https://github.com/shillner/unleash-scm-provider-git/issues/15 -->
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>5.3.0.201903130848-r</version>
</dependency>
<dependency>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-scm-provider-api</artifactId>
<version>2.9.3</version>
</dependency>
<!-- end -->
<dependency>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-scm-provider-git</artifactId>
<version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>

Expand Down

0 comments on commit 11aaab7

Please sign in to comment.