You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/06/04 15:25:41 UTC

[tinkerpop] branch master updated (2e4abeb -> f63bed0)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from 2e4abeb  Merge branch 'tp34'
     new 56ac066  Bump shade plugin to 3.2.1 CTR
     new 839af15  Bump to maven assembly plugin 3.1.1 CTR
     new b14607e  Bump to dockerfile-maven-plugin 1.4.10 CTR
     new 5c781a0  Bump to rat plufin 0.13 CTR
     new faf1dda  Bump versions-plugin to 2.7 CTR
     new 173dadd  Removed revapi plugin
     new fa6c1ad  Merge branch 'tp33' into tp34
     new f63bed0  Merge branch 'tp34'

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/resources/archetype-resources/pom.xml |  1 -
 gremlin-core/api-changes.json                      | 88 ----------------------
 gremlin-core/api-contents.json                     | 22 ------
 gremlin-core/pom.xml                               |  3 -
 pom.xml                                            | 66 ++--------------
 5 files changed, 5 insertions(+), 175 deletions(-)
 delete mode 100644 gremlin-core/api-changes.json
 delete mode 100644 gremlin-core/api-contents.json


[tinkerpop] 06/08: Removed revapi plugin

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 173dadd04018bf12230edeb4f870b8e9981395c1
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 11:22:44 2019 -0400

    Removed revapi plugin
    
    The plugin hasn't even been enabled for a while. I dont know that we ever got a ton of value from it. CTR
---
 .../src/main/resources/archetype-resources/pom.xml |  1 -
 gremlin-core/api-changes.json                      | 88 ----------------------
 gremlin-core/api-contents.json                     | 22 ------
 gremlin-core/pom.xml                               |  3 -
 pom.xml                                            | 56 --------------
 5 files changed, 170 deletions(-)

diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
index 7f314fd..0727319 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,6 @@ limitations under the License.
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revapi.skip>true</revapi.skip>
     </properties>
     <dependencies>
         <dependency>
diff --git a/gremlin-core/api-changes.json b/gremlin-core/api-changes.json
deleted file mode 100644
index 75e1d07..0000000
--- a/gremlin-core/api-changes.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "3.3.1": {
-    "revapi": {
-      "ignore": [
-        {
-          "code": "java.method.addedToInterface",
-          "new": "method <V> boolean org.apache.tinkerpop.gremlin.structure.io.Io.Builder<I extends org.apache.tinkerpop.gremlin.structure.io.Io>::requiresVersion(V)",
-          "package": "org.apache.tinkerpop.gremlin.structure.io",
-          "classSimpleName": "Builder",
-          "methodName": "requiresVersion",
-          "justification": "Graph providers may run into problems with the test suite if they do not have a way to detect the version and type of IO being requested of them so that they can provide the right version of their IoRegistry instances."
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "DefaultGraphTraversal",
-          "methodName": "to",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "DefaultGraphTraversal",
-          "methodName": "from",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "GraphTraversal",
-          "methodName": "to",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "GraphTraversal",
-          "methodName": "from",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::to(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "Admin",
-          "methodName": "to",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        },
-        {
-          "code": "java.method.parameterTypeParameterChanged",
-          "old": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<E, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "new": "method parameter org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E> org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal<S, E>::from(===org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>===)",
-          "oldType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<E extends java.lang.Object, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "newType": "org.apache.tinkerpop.gremlin.process.traversal.Traversal<?, org.apache.tinkerpop.gremlin.structure.Vertex>",
-          "package": "org.apache.tinkerpop.gremlin.process.traversal.dsl.graph",
-          "classSimpleName": "Admin",
-          "methodName": "from",
-          "parameterIndex": "0",
-          "justification": "Generalized from E to ? to reduce overly complicated typing"
-        }
-      ]
-    }
-  }
-}
diff --git a/gremlin-core/api-contents.json b/gremlin-core/api-contents.json
deleted file mode 100644
index aca7f54..0000000
--- a/gremlin-core/api-contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "revapi": {
-    "java": {
-      "filter": {
-        "packages": {
-          "regex": true,
-          //gremlin-shaded includes a lot of stuff from 3rd party libraries that break their API between
-          //versions. Let's just not consider them part of Tinkerpop API. -->
-          "exclude": ["org\\.apache\\.tinkerpop\\.shaded(\\..+)?"],
-          "include": [
-            //Be aware that the definitions below do NOT include the subpackages...
-            "org\\.apache\\.tinkerpop\\.gremlin\\.structure",
-            "org\\.apache\\.tinkerpop\\.gremlin\\.structure\\.io",
-            "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.computer",
-            "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.traversal",
-            "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.traversal.dsl.graph"
-          ]
-        }
-      }
-    }
-  }
-}
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 44ee484..a608adb 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -24,9 +24,6 @@ limitations under the License.
     </parent>
     <artifactId>gremlin-core</artifactId>
     <name>Apache TinkerPop :: Gremlin Core</name>
-    <properties>
-        <revapi.skip>true</revapi.skip>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
diff --git a/pom.xml b/pom.xml
index 6ce1eba..1435aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,9 +165,6 @@ limitations under the License.
         <log4j-silent.properties>file:target/test-classes/log4j-silent.properties</log4j-silent.properties>
 
         <muteTestLogs>false</muteTestLogs>
-
-        <!-- By default API checks are not run. Modules can opt in by setting this property to false in their poms. -->
-        <revapi.skip>true</revapi.skip>
     </properties>
     <build>
         <directory>${basedir}/target</directory>
@@ -316,7 +313,6 @@ limitations under the License.
                             <failIfNoMatch>false</failIfNoMatch>
                         </configuration>
                     </execution>
-                    <!-- Needed to figure out the version components when reading revapi API check config below -->
                     <execution>
                         <id>parse-version</id>
                         <goals>
@@ -421,58 +417,6 @@ limitations under the License.
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.revapi</groupId>
-                <artifactId>revapi-maven-plugin</artifactId>
-                <version>0.9.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.revapi</groupId>
-                        <artifactId>revapi-java</artifactId>
-                        <version>0.13.0</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <skip>${revapi.skip}</skip>
-                    <versionFormat>\d*\.\d*\.\d*.</versionFormat>
-                    <analysisConfiguration><![CDATA[
-                    {
-                      "revapi": {
-                        "semver": {
-                          "ignore": {
-                            "enabled": true,
-                            "versionIncreaseAllows": {
-                              "major": "breaking",
-                              "minor": "breaking",
-                              "patch": "nonBreaking"
-                            },
-                            "passThroughDifferences": ["java.class.nonPublicPartOfAPI"]
-                          }
-                        }
-                      }
-                    }
-                    ]]></analysisConfiguration>
-                    <analysisConfigurationFiles>
-                        <configurationFile>
-                            <path>${project.basedir}/api-changes.json</path>
-                            <roots>
-                                <root>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</root>
-                            </roots>
-                        </configurationFile>
-                        <configurationFile>
-                            <path>${project.basedir}/api-contents.json</path>
-                        </configurationFile>
-                    </analysisConfigurationFiles>
-                    <failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <!-- we never use this plugin - disabling helps with speeding up other processing like when using -Dcoverage -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>


[tinkerpop] 05/08: Bump versions-plugin to 2.7 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit faf1dda3a43f9dadabf0647237f69b37add0462c
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 10:58:22 2019 -0400

    Bump versions-plugin to 2.7 CTR
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b41af08..6ce1eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@ limitations under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.7</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>


[tinkerpop] 01/08: Bump shade plugin to 3.2.1 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 56ac0667538258cb568801338d24836211c9fbf6
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 10:55:35 2019 -0400

    Bump shade plugin to 3.2.1 CTR
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d5fad2e..c530226 100644
--- a/pom.xml
+++ b/pom.xml
@@ -579,7 +579,7 @@ limitations under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


[tinkerpop] 04/08: Bump to rat plufin 0.13 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 5c781a096b3c69a65df3e8939cd764d26a043fb0
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 10:57:57 2019 -0400

    Bump to rat plufin 0.13 CTR
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 94777a1..b41af08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,7 +341,7 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
-                <version>0.12</version>
+                <version>0.13</version>
                 <executions>
                     <execution>
                         <id>rat-checks</id>


[tinkerpop] 02/08: Bump to maven assembly plugin 3.1.1 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 839af151d579871ef3682d36ca6930aa1a1a9ad0
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 10:56:32 2019 -0400

    Bump to maven assembly plugin 3.1.1 CTR
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c530226..832be0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,7 +584,7 @@ limitations under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


[tinkerpop] 03/08: Bump to dockerfile-maven-plugin 1.4.10 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b14607e602826fc96e704632acbe4ca4193d4e63
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 10:57:24 2019 -0400

    Bump to dockerfile-maven-plugin 1.4.10 CTR
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 832be0b..94777a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,7 +594,7 @@ limitations under the License.
                 <plugin>
                     <groupId>com.spotify</groupId>
                     <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>1.3.7</version>
+                    <version>1.4.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


[tinkerpop] 08/08: Merge branch 'tp34'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f63bed03ac1eb96b2083a3c2d8e8be174af4c303
Merge: 2e4abeb fa6c1ad
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 11:25:19 2019 -0400

    Merge branch 'tp34'

 .../src/main/resources/archetype-resources/pom.xml |  1 -
 gremlin-core/api-changes.json                      | 88 ----------------------
 gremlin-core/api-contents.json                     | 22 ------
 gremlin-core/pom.xml                               |  3 -
 pom.xml                                            | 66 ++--------------
 5 files changed, 5 insertions(+), 175 deletions(-)



[tinkerpop] 07/08: Merge branch 'tp33' into tp34

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit fa6c1ada9afec0b837ce6922bf099d84dd84f41d
Merge: 8a17fb0 173dadd
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jun 4 11:25:00 2019 -0400

    Merge branch 'tp33' into tp34

 .../src/main/resources/archetype-resources/pom.xml |  1 -
 gremlin-core/api-changes.json                      | 88 ----------------------
 gremlin-core/api-contents.json                     | 22 ------
 gremlin-core/pom.xml                               |  3 -
 pom.xml                                            | 66 ++--------------
 5 files changed, 5 insertions(+), 175 deletions(-)