Use version.txt to correctly track and deploy snapshots.

komma · Oct 5, 2017 · 8466c6c · 8466c6c
1 parent 9365d9a
commit 8466c6c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/features/net.enilink.komma.updatesite/pom.xml b/features/net.enilink.komma.updatesite/pom.xml
@@ -12,4 +12,33 @@
 	<artifactId>net.enilink.komma.updatesite</artifactId>
 	<version>1.3.3-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/repository/</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+									<includes>
+										<include>version.txt</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/features/net.enilink.komma.updatesite/src/main/resources/version.txt b/features/net.enilink.komma.updatesite/src/main/resources/version.txt
@@ -0,0 +1 @@
+${qualifiedVersion}
diff --git a/releng/publish/pushToBintray.sh b/releng/publish/pushToBintray.sh
@@ -21,16 +21,20 @@ echo "BINTRAY_PCK_VERSION=$BINTRAY_PCK_VERSION"
 TAG=$(git describe --tags --exact-match 2>/dev/null)
 TAG=${TAG#v}
 
-if [ ! -z "$TAG" ]; then
-  BINTRAY_PCK_VERSION=$TAG
-fi
-
 if [ ! -z "$REPOSITORY_PATH" ]; then
   pushd "$REPOSITORY_PATH"
 else
   pushd .
 fi
 
+if [ ! -z "$TAG" ]; then
+# use current tag as version
+  BINTRAY_PCK_VERSION=$TAG
+elif [ -e "version.txt" ]; then
+# read version from file
+  BINTRAY_PCK_VERSION=$(<version.txt)
+fi
+
 FILES=(content.jar artifacts.jar plugins/* features/* binary/*)
 
 BINTRAY_PATH="$BINTRAY_OWNER/$BINTRAY_REPO/$BINTRAY_PCK_NAME/$BINTRAY_PCK_VERSION"