Skip to content

Commit b008021

Browse files
saudetsaudet
committed
Remove <version>${revision}</version> causing more problems than it solves (issue #807)
1 parent 2d15cf5 commit b008021

File tree

113 files changed

+133
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+133
-333
lines changed

‎ale/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>ale-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>0.6.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for ALE</name>
1717

1818
<properties>
1919
<javacpp.moduleId>ale</javacpp.moduleId>
20-
<revision>0.6.0-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎ale/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>ale</artifactId>
14-
<version>${revision}</version>
14+
<version>0.6.0-${project.parent.version}</version>
1515
<name>JavaCPP Presets for ALE</name>
1616

17-
<properties>
18-
<revision>0.6.0-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎ale/samples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.ale</groupId>
44
<artifactId>sharedlibraryinterfaceexample</artifactId>
5-
<version>1.5.1</version>
5+
<version>1.5.2-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>SharedLibraryInterfaceExample</exec.mainClass>
88
</properties>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.bytedeco</groupId>
1212
<artifactId>ale-platform</artifactId>
13-
<version>0.6.0-1.5.1</version>
13+
<version>0.6.0-1.5.2-SNAPSHOT</version>
1414
</dependency>
1515
</dependencies>
1616
<build>

‎arpack-ng/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>arpack-ng-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>3.7.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for ARPACK-NG</name>
1717

1818
<properties>
1919
<javacpp.moduleId>arpack-ng</javacpp.moduleId>
2020
<javacpp.packageName>arpackng</javacpp.packageName>
21-
<revision>3.7.0-${project.parent.version}</revision>
2221
</properties>
2322

2423
<dependencies>

‎arpack-ng/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>arpack-ng</artifactId>
14-
<version>${revision}</version>
14+
<version>3.7.0-${project.parent.version}</version>
1515
<name>JavaCPP Presets for ARPACK-NG</name>
1616

1717
<properties>
1818
<javacpp.packageName>arpackng</javacpp.packageName>
19-
<revision>3.7.0-${project.parent.version}</revision>
2019
</properties>
2120

2221
<dependencies>

‎arpack-ng/samples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.arpack</groupId>
44
<artifactId>icbarpackc</artifactId>
5-
<version>1.5.1</version>
5+
<version>1.5.2-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>IcbArpackC</exec.mainClass>
88
</properties>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.bytedeco</groupId>
1212
<artifactId>arpack-ng-platform</artifactId>
13-
<version>3.7.0-1.5.1</version>
13+
<version>3.7.0-1.5.2-SNAPSHOT</version>
1414
</dependency>
1515
</dependencies>
1616
<build>

‎artoolkitplus/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>artoolkitplus-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>2.3.1-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for ARToolKitPlus</name>
1717

1818
<properties>
1919
<javacpp.moduleId>artoolkitplus</javacpp.moduleId>
20-
<revision>2.3.1-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎artoolkitplus/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>artoolkitplus</artifactId>
14-
<version>${revision}</version>
14+
<version>2.3.1-${project.parent.version}</version>
1515
<name>JavaCPP Presets for ARToolKitPlus</name>
1616

17-
<properties>
18-
<revision>2.3.1-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎artoolkitplus/samples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.artoolkitplus</groupId>
44
<artifactId>multimain</artifactId>
5-
<version>1.5.1</version>
5+
<version>1.5.2-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>MultiMain</exec.mainClass>
88
</properties>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.bytedeco</groupId>
1212
<artifactId>artoolkitplus-platform</artifactId>
13-
<version>2.3.1-1.5.1</version>
13+
<version>2.3.1-1.5.2-SNAPSHOT</version>
1414
</dependency>
1515
</dependencies>
1616
<build>

‎caffe/platform/gpu/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>caffe-platform-gpu</artifactId>
15-
<version>${revision}</version>
15+
<version>1.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform GPU for Caffe</name>
1717

1818
<properties>
1919
<javacpp.moduleId>caffe</javacpp.moduleId>
20-
<revision>1.0-${project.parent.version}</revision>
2120
<javacpp.platform.extension>-gpu</javacpp.platform.extension>
2221
</properties>
2322

‎caffe/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>caffe-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>1.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for Caffe</name>
1717

1818
<properties>
1919
<javacpp.moduleId>caffe</javacpp.moduleId>
20-
<revision>1.0-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎caffe/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>caffe</artifactId>
14-
<version>${revision}</version>
14+
<version>1.0-${project.parent.version}</version>
1515
<name>JavaCPP Presets for Caffe</name>
1616

17-
<properties>
18-
<revision>1.0-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎chilitags/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>chilitags-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>master-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for Chilitags</name>
1717

1818
<properties>
1919
<javacpp.moduleId>chilitags</javacpp.moduleId>
20-
<revision>master-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎chilitags/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>chilitags</artifactId>
14-
<version>${revision}</version>
14+
<version>master-${project.parent.version}</version>
1515
<name>JavaCPP Presets for Chilitags</name>
1616

17-
<properties>
18-
<revision>master-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎ci/install-ppc.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [[ "$PROJ" =~ cuda ]]; then
6464
echo "Setting up for cuda build"
6565
cd $HOME/
6666
curl -L http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_ppc64el.deb -o $HOME/cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_ppc64el.deb
67-
curl -L https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.2/cudnn-10.1-linux-ppc64le-v7.6.2.24.tgz -o $HOME/cudnn-10.1-linux-ppc64le-v7.6.2.24.tgz
67+
curl -L https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.4/cudnn-10.1-linux-ppc64le-v7.6.4.38.tgz -o $HOME/cudnn-10.1-linux-ppc64le-v7.6.4.38.tgz
6868
python $TRAVIS_BUILD_DIR/ci/gDownload.py 1gZKnRGxBw77uClSSKINfWsylSu1si125 $HOME/nccl_ppc64le.txz
6969
ar vx $HOME/cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_ppc64el.deb
7070
tar xvf data.tar.xz
@@ -76,7 +76,7 @@ if [[ "$PROJ" =~ cuda ]]; then
7676
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "ln -sf /usr/local/cuda-10.1 /usr/local/cuda"
7777
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "ln -sf /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/libcuda.so"
7878
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "ln -sf /usr/local/cuda/lib64/stubs/libnvidia-ml.so /usr/local/cuda/lib64/libnvidia-ml.so"
79-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tar hxvf $HOME/cudnn-10.1-linux-ppc64le-v7.6.2.24.tgz -C /usr/local/"
79+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tar hxvf $HOME/cudnn-10.1-linux-ppc64le-v7.6.4.38.tgz -C /usr/local/"
8080
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tar hxvf $HOME/nccl_ppc64le.txz --strip-components=1 -C /usr/local/cuda/"
8181
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "mv /usr/local/cuda/lib/* /usr/local/cuda/lib64/"
8282
# work around issues with CUDA 10.1

‎ci/install-travis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
279279
echo "installing cuda.."
280280
#don't put in download dir as will be cached and we can use direct url instead
281281
curl -L http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_mac.dmg -o $HOME/cuda_10.1.243_mac.dmg
282-
curl -L https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.2/cudnn-10.1-osx-x64-v7.6.2.24.tgz -o $HOME/cudnn-10.1-osx-x64-v7.6.2.24.tgz
282+
curl -L https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.4/cudnn-10.1-osx-x64-v7.6.4.38.tgz -o $HOME/cudnn-10.1-osx-x64-v7.6.4.38.tgz
283283

284284
echo "Mount dmg"
285285
hdiutil mount $HOME/cuda_10.1.243_mac.dmg
@@ -292,7 +292,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
292292
exit $BREW_STATUS
293293
fi
294294

295-
tar xvf $HOME/cudnn-10.1-osx-x64-v7.6.2.24.tgz
295+
tar xvf $HOME/cudnn-10.1-osx-x64-v7.6.4.38.tgz
296296
sudo cp ./cuda/include/*.h /usr/local/cuda/include/
297297
sudo cp ./cuda/lib/*.dylib /usr/local/cuda/lib/
298298
sudo cp ./cuda/lib/*.a /usr/local/cuda/lib/

‎ci/install-windows.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ fi
117117
if [ "$PROJ" == "cuda" ] || [ "$EXT" == "-gpu" ]; then
118118
echo Installing cuda
119119
curl -L -o cuda_10.1.243_426.00_windows.exe "http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_windows.exe"
120-
curl -L -o cudnn-10.1-windows7-x64-v7.6.2.24.zip "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.2/cudnn-10.1-windows7-x64-v7.6.2.24.zip"
120+
curl -L -o cudnn-10.1-windows7-x64-v7.6.4.38.zip "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.4/cudnn-10.1-windows7-x64-v7.6.4.38.zip"
121121
./cuda_10.1.243_426.00_windows.exe -s
122122
sleep 60
123-
unzip ./cudnn-10.1-windows7-x64-v7.6.2.24.zip
123+
unzip ./cudnn-10.1-windows7-x64-v7.6.4.38.zip
124124
mv ./cuda/bin/*.dll /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v10.1/bin
125125
mv ./cuda/include/*.h /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v10.1/include
126126
mv ./cuda/lib/x64/*.lib /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v10.1/lib/x64

‎cminpack/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cminpack-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>1.3.6-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CMINPACK</name>
1717

1818
<properties>
1919
<javacpp.moduleId>cminpack</javacpp.moduleId>
20-
<revision>1.3.6-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎cminpack/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cminpack</artifactId>
14-
<version>${revision}</version>
14+
<version>1.3.6-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CMINPACK</name>
1616

17-
<properties>
18-
<revision>1.3.6-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎cminpack/samples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.cminpack</groupId>
44
<artifactId>tlmdif1c</artifactId>
5-
<version>1.5.1</version>
5+
<version>1.5.2-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>Tlmdif1c</exec.mainClass>
88
</properties>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.bytedeco</groupId>
1212
<artifactId>cminpack-platform</artifactId>
13-
<version>1.3.6-1.5.1</version>
13+
<version>1.3.6-1.5.2-SNAPSHOT</version>
1414
</dependency>
1515
</dependencies>
1616
<build>

‎cpu_features/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpu_features-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>0.4.1-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for cpu_features</name>
1717

1818
<properties>
1919
<javacpp.moduleId>cpu_features</javacpp.moduleId>
20-
<revision>0.4.1-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎cpu_features/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpu_features</artifactId>
14-
<version>${revision}</version>
14+
<version>0.4.1-${project.parent.version}</version>
1515
<name>JavaCPP Presets for cpu_features</name>
1616

17-
<properties>
18-
<revision>0.4.1-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎cpython/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>3.7.5-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CPython</name>
1717

1818
<properties>
1919
<javacpp.moduleId>cpython</javacpp.moduleId>
20-
<revision>3.7.5-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎cpython/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpython</artifactId>
14-
<version>${revision}</version>
14+
<version>3.7.5-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CPython</name>
1616

17-
<properties>
18-
<revision>3.7.5-${project.parent.version}</revision>
19-
</properties>
20-
2117
<dependencies>
2218
<dependency>
2319
<groupId>org.bytedeco</groupId>

‎cuda/platform/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cuda-platform</artifactId>
15-
<version>${revision}</version>
15+
<version>10.1-7.6-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CUDA</name>
1717

1818
<properties>
1919
<javacpp.moduleId>cuda</javacpp.moduleId>
20-
<revision>10.1-7.6-${project.parent.version}</revision>
2120
</properties>
2221

2322
<dependencies>

‎cuda/platform/redist/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cuda-platform-redist</artifactId>
15-
<version>${revision}</version>
15+
<version>10.1-7.6-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform Redist for CUDA</name>
1717

1818
<properties>
1919
<javacpp.moduleId>cuda</javacpp.moduleId>
20-
<revision>10.1-7.6-${project.parent.version}</revision>
2120
<javacpp.platform.extension>-redist</javacpp.platform.extension>
2221
</properties>
2322

0 commit comments

Comments
 (0)