Skip to content

Commit

Permalink
Merge pull request fabric8io#1353 from jamesnetherton/bump-sample-ver…
Browse files Browse the repository at this point in the history
…sions

Update sample project versions to 4.0-SNAPSHOT
  • Loading branch information
rhuss authored Aug 9, 2018
2 parents 607aa3a + 73f940f commit 2ccfce1
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 30 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
* Refactor 949: Remove dependency from fabric8/fabric8
* Feature 1214: Don't use a default for skipBuildPom. This might break backwards compatibility, so please specify the desired value in case
* Fix 1093: Default tag for snapshot release is "latest", not the timestamp anymore
* Updated sample project versions to 4.0-SNAPSHOT

###3.5.40
* Feature 1264: Added `osio` profile, with enricher to apply OpenShift.io space labels to resources
Expand Down
4 changes: 2 additions & 2 deletions samples/custom-enricher/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>fabric8-maven-sample-custom-enricher-app</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>io.fabric8.samples.custom-enricher</groupId>
<artifactId>fabric8-maven-sample-custom-enricher-parent</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/custom-enricher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<artifactId>fabric8-maven-sample-custom-enricher-parent</artifactId>
<groupId>io.fabric8.samples.custom-enricher</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down
4 changes: 2 additions & 2 deletions samples/custom-enricher/secret-enricher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>fabric8-maven-sample-custom-enricher-secret</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>io.fabric8.samples.custom-enricher</groupId>
<artifactId>fabric8-maven-sample-custom-enricher-parent</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions samples/docker-compose/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<artifactId>springboot-docker-compose</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Fabric8 Maven :: Sample :: Springboot Docker compose</name>
Expand Down Expand Up @@ -67,7 +67,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>

<configuration>
<composeFile>docker-compose.yaml</composeFile>
Expand Down
2 changes: 1 addition & 1 deletion samples/external-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<artifactId>fabric8-maven-sample-external-resources</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Fabric8 Maven :: Sample :: External Reources</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty-app-it</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Fabric8 Maven :: Sample :: JavaEE 8 WebProfile :: IT</name>

<parent>
<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty-app</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>war</packaging>

<name>Fabric8 Maven :: Sample :: JavaEE 8 WebProfile :: Application</name>

<parent>
<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/javaee8-webprofile-liberty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Fabric8 Maven :: Sample :: JavaEE 8 WebProfile</name>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>javaee8-webprofile-liberty-app</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/secret-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<artifactId>fabric8-maven-sample-secret-config</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -51,7 +51,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion samples/secret-config/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM frolvlad/alpine-oraclejdk8:slim
VOLUME /tmp
ADD fabric8-maven-sample-secret-config-3.5-SNAPSHOT.jar app.jar
ADD fabric8-maven-sample-secret-config-4.0-SNAPSHOT.jar app.jar
RUN sh -c 'touch /app.jar'
ENV JAVA_OPTS=""
ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
4 changes: 2 additions & 2 deletions samples/spring-boot-with-yaml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<artifactId>fabric8-maven-sample-spring-boot-with-yaml</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>

<configuration>

Expand Down
4 changes: 2 additions & 2 deletions samples/spring-boot-without-route/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<artifactId>fabric8-maven-sample-spring-boot</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -77,7 +77,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>

<configuration>
<generateRoute>false</generateRoute>
Expand Down
4 changes: 2 additions & 2 deletions samples/spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<artifactId>fabric8-maven-sample-spring-boot</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -77,7 +77,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>

<configuration>

Expand Down
2 changes: 1 addition & 1 deletion samples/webapp-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-sample-webapp-jetty</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>war</packaging>
<build>
<finalName>fabric8-maven-sample-webapp-jetty</finalName>
Expand Down
2 changes: 1 addition & 1 deletion samples/webapp-wildfly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-sample-webapp-wildfly</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>war</packaging>
<build>
<finalName>fabric8-maven-sample-webapp-wildfly</finalName>
Expand Down
4 changes: 2 additions & 2 deletions samples/webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-sample-webapp</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>war</packaging>
<build>
<plugins>
Expand All @@ -34,7 +34,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion samples/xml-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>fabric8-maven-sample-xml-config</artifactId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Fabric8 Maven :: Samples :: XML configuration</name>
Expand Down
2 changes: 1 addition & 1 deletion samples/yaml-only/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<artifactId>fabric8-maven-sample-raw-with-yaml</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Fabric8 Maven :: Sample :: Yaml</name>
Expand Down
2 changes: 1 addition & 1 deletion samples/zero-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<artifactId>fabric8-maven-sample-zero-config</artifactId>
<groupId>io.fabric8</groupId>
<version>3.5-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
Expand Down

0 comments on commit 2ccfce1

Please sign in to comment.