Skip to content

Commit

Permalink
Merge pull request #2542 from markheger/develop
Browse files Browse the repository at this point in the history 
pom.xml updated, #2522
  • Loading branch information
markheger committed Aug 6, 2020
2 parents 51e07c5 + 1e88665 commit 2422637
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 86 deletions.
11 changes: 6 additions & 5 deletions DEVELOPMENT.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,11 @@ For a pull request:
* At that point a branch is created vX_Y based off develop (e.g. v1_14)
* Bug fix releases of older releases are from the vX_Y branch

3. Change these two files to have the **equivalent** correct version:
3. Change these three files to have the **equivalent** correct version:

* `com.ibm.streamsx.topology/info.xml` - Uses SPL convention, e.g. for alpha 1.14.3_alpha, 1.14.5_beta, 1.14.8
* `com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py` - Use Python PEP396 convention, 1.14.3a, 1.14.5b, 1.14.8 - Note the third value is always bumped for a release within the same X.Y sequence.
* `release-pom.xml` - replace version for Maven Central
* `com.ibm.streamsx.topology/info.xml` - Uses SPL convention, e.g. for alpha 1.14.3_alpha, 1.14.5_beta, 1.14.8
* `com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py` - Use Python PEP396 convention, 1.14.3a, 1.14.5b, 1.14.8 - Note the third value is always bumped for a release within the same X.Y sequence.
* Once a GA (non-alpha, non-beta) release is made in an X.Y.Z series then all future releases X.Y.W (W>Z) are GA

3a. If creating an new X.Y+1 sequence (e.g. 1.15 replacing 1.14) then:
Expand All @@ -222,7 +223,7 @@ For a pull request:

4. Add and commit the two files changed **and push to IBMStreams**

* `git add com.ibm.streamsx.topology/info.xml com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py`
* `git add com.ibm.streamsx.topology/info.xml com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py release-pom.xml`
* `git commit -m "1.14.8 release"`
* `git push origin develop` using the release branch

Expand Down Expand Up @@ -251,6 +252,6 @@ For a pull request:

11. Deploy the release on Maven central

* `ant maven-deploy -Drelease-version=x.y.z`, for example release-version=1.15.8
* `ant maven-deploy`


5 changes: 2 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,26 +304,25 @@
</target>

<target name="maven-deploy" depends="prepare_mvn_files,nomaven" if="env.M2_HOME">
<property name="release-version" value="${release-version}" />
<exec executable="mvn" failonerror="true">
<arg value="--batch-mode"/>
<arg value="gpg:sign-and-deploy-file"/>
<arg value="-Dfile=release-streamsx.topology/maven/com.ibm.streamsx.topology.jar"/>
<arg value="-Dsources=release-streamsx.topology/maven/topology-sources.jar"/>
<arg value="-Djavadoc=release-streamsx.topology/maven/topology-javadoc.jar"/>
<arg value="-DpomFile=release-pom.xml"/>
<arg value="-DrepositoryId=ossrh"/>
<arg value="-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/"/>
<arg value="-Dversion=${release-version}"/>
</exec>
<exec executable="mvn" failonerror="true">
<arg value="--batch-mode"/>
<arg value="gpg:sign-and-deploy-file"/>
<arg value="-Dfile=release-streamsx.topology/maven/streamsx.topology.tgz"/>
<arg value="-DpomFile=release-pom.xml"/>
<arg value="-Dpackaging=tgz"/>
<arg value="-Dclassifier=toolkit"/>
<arg value="-DrepositoryId=ossrh"/>
<arg value="-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/"/>
<arg value="-Dversion=${release-version}"/>
</exec>
</target>

Expand Down
80 changes: 2 additions & 78 deletions release-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<groupId>com.ibm.streams</groupId>
<artifactId>streamsx.topology</artifactId>
<packaging>jar</packaging>
<version>1.15.9</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>Java API to allow creation of streaming applications for IBM Streams</description>
Expand All @@ -22,7 +23,7 @@

<developers>
<developer>
<name>IBMStreams</name>
<name>Mark-Oliver Heger</name>
<email>mark-oliver.heger@de.ibm.com</email>
<organization>IBMStreams</organization>
<organizationUrl>https://github.com/IBMStreams</organizationUrl>
Expand All @@ -36,81 +37,4 @@
<tag>HEAD</tag>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 2422637

Please sign in to comment.