Skip to content

Commit 4ba409c

Browse files
jpwsuttonjpwsutton
committed
Bumping version to 1.1.0
Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
1 parent b05daf9 commit 4ba409c

20 files changed

Lines changed: 358 additions & 358 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ tmp/**/*
1010
*~.nib
1111
local.properties
1212
.loadpath
13+
*.log
14+
org.eclipse.paho.client.mqttv3.test/TakeOverClient-*
1315

1416
# External tool builders
1517
.externalToolBuilders/

‎org.eclipse.paho.client.eclipse.feature/feature.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
id="org.eclipse.paho.client.eclipse.feature"
44
label="%featureName"
55
provider-name="%providerName"
6-
version="1.0.3.qualifier">
6+
version="1.1.0">
77

88
<description url="http://www.eclipse.org/paho/">
99
%description
1010
</description>
11-
11+
1212
<copyright url="http://www.eclipse.org/legal/copyright.php">
1313
%copyright
1414
</copyright>

‎org.eclipse.paho.client.eclipse.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.paho</groupId>
66
<artifactId>java-parent</artifactId>
7-
<version>1.0.3-SNAPSHOT</version>
7+
<version>1.1.0</version>
88
</parent>
99

1010
<artifactId>org.eclipse.paho.client.eclipse.feature</artifactId>

‎org.eclipse.paho.client.eclipse.view/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %bundle.name
44
Bundle-SymbolicName: org.eclipse.paho.client.eclipse.view;singleton:=true
5-
Bundle-Version: 1.0.3.qualifier
5+
Bundle-Version: 1.1.0
66
Bundle-Activator: org.eclipse.paho.client.eclipse.view.Activator
77
Bundle-Vendor: %bundle.provider
88
Bundle-Localization: plugin

‎org.eclipse.paho.client.eclipse.view/pom.xml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<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/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.eclipse.paho</groupId>
6-
<artifactId>java-parent</artifactId>
7-
<version>1.0.3-SNAPSHOT</version>
8-
</parent>
9-
10-
<artifactId>org.eclipse.paho.client.eclipse.view</artifactId>
11-
<packaging>eclipse-plugin</packaging>
12-
13-
<build>
14-
<plugins>
15-
<plugin>
16-
<groupId>org.eclipse.tycho</groupId>
17-
<artifactId>tycho-maven-plugin</artifactId>
18-
</plugin>
19-
20-
<plugin>
21-
<groupId>org.eclipse.tycho</groupId>
22-
<artifactId>tycho-compiler-plugin</artifactId>
23-
<version>${tycho.version}</version>
24-
<configuration>
25-
<encoding>${project.build.sourceEncoding}</encoding>
26-
<source>${java.version}</source>
27-
<target>${java.version}</target>
28-
</configuration>
29-
</plugin>
30-
31-
<plugin>
32-
<groupId>org.apache.maven.plugins</groupId>
33-
<artifactId>maven-resources-plugin</artifactId>
34-
<version>2.4.2</version>
35-
<executions>
36-
<execution>
37-
<id>default-copy-resources</id>
38-
<phase>process-resources</phase>
39-
<goals>
40-
<goal>copy-resources</goal>
41-
</goals>
42-
<configuration>
43-
<overwrite>true</overwrite>
44-
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
45-
<resources>
46-
<resource>
47-
<directory>../</directory>
48-
<includes>
49-
<include>about.html</include>
50-
</includes>
51-
</resource>
52-
</resources>
53-
</configuration>
54-
</execution>
55-
</executions>
56-
</plugin>
57-
</plugins>
58-
</build>
59-
</project>
60-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.eclipse.paho</groupId>
6+
<artifactId>java-parent</artifactId>
7+
<version>1.1.0</version>
8+
</parent>
9+
10+
<artifactId>org.eclipse.paho.client.eclipse.view</artifactId>
11+
<packaging>eclipse-plugin</packaging>
12+
13+
<build>
14+
<plugins>
15+
<plugin>
16+
<groupId>org.eclipse.tycho</groupId>
17+
<artifactId>tycho-maven-plugin</artifactId>
18+
</plugin>
19+
20+
<plugin>
21+
<groupId>org.eclipse.tycho</groupId>
22+
<artifactId>tycho-compiler-plugin</artifactId>
23+
<version>${tycho.version}</version>
24+
<configuration>
25+
<encoding>${project.build.sourceEncoding}</encoding>
26+
<source>${java.version}</source>
27+
<target>${java.version}</target>
28+
</configuration>
29+
</plugin>
30+
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-resources-plugin</artifactId>
34+
<version>2.4.2</version>
35+
<executions>
36+
<execution>
37+
<id>default-copy-resources</id>
38+
<phase>process-resources</phase>
39+
<goals>
40+
<goal>copy-resources</goal>
41+
</goals>
42+
<configuration>
43+
<overwrite>true</overwrite>
44+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
45+
<resources>
46+
<resource>
47+
<directory>../</directory>
48+
<includes>
49+
<include>about.html</include>
50+
</includes>
51+
</resource>
52+
</resources>
53+
</configuration>
54+
</execution>
55+
</executions>
56+
</plugin>
57+
</plugins>
58+
</build>
59+
</project>
60+

‎org.eclipse.paho.client.mqttv3.internal.traceformat/build.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
<property name="ship.folder" value="./target/ship" />
88
<!-- classpath.folder = ship.folder of org.eclipse.paho.client.mqttv3 build.xml -->
99
<property name="classpath.folder" value="../org.eclipse.paho.client.mqttv3/target/ship" />
10-
11-
<property name="client.release.version" value="1.0.3.qualifier" />
12-
<property name="bundleVersion" value="1.0.3.qualifier" />
10+
11+
<property name="client.release.version" value="1.1.0" />
12+
<property name="bundleVersion" value="1.1.0" />
1313
<property name="bundleVendor" value="Eclipse.org" />
1414
<property name="build.level" value="LYYMMDD" />
1515
<property name="paho-client-v3-trace-jar" value="org.eclipse.paho.client.mqttv3.trace.jar" />
1616
<property name="paho-client-v3-trace-source-jar" value="org.eclipse.paho.client.mqttv3.tracesource.jar" />
17-
17+
1818
<property name="javac_target" value="1.2" />
1919
<property name="javac_source" value="1.2" />
2020

2121
<path id="classpath">
2222
<fileset dir="${classpath.folder}">
2323
<include name="*.jar" />
24-
</fileset>
24+
</fileset>
2525
</path>
26-
26+
2727
<pathconvert pathsep="${line.separator}| |-- " property="formatted.classpath" refid="classpath" />
2828
<echo message="|-- classpath:" />
2929
<echo message="| |-- ${formatted.classpath}" />
30-
30+
3131
<target name="updateManifest" description="Update manifest file.">
3232
<manifest file="${folder}/META-INF/MANIFEST.MF" mode="update">
3333
<attribute name="Bundle-Version" value="${bundleVersion}" />
@@ -45,7 +45,7 @@
4545
</then>
4646
</if>
4747
</target>
48-
48+
4949
<target name="compile">
5050
<mkdir dir="${output.folder}/bin" />
5151
<mkdir dir="${output.folder}/src" />
@@ -57,44 +57,44 @@
5757
<include name="**/TracePoint.java" />
5858
</fileset>
5959
</copy>
60-
<javac srcdir="${output.folder}/src"
61-
destdir="${output.folder}/bin"
62-
source="${javac_source}"
63-
target="${javac_target}"
64-
debug="true"
60+
<javac srcdir="${output.folder}/src"
61+
destdir="${output.folder}/bin"
62+
source="${javac_source}"
63+
target="${javac_target}"
64+
debug="true"
6565
includeantruntime="false">
66-
66+
6767
<classpath refid="classpath" />
6868
</javac>
69-
69+
7070
<delete file="${output.folder}/bin/org/eclipse/paho/client/mqttv3/internal/trace/TracePointExtractor.class" />
7171
<mkdir dir="${output.folder}/bin/META-INF" />
72-
72+
7373
<antcall target="updateManifest">
7474
<param name="folder" value="${output.folder}/bin" />
7575
<param name="bundle_classpath" value="." />
7676
</antcall>
7777
</target>
7878

79-
79+
8080
<target name="package">
8181
<mkdir dir="${ship.folder}" />
82-
<jar jarfile="${ship.folder}/${paho-client-v3-trace-jar}"
82+
<jar jarfile="${ship.folder}/${paho-client-v3-trace-jar}"
8383
basedir="${output.folder}/bin"
8484
manifest="${output.folder}/bin/META-INF/MANIFEST.MF" >
8585
</jar>
86-
<jar jarfile="${ship.folder}/${paho-client-v3-trace-source-jar}"
86+
<jar jarfile="${ship.folder}/${paho-client-v3-trace-source-jar}"
8787
basedir="${source.folder}/src">
8888
</jar>
8989
</target>
90-
91-
90+
91+
9292
<target name="clean">
9393
<delete dir="${output.folder}" />
9494
<delete file="${ship.folder}/${paho-client-v3-trace-jar}" />
9595
<delete file="${ship.folder}/${paho-client-v3-trace-source-jar}" />
9696
</target>
97-
97+
9898
<target name="full" depends="compile,package" />
9999

100100
</project>

‎org.eclipse.paho.client.mqttv3.repository/category.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<bundle id="org.eclipse.paho.client.mqttv3" version="1.0.3.qualifier">
3+
<bundle id="org.eclipse.paho.client.mqttv3" version="1.1.0">
44
<category name="Paho MQTT Java"/>
55
</bundle>
6-
<bundle id="org.eclipse.paho.client.eclipse.view" version="1.0.3.qualifier">
6+
<bundle id="org.eclipse.paho.client.eclipse.view" version="1.1.0">
77
<category name="Paho MQTT Java"/>
88
</bundle>
99
<category-def name="Paho MQTT Java" label="Paho MQTT Java">

‎org.eclipse.paho.client.mqttv3.repository/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.eclipse.paho</groupId>
55
<artifactId>java-parent</artifactId>
6-
<version>1.0.3-SNAPSHOT</version>
6+
<version>1.1.0</version>
77
</parent>
88

99
<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>

‎org.eclipse.paho.client.mqttv3.test/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.paho</groupId>
66
<artifactId>java-parent</artifactId>
7-
<version>1.0.3-SNAPSHOT</version>
7+
<version>1.1.0</version>
88
</parent>
99

1010
<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
@@ -16,7 +16,7 @@
1616
<groupId>org.apache.maven.plugins</groupId>
1717
<artifactId>maven-compiler-plugin</artifactId>
1818
</plugin>
19-
19+
2020
<plugin>
2121
<groupId>org.apache.maven.plugins</groupId>
2222
<artifactId>maven-source-plugin</artifactId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.eclipse.paho</groupId>
6565
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
66-
<version>1.0.3-SNAPSHOT</version>
66+
<version>1.1.0</version>
6767
</dependency>
6868

6969
<dependency>

‎org.eclipse.paho.client.mqttv3/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %bundle.name
44
Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
5-
Bundle-Version: 1.0.3.qualifier
5+
Bundle-Version: 1.1.0
66
Bundle-Localization: bundle
7-
Export-Package: org.eclipse.paho.client.mqttv3;version="1.0.3.qualifier",
8-
org.eclipse.paho.client.mqttv3.logging;version="1.0.3.qualifier",
9-
org.eclipse.paho.client.mqttv3.persist;version="1.0.3.qualifier",
10-
org.eclipse.paho.client.mqttv3.util;version="1.0.3.qualifier"
7+
Export-Package: org.eclipse.paho.client.mqttv3;version="1.1.0",
8+
org.eclipse.paho.client.mqttv3.logging;version="1.1.0",
9+
org.eclipse.paho.client.mqttv3.persist;version="1.1.0",
10+
org.eclipse.paho.client.mqttv3.util;version="1.1.0"
1111
Bundle-Vendor: %bundle.provider
1212
Bundle-ActivationPolicy: lazy
1313
Bundle-RequiredExecutionEnvironment: J2SE-1.4

0 commit comments

Comments
 (0)