Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

eclipse: change Java namespace

Browse Source 
io.mraa -> org.eclipse.mraa

Signed-off-by: Thomas Ingleby <thomas.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2019-07-29 09:27:17 -07:00
parent 170bdd104f
commit c1eeb8ab87
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build-android.sh
View File

@@ -112,7 +112,7 @@ AndroidManifest_xml='<?xml version="1.0" encoding="utf-8"?>
</manifest>' </manifest>'
# Package prefix # Package prefix
JAVA_PKG_PREFIX_DOT="io.mraa.at" JAVA_PKG_PREFIX_DOT="org.eclipse.mraa.at"
# Package prefix slash to dot # Package prefix slash to dot
JAVA_PKG_PREFIX_SLASH="${JAVA_PKG_PREFIX_DOT//\./\/}/upm" JAVA_PKG_PREFIX_SLASH="${JAVA_PKG_PREFIX_DOT//\./\/}/upm"
@@ -158,7 +158,7 @@ jar cf $PKG_BUNDLE_DIR/$LIB_NAME-$VERSION-javadoc.jar $LIB_NAME-javadoc/*
jar cf $PKG_BUNDLE_DIR/$LIB_NAME-$VERSION-sources.jar src/java/*.java jar cf $PKG_BUNDLE_DIR/$LIB_NAME-$VERSION-sources.jar src/java/*.java
# HACK - mraa pom file groupId is io.mraa (AT is io.mraa.at) # HACK - mraa pom file groupId is io.mraa (AT is io.mraa.at)
perl -p -i.bak -e 's/(groupId>)(.*?)(<\/groupId)/\1io.mraa.at\3/' src/java/$LIB_NAME-$VERSION.pom perl -p -i.bak -e 's/(groupId>)(.*?)(<\/groupId)/\1org.eclipse.mraa.at\3/' src/java/$LIB_NAME-$VERSION.pom
# HACK - mraa pom file packaging is 'jar' (convert this to 'aar') # HACK - mraa pom file packaging is 'jar' (convert this to 'aar')
perl -p -i.bak -e 's/(packaging>)(.*?)(<\/packaging)/\1aar\3/' src/java/$LIB_NAME-$VERSION.pom perl -p -i.bak -e 's/(packaging>)(.*?)(<\/packaging)/\1aar\3/' src/java/$LIB_NAME-$VERSION.pom

16
src/java/pom.xml.in
View File

@@ -4,7 +4,7 @@ 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.mraa</groupId> <groupId>org.eclipse.mraa</groupId>
<artifactId>mraa</artifactId> <artifactId>mraa</artifactId>
<version>@VERSION_SHORT@</version> <version>@VERSION_SHORT@</version>
<packaging>jar</packaging> <packaging>jar</packaging>
@@ -16,23 +16,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<licenses> <licenses>
<license> <license>
<name>MIT License</name> <name>MIT License</name>
<url>https://github.com/intel-iot-devkit/mraa/blob/master/COPYING</url> <url>https://github.com/eclipse/mraa/blob/master/COPYING</url>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Mraa contributors https://github.com/intel-iot-devkit/mraa/graphs/contributors</name> <name>Mraa contributors https://github.com/eclipse/mraa/graphs/contributors</name>
<email>mraa@lists.01.org</email> <email>mraa@lists.01.org</email>
<organization>Intel IoT Developer kit</organization> <organization>Eclipse Foundation</organization>
<organizationUrl>https://github.com/intel-iot-devkit</organizationUrl> <organizationUrl>https://github.com/eclipse</organizationUrl>
</developer> </developer>
</developers> </developers>
<scm> <scm>
<connection>scm:git:git://github.com/intel-iot-devkit/mraa.git</connection> <connection>scm:git:git://github.com/eclipse/mraa.git</connection>
<developerConnection>scm:git:ssh://github.com:intel-iot-devkit/mraa.git</developerConnection> <developerConnection>scm:git:ssh://github.com:eclipse/mraa.git</developerConnection>
<url>https://github.com/intel-iot-devkit/mraa/tree/master</url> <url>https://github.com/eclipse/mraa/tree/master</url>
</scm> </scm>
</project> </project>